on 636c91c help sign in
.envrc−1
since splitsnapshots
unifiedsplit
@@ -1,6 +1,5 @@
1watch_file shell.nix
1watch_file shell.nix
2watch_file flake.lock
2watch_file flake.lock
3−watch_file rust-toolchain.toml
4
3
5# try to use flakes, if it fails use normal nix (ie. shell.nix)
4# try to use flakes, if it fails use normal nix (ie. shell.nix)
6use flake || use nix
5use flake || use nix
.github/ISSUE_TEMPLATE/bug_report.yaml−10
@@ -55,16 +55,6 @@ 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
68 - type: input
58 - type: input
69 id: helix-version
59 id: helix-version
70 attributes:
60 attributes:
.github/workflows/build.yml+7−15
@@ -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@v4
17+ uses: actions/checkout@v3
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,8 +22,6 @@ 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"
27
25
28 - name: Run cargo check
26 - name: Run cargo check
29 run: cargo check
27 run: cargo check
@@ -36,14 +34,12 @@ jobs:
36 HELIX_LOG_LEVEL: info
34 HELIX_LOG_LEVEL: info
37 steps:
35 steps:
38 - name: Checkout sources
36 - name: Checkout sources
39− uses: actions/checkout@v4
37+ uses: actions/checkout@v3
40
38
41 - name: Install stable toolchain
39 - name: Install stable toolchain
42− uses: dtolnay/rust-toolchain@1.70
40+ uses: dtolnay/rust-toolchain@1.65
43
41
44 - uses: Swatinem/rust-cache@v2
42 - uses: Swatinem/rust-cache@v2
45− with:
46− shared-key: "build"
47
43
48 - name: Cache test tree-sitter grammar
44 - name: Cache test tree-sitter grammar
49 uses: actions/cache@v3
45 uses: actions/cache@v3
@@ -67,16 +63,14 @@ jobs:
67 runs-on: ubuntu-latest
63 runs-on: ubuntu-latest
68 steps:
64 steps:
69 - name: Checkout sources
65 - name: Checkout sources
70− uses: actions/checkout@v4
66+ uses: actions/checkout@v3
71
67
72 - name: Install stable toolchain
68 - name: Install stable toolchain
73− uses: dtolnay/rust-toolchain@1.70
69+ uses: dtolnay/rust-toolchain@1.65
74 with:
70 with:
75 components: rustfmt, clippy
71 components: rustfmt, clippy
76
72
77 - uses: Swatinem/rust-cache@v2
73 - uses: Swatinem/rust-cache@v2
78− with:
79− shared-key: "build"
80
74
81 - name: Run cargo fmt
75 - name: Run cargo fmt
82 run: cargo fmt --all --check
76 run: cargo fmt --all --check
@@ -94,14 +88,12 @@ jobs:
94 runs-on: ubuntu-latest
88 runs-on: ubuntu-latest
95 steps:
89 steps:
96 - name: Checkout sources
90 - name: Checkout sources
97− uses: actions/checkout@v4
91+ uses: actions/checkout@v3
98
92
99 - name: Install stable toolchain
93 - name: Install stable toolchain
100− uses: dtolnay/rust-toolchain@1.70
94+ uses: dtolnay/rust-toolchain@1.65
101
95
102 - uses: Swatinem/rust-cache@v2
96 - uses: Swatinem/rust-cache@v2
103− with:
104− shared-key: "build"
105
97
106 - name: Validate queries
98 - name: Validate queries
107 run: cargo xtask query-check
99 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@v4
14+ uses: actions/checkout@v3
15
15
16 - name: Install nix
16 - name: Install nix
17− uses: cachix/install-nix-action@v24
17+ uses: cachix/install-nix-action@v22
18
18
19 - name: Authenticate with Cachix
19 - name: Authenticate with Cachix
20− uses: cachix/cachix-action@v13
20+ uses: cachix/cachix-action@v12
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@v4
14+ - uses: actions/checkout@v3
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 stable
29+ - name: Deploy
30 uses: peaceiris/actions-gh-pages@v3
30 uses: peaceiris/actions-gh-pages@v3
31− if: startswith(github.ref, 'refs/tags/')
32 with:
31 with:
33 github_token: ${{ secrets.GITHUB_TOKEN }}
32 github_token: ${{ secrets.GITHUB_TOKEN }}
34 publish_dir: ./book/book
33 publish_dir: ./book/book
34+ destination_dir: ./${{ env.OUTDIR }}
35
35
36− - name: Deploy
36+ - name: Deploy stable
37 uses: peaceiris/actions-gh-pages@v3
37 uses: peaceiris/actions-gh-pages@v3
38+ if: startswith(github.ref, 'refs/tags/')
38 with:
39 with:
39 github_token: ${{ secrets.GITHUB_TOKEN }}
40 github_token: ${{ secrets.GITHUB_TOKEN }}
40 publish_dir: ./book/book
41 publish_dir: ./book/book
41− destination_dir: ./${{ env.OUTDIR }}
.github/workflows/release.yml+15−15
@@ -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@v4
26+ uses: actions/checkout@v3
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@v4
39+ - uses: actions/upload-artifact@v3
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@v4
106+ uses: actions/checkout@v3
107
107
108 - name: Download grammars
108 - name: Download grammars
109− uses: actions/download-artifact@v4
109+ uses: actions/download-artifact@v3
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')"
@@ -160,7 +160,7 @@ jobs:
160
160
161 - name: Build AppImage
161 - name: Build AppImage
162 shell: bash
162 shell: bash
163− if: matrix.build == 'x86_64-linux'
163+ if: matrix.build == 'aarch64-linux' || matrix.build == 'x86_64-linux'
164 run: |
164 run: |
165 # Required as of 22.x https://github.com/AppImage/AppImageKit/wiki/FUSE
165 # Required as of 22.x https://github.com/AppImage/AppImageKit/wiki/FUSE
166 sudo add-apt-repository universe
166 sudo add-apt-repository universe
@@ -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@v4
223+ - uses: actions/upload-artifact@v3
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@v4
234+ uses: actions/checkout@v3
235
235
236− - uses: actions/download-artifact@v4
236+ - uses: actions/download-artifact@v3
237
237
238 - name: Build archive
238 - name: Build archive
239 shell: bash
239 shell: bash
@@ -263,7 +263,7 @@ jobs:
263 mv bins-$platform/hx$exe $pkgname
263 mv bins-$platform/hx$exe $pkgname
264 chmod +x $pkgname/hx$exe
264 chmod +x $pkgname/hx$exe
265
265
266− if [[ "$platform" = "x86_64-linux" ]]; then
266+ if [[ "$platform" = "aarch64-linux" || "$platform" = "x86_64-linux" ]]; then
267 mv bins-$platform/helix-*.AppImage* dist/
267 mv bins-$platform/helix-*.AppImage* dist/
268 fi
268 fi
269
269
@@ -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@v4
291+ uses: actions/upload-artifact@v3
292 if: env.preview == 'true'
292 if: env.preview == 'true'
293 with:
293 with:
294 name: release
294 name: release
.ignore+3
@@ -1,2 +1,5 @@
1# Things that we don't want ripgrep to search that we do want in git
1# Things that we don't want ripgrep to search that we do want in git
2# https://github.com/BurntSushi/ripgrep/blob/master/GUIDE.md#automatic-filtering
2# https://github.com/BurntSushi/ripgrep/blob/master/GUIDE.md#automatic-filtering
3+
4+# Minified JS vendored from mdbook
5+book/theme/highlight.js
CHANGELOG.md−260
@@ -1,263 +1,3 @@
1−# 23.10 (2023-10-24)
2−
3−A big shout out to all the contributors! We had 118 contributors in this release.
4−
5−Breaking changes:
6−
7−- Support multiple language servers per language ([#2507](https://github.com/helix-editor/helix/pull/2507))
8− - This is a breaking change to language configuration
9−
10−Features:
11−
12−- Support multiple language servers per language ([#2507](https://github.com/helix-editor/helix/pull/2507), [#7082](https://github.com/helix-editor/helix/pull/7082), [#7286](https://github.com/helix-editor/helix/pull/7286), [#8374](https://github.com/helix-editor/helix/pull/8374))
13−- Add a statusline element for the selected register ([#7222](https://github.com/helix-editor/helix/pull/7222))
14−- Add `%`, `#`, `.`, `*` and `+` special registers ([#6985](https://github.com/helix-editor/helix/pull/6985))
15−- Add initial support for LSP DidChangeWatchedFiles notifications ([#7665](https://github.com/helix-editor/helix/pull/7665))
16−- Search buffer contents in `global_search` ([#5652](https://github.com/helix-editor/helix/pull/5652))
17−- Add a "smart tab" command that intelligently jumps the cursor on tab ([#4443](https://github.com/helix-editor/helix/pull/4443))
18−- Add a statusline element for whether a file is read-only ([#7222](https://github.com/helix-editor/helix/pull/7222), [#7875](https://github.com/helix-editor/helix/pull/7875))
19−- Syntax highlight regex prompts ([#7738](https://github.com/helix-editor/helix/pull/7738))
20−- Allow defining alignment in indent queries ([#5355](https://github.com/helix-editor/helix/pull/5355))
21−- Show visual feedback in `surround_replace` ([#7588](https://github.com/helix-editor/helix/pull/7588))
22−- Switch to Nucleo for fuzzy matching ([#7814](https://github.com/helix-editor/helix/pull/7814), [#8148](https://github.com/helix-editor/helix/pull/8148), [#8192](https://github.com/helix-editor/helix/pull/8192), [#8194](https://github.com/helix-editor/helix/pull/8194))
23−- Insert a trailing newline on write ([#8157](https://github.com/helix-editor/helix/pull/8157))
24−- Add a `-w`/`--working-dir` CLI flag for specifying a working directory on startup ([#8223](https://github.com/helix-editor/helix/pull/8223), [#8498](https://github.com/helix-editor/helix/pull/8498), [#8520](https://github.com/helix-editor/helix/pull/8520))
25−- Accept a `+N` CLI argument to set the first file's line number ([#8521](https://github.com/helix-editor/helix/pull/8521))
26−- Accept Helix-specific ignore files in `.helix/ignore` and `~/.config/helix/ignore` ([#8099](https://github.com/helix-editor/helix/pull/8099))
27−
28−Commands:
29−
30−- `merge_selections` (`A-minus`) - merge all selections into one selection that covers all ranges ([#7053](https://github.com/helix-editor/helix/pull/7053))
31−- `move_prev_long_word_end` and `extend_prev_long_word_end` - move/extend to the end of the previous WORD ([#6905](https://github.com/helix-editor/helix/pull/6905))
32−- `reverse_selection_contents` - swaps the values of each selection so they are reversed ([#7329](https://github.com/helix-editor/helix/pull/7329))
33−- Add `:rl` and `:rla` aliases for `:reload` and `:reload-all` ([#7158](https://github.com/helix-editor/helix/pull/7158))
34−- `yank_joined` - join the selections and yank to the selected register ([#7195](https://github.com/helix-editor/helix/pull/7195))
35−- `:write-all!` (`:wa!`) - forcibly write all buffers to disk and create any necessary subdirectories ([#7577](https://github.com/helix-editor/helix/pull/7577))
36−- `:redraw` - clear re-render the UI ([#6949](https://github.com/helix-editor/helix/pull/6949))
37−- `:tree-sitter-highlight-name` - show the theme scope name of the highlight under the cursor ([#8170](https://github.com/helix-editor/helix/pull/8170))
38−
39−Usability improvements:
40−
41−- Allow cycling option values at runtime ([#4411](https://github.com/helix-editor/helix/pull/4411), [#7240](https://github.com/helix-editor/helix/pull/7240), [#7877](https://github.com/helix-editor/helix/pull/7877))
42−- Exit gracefully on termination signals ([#7236](https://github.com/helix-editor/helix/pull/7236))
43−- Add plaintext matching fallback to tree-sitter pair matching ([#4288](https://github.com/helix-editor/helix/pull/4288))
44−- Persist register selection in pending keymaps ([0e08349](https://github.com/helix-editor/helix/commit/0e08349))
45−- Propagate the count and register to command palette commands ([b394997](https://github.com/helix-editor/helix/commit/b394997))
46−- Auto indent on `insert_at_line_start` ([#5837](https://github.com/helix-editor/helix/pull/5837))
47−- Add a config option to control whether LSP completions are automatically inserted on preview ([#7189](https://github.com/helix-editor/helix/pull/7189))
48−- Add a config option for default line endings ([#5621](https://github.com/helix-editor/helix/pull/5621), [#7357](https://github.com/helix-editor/helix/pull/7357))
49−- Allow ANSI colors in themes ([#5119](https://github.com/helix-editor/helix/pull/5119))
50−- Match pairs that don't form a standalone tree-sitter node ([#7242](https://github.com/helix-editor/helix/pull/7242))
51−- Allow indent sizes of up to 16 columns ([#7429](https://github.com/helix-editor/helix/pull/7429))
52−- Improve performance of mapping positions through changes ([#7408](https://github.com/helix-editor/helix/pull/7408), [8d39a81](https://github.com/helix-editor/helix/commit/8d39a81), [#7471](https://github.com/helix-editor/helix/pull/7471))
53−- Mark buffers created from stdin as modified ([#7431](https://github.com/helix-editor/helix/pull/7431))
54−- Forcibly shut down uninitialized language servers ([#7449](https://github.com/helix-editor/helix/pull/7449))
55−- Add filename completer for shell prompts ([#7569](https://github.com/helix-editor/helix/pull/7569))
56−- Allow binding F13-F24 ([#7672](https://github.com/helix-editor/helix/pull/7672))
57−- Resolve LSP code actions ([#7677](https://github.com/helix-editor/helix/pull/7677), [#8421](https://github.com/helix-editor/helix/pull/8421))
58−- Save an undo checkpoint before accepting completions ([#7747](https://github.com/helix-editor/helix/pull/7747))
59−- Include gitignored files in debugger completions ([#7936](https://github.com/helix-editor/helix/pull/7936))
60−- Make editor remember the last search register ([#5244](https://github.com/helix-editor/helix/pull/5244))
61−- Open directories with `goto_file` ([#7909](https://github.com/helix-editor/helix/pull/7909))
62−- Use relative path to open buffer in `goto_file` (`gf`) ([#7965](https://github.com/helix-editor/helix/pull/7965))
63−- Support `default` color in themes ([#8083](https://github.com/helix-editor/helix/pull/8083), [#8114](https://github.com/helix-editor/helix/pull/8114))
64−- Toggle between relative and absolute line numbers when the terminal loses focus ([#7955](https://github.com/helix-editor/helix/pull/7955))
65−- Lower default idle-timeout to 250ms ([060e73a](https://github.com/helix-editor/helix/commit/060e73a))
66−- Allow theming diff gutters separately from other diff colors ([#8343](https://github.com/helix-editor/helix/pull/8343))
67−- Style bold/italic/strikethrough in markdown doc popups ([#8385](https://github.com/helix-editor/helix/pull/8385))
68−- Maintain the cursor position and view when splitting with `:hsplit`/`:vsplit` ([#8109](https://github.com/helix-editor/helix/pull/8109))
69−- Accept `-` in macros outside of `<`/`>` ([#8475](https://github.com/helix-editor/helix/pull/8475))
70−- Show all language servers for each language in `--health` ([#7315](https://github.com/helix-editor/helix/pull/7315))
71−- Don't break on hyphens in `:reflow` ([#8569](https://github.com/helix-editor/helix/pull/8569))
72−
73−Fixes:
74−
75−- Update diagnostics correctly on language server exit ([#7111](https://github.com/helix-editor/helix/pull/7111))
76−- Fix off-by-one in `select_references_to_symbol_under_cursor` ([#7132](https://github.com/helix-editor/helix/pull/7132))
77−- Extend selection with repeat-last-motion only if the original motion extended the selection ([#7159](https://github.com/helix-editor/helix/pull/7159))
78−- Fix undefined behavior in the diff gutter ([#7227](https://github.com/helix-editor/helix/pull/7227))
79−- Check that tab width is non-zero ([#7178](https://github.com/helix-editor/helix/pull/7178))
80−- Fix styles being overwritten in table rows with multiple cells ([#7281](https://github.com/helix-editor/helix/pull/7281))
81−- Add file for `--log` CLI arg in help text ([#7307](https://github.com/helix-editor/helix/pull/7307))
82−- Fix underflow when repeating a completion that has a negative shift position ([#7322](https://github.com/helix-editor/helix/pull/7322))
83−- Prefer longer matches in `select_next_sibling` and `select_prev_sibling` ([#7332](https://github.com/helix-editor/helix/pull/7332))
84−- Preview scratch buffers in the jumplist picker ([#7331](https://github.com/helix-editor/helix/pull/7331))
85−- Fix chunking by bytes in tree-sitter parsing ([#7417](https://github.com/helix-editor/helix/pull/7417))
86−- Discard LSP publishDiagnostic from uninitialized servers ([#7467](https://github.com/helix-editor/helix/pull/7467))
87−- Use negotiated position encoding for LSP workspace edits ([#7469](https://github.com/helix-editor/helix/pull/7469))
88−- Fix error message for unknown gutter types in config ([#7534](https://github.com/helix-editor/helix/pull/7534))
89−- Fix `:log-open` when `--log` CLI arg is specified ([#7573](https://github.com/helix-editor/helix/pull/7573), [#7585](https://github.com/helix-editor/helix/pull/7585))
90−- Fix debouncing of LSP messages to fix the last message sticking around ([#7538](https://github.com/helix-editor/helix/pull/7538), [#8023](https://github.com/helix-editor/helix/pull/8023))
91−- Fix crash when the current working directory is deleted ([#7185](https://github.com/helix-editor/helix/pull/7185))
92−- Fix piping to Helix on macOS ([#5468](https://github.com/helix-editor/helix/pull/5468))
93−- Fix crash when parsing overlapping injections ([#7621](https://github.com/helix-editor/helix/pull/7621))
94−- Clear the statusline when the prompt is visible ([#7646](https://github.com/helix-editor/helix/pull/7646))
95−- Fix range formatting error message typo ([#7823](https://github.com/helix-editor/helix/pull/7823))
96−- Skip rendering gutters when gutter width exceeds view width ([#7821](https://github.com/helix-editor/helix/pull/7821))
97−- Center the picker preview using visual lines ([#7837](https://github.com/helix-editor/helix/pull/7837))
98−- Align view correctly for background buffers opened with `A-ret` ([#7691](https://github.com/helix-editor/helix/pull/7691))
99−- Fix cursor resetting to block when quitting via a keybind ([#7931](https://github.com/helix-editor/helix/pull/7931))
100−- Remove path completions for the `:new` command ([#8010](https://github.com/helix-editor/helix/pull/8010))
101−- Use binary path resolved by `which` for formatter commands ([#8064](https://github.com/helix-editor/helix/pull/8064))
102−- Handle crossterm's `hidden` modifier ([#8120](https://github.com/helix-editor/helix/pull/8120))
103−- Clear completion when switching between windows with the mouse ([#8118](https://github.com/helix-editor/helix/pull/8118))
104−- Eagerly remove the last picker (`<space>'`) when the picker has many items ([#8127](https://github.com/helix-editor/helix/pull/8127))
105−- Fix find commands for buffers with non-LF line-endings ([#8111](https://github.com/helix-editor/helix/pull/8111))
106−- Detect the tmux clipboard provider on macOS ([#8182](https://github.com/helix-editor/helix/pull/8182))
107−- Fix syntax highlighting in dynamic picker preview pane ([#8206](https://github.com/helix-editor/helix/pull/8206))
108−- Recognize HTML code tags with attributes as code in markdown previews ([#8397](https://github.com/helix-editor/helix/pull/8397))
109−- Fix multicursor snippet placeholder directions ([#8423](https://github.com/helix-editor/helix/pull/8423))
110−- Only show diagnostic highlights when diagnostics are enabled for a language server ([#8551](https://github.com/helix-editor/helix/pull/8551))
111−
112−Themes:
113−
114−- Improve the selection color in `ferra` ([#7138](https://github.com/helix-editor/helix/pull/7138))
115−- Add `variable.other.member` theming to `spacebones_light` ([#7125](https://github.com/helix-editor/helix/pull/7125))
116−- Update `autumn` and theme the soft-wrap indicator ([#7229](https://github.com/helix-editor/helix/pull/7229))
117−- Add `gruvbox_dark_soft` ([#7139](https://github.com/helix-editor/helix/pull/7139))
118−- Add `merionette` ([#7186](https://github.com/helix-editor/helix/pull/7186))
119−- Add `zed_onedark` and `zed_onelight` ([#7250](https://github.com/helix-editor/helix/pull/7250))
120−- Use light-gray for `onedarker` inlay hint theming ([#7433](https://github.com/helix-editor/helix/pull/7433))
121−- Update the Nord theme to follow the style guidelines ([#7490](https://github.com/helix-editor/helix/pull/7490))
122−- Tune `dark_plus` inlay hint colors ([#7611](https://github.com/helix-editor/helix/pull/7611))
123−- Add `naysayer` ([#7570](https://github.com/helix-editor/helix/pull/7570))
124−- Add `kaolin-dark`, `kaolin-light` and `kaolin-valley-dark` ([#7151](https://github.com/helix-editor/helix/pull/7151))
125−- Fix selection highlighting in gruvbox variants ([#7717](https://github.com/helix-editor/helix/pull/7717))
126−- Add soft-wrap indicator to `gruvbox` ([#7736](https://github.com/helix-editor/helix/pull/7736))
127−- Add missing palette definitions in `everforest_dark` ([#7739](https://github.com/helix-editor/helix/pull/7739))
128−- Increase diagnostics clarity in `pop-dark` ([#7702](https://github.com/helix-editor/helix/pull/7702))
129−- Add `vim_dark_high_contrast` ([#7785](https://github.com/helix-editor/helix/pull/7785))
130−- Add `new_moon` ([#7834](https://github.com/helix-editor/helix/pull/7834))
131−- Add `yellowed` ([#7849](https://github.com/helix-editor/helix/pull/7849))
132−- Improve comment readability for `autumn` ([#7939](https://github.com/helix-editor/helix/pull/7939))
133−- Distinguish active bufferline buffer in `monokai` ([#7983](https://github.com/helix-editor/helix/pull/7983))
134−- Update ruler colors in `nord` ([#7995](https://github.com/helix-editor/helix/pull/7995))
135−- Update Catppuccin themes ([#8102](https://github.com/helix-editor/helix/pull/8102))
136−- Add text focus scope and diagnostics undercurls for `nord` ([#8165](https://github.com/helix-editor/helix/pull/8165))
137−- Add material theme collection ([#8211](https://github.com/helix-editor/helix/pull/8211))
138−- Improve indent line color in `dracula` ([#8266](https://github.com/helix-editor/helix/pull/8266))
139−- Clean up and refactor `papercolor` to use inheritance ([#8276](https://github.com/helix-editor/helix/pull/8276))
140−- Fix `zenburn` inlay hint color ([#8278](https://github.com/helix-editor/helix/pull/8278)a)
141−- Fix picker crash when previewing an invalid range ([e9d0bd7](https://github.com/helix-editor/helix/commit/e9d0bd7))
142−- Correctly center items in the picker preview ([13d4463](https://github.com/helix-editor/helix/commit/13d4463))
143−- Add `cyan_light` ([#8293](https://github.com/helix-editor/helix/pull/8293), [#8587](https://github.com/helix-editor/helix/pull/8587))
144−- Theme HTML tags in `onedark` ([#8409](https://github.com/helix-editor/helix/pull/8409))
145−- Refine `darcula` and `darcula-solid` themes ([#8412](https://github.com/helix-editor/helix/pull/8412))
146−- Improve `nord` highlights ([#8414](https://github.com/helix-editor/helix/pull/8414))
147−- Add `nord-night` ([#8549](https://github.com/helix-editor/helix/pull/8549))
148−
149−New languages:
150−
151−- Blueprint ([#7213](https://github.com/helix-editor/helix/pull/7213), [#8161](https://github.com/helix-editor/helix/pull/8161))
152−- Forth ([#7256](https://github.com/helix-editor/helix/pull/7256), [#7334](https://github.com/helix-editor/helix/pull/7334))
153−- t32 ([#7140](https://github.com/helix-editor/helix/pull/7140), [#7811](https://github.com/helix-editor/helix/pull/7811))
154−- WebC ([#7290](https://github.com/helix-editor/helix/pull/7290))
155−- Persistent DSL for Haskell ([#7261](https://github.com/helix-editor/helix/pull/7261))
156−- F# ([#7619](https://github.com/helix-editor/helix/pull/7619), [#8024](https://github.com/helix-editor/helix/pull/8024))
157−- Wren ([#7765](https://github.com/helix-editor/helix/pull/7765), [#7819](https://github.com/helix-editor/helix/pull/7819))
158−- Unison ([#7724](https://github.com/helix-editor/helix/pull/7724))
159−- Todo.txt ([#7835](https://github.com/helix-editor/helix/pull/7835))
160−- Jinja and Handlebars ([#7233](https://github.com/helix-editor/helix/pull/7233))
161−- Pod ([#7907](https://github.com/helix-editor/helix/pull/7907))
162−- Strace ([#7928](https://github.com/helix-editor/helix/pull/7928))
163−- Gemini ([#8070](https://github.com/helix-editor/helix/pull/8070))
164−- GNU Assembler (GAS) ([#8291](https://github.com/helix-editor/helix/pull/8291))
165−- JSON5 ([#8473](https://github.com/helix-editor/helix/pull/8473))
166−- TEMPL ([#8540](https://github.com/helix-editor/helix/pull/8540))
167−
168−Updated languages and queries:
169−
170−- Add one to the ruler numbers for git-commit ([#7072](https://github.com/helix-editor/helix/pull/7072))
171−- Recognize XAML files as XML ([#7083](https://github.com/helix-editor/helix/pull/7083))
172−- Recognize `Cargo.lock` as TOML ([#7095](https://github.com/helix-editor/helix/pull/7095))
173−- Use Rust grammar for Cairo ([c6d1430](https://github.com/helix-editor/helix/commit/c6d1430))
174−- Update tree-sitter-nickel ([#7059](https://github.com/helix-editor/helix/pull/7059), [#7551](https://github.com/helix-editor/helix/pull/7551))
175−- Tune auto-pair characters for Nickel ([#7059](https://github.com/helix-editor/helix/pull/7059))
176−- Recognize `Vagrantfile` as Ruby ([#7112](https://github.com/helix-editor/helix/pull/7112))
177−- Recognize hidden justfiles as Just ([#7088](https://github.com/helix-editor/helix/pull/7088))
178−- Update Java and TypeScript highlight queries ([#7145](https://github.com/helix-editor/helix/pull/7145))
179−- Recognize `.zimrc` as Bash ([#7146](https://github.com/helix-editor/helix/pull/7146))
180−- Recognize `.gir` as XML ([#7152](https://github.com/helix-editor/helix/pull/7152))
181−- Update tree-sitter-scala ([#7147](https://github.com/helix-editor/helix/pull/7147))
182−- Recognize make file-type as Makefile ([#7212](https://github.com/helix-editor/helix/pull/7212))
183−- Update tree-sitter-verilog ([#7262](https://github.com/helix-editor/helix/pull/7262))
184−- Update tree-sitter-cpp ([#7285](https://github.com/helix-editor/helix/pull/7285))
185−- Support core mode for delve debugger ([#7300](https://github.com/helix-editor/helix/pull/7300))
186−- Add Fortran comment injections ([#7305](https://github.com/helix-editor/helix/pull/7305))
187−- Switch Vue language server to `vue-language-server` ([#7312](https://github.com/helix-editor/helix/pull/7312))
188−- Update tree-sitter-sql ([#7387](https://github.com/helix-editor/helix/pull/7387), [#8464](https://github.com/helix-editor/helix/pull/8464))
189−- Replace the MATLAB tre-sitter grammar ([#7388](https://github.com/helix-editor/helix/pull/7388), [#7442](https://github.com/helix-editor/helix/pull/7442), [#7491](https://github.com/helix-editor/helix/pull/7491), [#7493](https://github.com/helix-editor/helix/pull/7493), [#7511](https://github.com/helix-editor/helix/pull/7511), [#7532](https://github.com/helix-editor/helix/pull/7532), [#8040](https://github.com/helix-editor/helix/pull/8040))
190−- Highlight TOML table headers ([#7441](https://github.com/helix-editor/helix/pull/7441))
191−- Recognize `cppm` file-type as C++ ([#7492](https://github.com/helix-editor/helix/pull/7492))
192−- Refactor ecma language queries into private and public queries ([#7207](https://github.com/helix-editor/helix/pull/7207))
193−- Update tree-sitter-dart ([#7576](https://github.com/helix-editor/helix/pull/7576))
194−- Add shebang for nushell files ([#7606](https://github.com/helix-editor/helix/pull/7606))
195−- Recognize systemd files as INI ([#7592](https://github.com/helix-editor/helix/pull/7592))
196−- Update TypeScript, TSX and Svelte grammars ([#6874](https://github.com/helix-editor/helix/pull/6874))
197−- Enable inlay hints in the Svelte language server ([#7622](https://github.com/helix-editor/helix/pull/7622))
198−- Recognize `Brewfile`s as Ruby ([#7629](https://github.com/helix-editor/helix/pull/7629))
199−- Add more file-types for R ([#7633](https://github.com/helix-editor/helix/pull/7633))
200−- Switch tree-sitter-perl to official upstream parser ([#7644](https://github.com/helix-editor/helix/pull/7644), [#7947](https://github.com/helix-editor/helix/pull/7947))
201−- Fix predicate typo in comment highlights ([#7732](https://github.com/helix-editor/helix/pull/7732))
202−- Update tree-sitter-prql ([#7771](https://github.com/helix-editor/helix/pull/7771))
203−- Recognize `.gitf` as JSON ([#7781](https://github.com/helix-editor/helix/pull/7781))
204−- Switch V language server to `v-analyzer` ([#7760](https://github.com/helix-editor/helix/pull/7760))
205−- Add protobuf language servers ([#7796](https://github.com/helix-editor/helix/pull/7796))
206−- Update tree-sitter-zig ([#7803](https://github.com/helix-editor/helix/pull/7803))
207−- Update tree-sitter-hare ([#7784](https://github.com/helix-editor/helix/pull/7784))
208−- Add Java indent queries ([#7844](https://github.com/helix-editor/helix/pull/7844))
209−- Update tree-sitter-scheme ([979933b](https://github.com/helix-editor/helix/commit/979933b))
210−- Recognize `scm` as Scheme instead of TSQ ([5707151](https://github.com/helix-editor/helix/commit/5707151))
211−- Update tree-sitter-git-commit ([#7831](https://github.com/helix-editor/helix/pull/7831))
212−- Update JavaScript, TypeScript and TSX grammars ([#7852](https://github.com/helix-editor/helix/pull/7852))
213−- Update tree-sitter-nu ([#7873](https://github.com/helix-editor/helix/pull/7873))
214−- Fix YAML indentation ([#6768](https://github.com/helix-editor/helix/pull/6768))
215−- Add `csharp-ls`, Pyright, Pylyzer and add roots for Python ([#7897](https://github.com/helix-editor/helix/pull/7897), [#8032](https://github.com/helix-editor/helix/pull/8032))
216−- Update tree-sitter-slint ([#7893](https://github.com/helix-editor/helix/pull/7893))
217−- Recognize more ZSH file-types as Bash ([#7930](https://github.com/helix-editor/helix/pull/7930))
218−- Recognize `star` extension as Starlark ([#7922](https://github.com/helix-editor/helix/pull/7922))
219−- Fix inline HTML tag highlighting in markdown ([#7960](https://github.com/helix-editor/helix/pull/7960))
220−- Update tree-sitter-robot ([#7970](https://github.com/helix-editor/helix/pull/7970))
221−- Highlight Dart 3 `sealed` and `base` keywords ([#7974](https://github.com/helix-editor/helix/pull/7974))
222−- Add configuration for `ltex-ls` to the default `languages.toml` ([#7838](https://github.com/helix-editor/helix/pull/7838))
223−- Update tree-sitter-strace ([#8087](https://github.com/helix-editor/helix/pull/8087))
224−- Update tree-sitter-gleam, enable auto-format ([#8085](https://github.com/helix-editor/helix/pull/8085))
225−- Update tree-sitter-esdl ([#8222](https://github.com/helix-editor/helix/pull/8222))
226−- Expand ignore file-types ([#8220](https://github.com/helix-editor/helix/pull/8220))
227−- Recognize feed related formats as XML ([#8232](https://github.com/helix-editor/helix/pull/8232))
228−- Improve YAML injections ([#8217](https://github.com/helix-editor/helix/pull/8217))
229−- Add shebangs for TypeScript, Julia, Java and OCaml ([95e994a](https://github.com/helix-editor/helix/commit/95e994a))
230−- Highlight abbreviations in Scheme ([ef23847](https://github.com/helix-editor/helix/commit/ef23847))
231−- Remove backtic auto-pair in OCaml ([#8260](https://github.com/helix-editor/helix/pull/8260))
232−- Recognize `flake.lock` as JSON ([#8304](https://github.com/helix-editor/helix/pull/8304))
233−- Add Python test script injection for Nix ([b4494e1](https://github.com/helix-editor/helix/commit/b4494e1))
234−- Fix Nix comment injection precedence ([37e48f4](https://github.com/helix-editor/helix/commit/37e48f4))
235−- Recognize editorconfig files as INI ([#8308](https://github.com/helix-editor/helix/pull/8308))
236−- Recognize `.babelrc` as JSON ([#8309](https://github.com/helix-editor/helix/pull/8309))
237−- Switch Purescript to its own tree-sitter parser ([#8306](https://github.com/helix-editor/helix/pull/8306), [#8338](https://github.com/helix-editor/helix/pull/8338), [#8527](https://github.com/helix-editor/helix/pull/8527))
238−- Update Unison highlights ([#8315](https://github.com/helix-editor/helix/pull/8315))
239−- Recognize `.webmanifest` as JSON ([#8342](https://github.com/helix-editor/helix/pull/8342))
240−- Recognize polkit policy files as XML ([#8369](https://github.com/helix-editor/helix/pull/8369))
241−- Recognize polkit rules files as JavaScript ([#8370](https://github.com/helix-editor/helix/pull/8370))
242−- Update Go highlight queries ([#8399](https://github.com/helix-editor/helix/pull/8399))
243−- Add shebangs for Makefiles ([#8410](https://github.com/helix-editor/helix/pull/8410))
244−- Add file-type associations from VSCode ([#8388](https://github.com/helix-editor/helix/pull/8388))
245−- Add validation to JSON/CSS language server configs ([#8433](https://github.com/helix-editor/helix/pull/8433))
246−- Add a configuration for the tailwind language server ([#8442](https://github.com/helix-editor/helix/pull/8442))
247−- Add a configuration for the ansible language server ([#7973](https://github.com/helix-editor/helix/pull/7973))
248−- Add a configuration for the GraphQL language server ([#8492](https://github.com/helix-editor/helix/pull/8492))
249−- Indent while statements in Bash ([#8528](https://github.com/helix-editor/helix/pull/8528))
250−- Update tree-sitter-haskell and queries ([#8558](https://github.com/helix-editor/helix/pull/8558))
251−
252−Packaging:
253−
254−- Add an overlay to the Nix flake ([#7078](https://github.com/helix-editor/helix/pull/7078))
255−- Check for `git` before fetching or building grammars ([#7320](https://github.com/helix-editor/helix/pull/7320))
256−- Refactor Nix flake to use Crane ([#7763](https://github.com/helix-editor/helix/pull/7763))
257−- Remove the aarch64 appimage from the release CI ([#7832](https://github.com/helix-editor/helix/pull/7832))
258−- Add desktop and icon files to Nix flake output ([#7979](https://github.com/helix-editor/helix/pull/7979))
259−- Build flake packages with the latest stable Rust ([#8133](https://github.com/helix-editor/helix/pull/8133))
260−
261# 23.05 (2023-05-18)
1# 23.05 (2023-05-18)
262
2
26323.05 is a smaller release focusing on fixes. There were 88 contributors in this release. Thank you all!
323.05 is a smaller release focusing on fixes. There were 88 contributors in this release. Thank you all!
Cargo.lock+590−624
@@ -2,15 +2,6 @@
2# It is not intended for manual editing.
2# It is not intended for manual editing.
3version = 3
3version = 3
4
4
5−[[package]]
6−name = "addr2line"
7−version = "0.20.0"
8−source = "registry+https://github.com/rust-lang/crates.io-index"
9−checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
10−dependencies = [
11− "gimli",
12−]
13−
14[[package]]
5[[package]]
15name = "adler"
6name = "adler"
16version = "1.0.2"
7version = "1.0.2"
@@ -19,22 +10,41 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
19
10
20[[package]]
11[[package]]
21name = "ahash"
12name = "ahash"
22−version = "0.8.6"
13+version = "0.7.6"
14+source = "registry+https://github.com/rust-lang/crates.io-index"
15+checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
16+dependencies = [
17+ "getrandom",
18+ "once_cell",
19+ "version_check",
20+]
21+
22+[[package]]
23+name = "ahash"
24+version = "0.8.3"
23source = "registry+https://github.com/rust-lang/crates.io-index"
25source = "registry+https://github.com/rust-lang/crates.io-index"
24−checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
26+checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
25dependencies = [
27dependencies = [
26 "cfg-if",
28 "cfg-if",
27 "getrandom",
29 "getrandom",
28 "once_cell",
30 "once_cell",
29 "version_check",
31 "version_check",
30− "zerocopy",
31]
32]
32
33
33[[package]]
34[[package]]
34name = "aho-corasick"
35name = "aho-corasick"
35−version = "1.1.2"
36+version = "0.7.20"
36source = "registry+https://github.com/rust-lang/crates.io-index"
37source = "registry+https://github.com/rust-lang/crates.io-index"
37−checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
38+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
39+dependencies = [
40+ "memchr",
41+]
42+
43+[[package]]
44+name = "aho-corasick"
45+version = "1.0.1"
46+source = "registry+https://github.com/rust-lang/crates.io-index"
47+checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
38dependencies = [
48dependencies = [
39 "memchr",
49 "memchr",
40]
50]
@@ -62,9 +72,9 @@ dependencies = [
62
72
63[[package]]
73[[package]]
64name = "anyhow"
74name = "anyhow"
65−version = "1.0.76"
75+version = "1.0.71"
66source = "registry+https://github.com/rust-lang/crates.io-index"
76source = "registry+https://github.com/rust-lang/crates.io-index"
67−checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355"
77+checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
68
78
69[[package]]
79[[package]]
70name = "arc-swap"
80name = "arc-swap"
@@ -78,21 +88,6 @@ version = "1.1.0"
78source = "registry+https://github.com/rust-lang/crates.io-index"
88source = "registry+https://github.com/rust-lang/crates.io-index"
79checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
89checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
80
90
81−[[package]]
82−name = "backtrace"
83−version = "0.3.68"
84−source = "registry+https://github.com/rust-lang/crates.io-index"
85−checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
86−dependencies = [
87− "addr2line",
88− "cc",
89− "cfg-if",
90− "libc",
91− "miniz_oxide",
92− "object",
93− "rustc-demangle",
94−]
95−
96[[package]]
91[[package]]
97name = "bitflags"
92name = "bitflags"
98version = "1.3.2"
93version = "1.3.2"
@@ -101,17 +96,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
101
96
102[[package]]
97[[package]]
103name = "bitflags"
98name = "bitflags"
104−version = "2.4.1"
99+version = "2.3.2"
105source = "registry+https://github.com/rust-lang/crates.io-index"
100source = "registry+https://github.com/rust-lang/crates.io-index"
106−checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
101+checksum = "6dbe3c979c178231552ecba20214a8272df4e09f232a87aef4320cf06539aded"
107
102
108[[package]]
103[[package]]
109name = "bstr"
104name = "bstr"
110−version = "1.8.0"
105+version = "1.4.0"
111source = "registry+https://github.com/rust-lang/crates.io-index"
106source = "registry+https://github.com/rust-lang/crates.io-index"
112−checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c"
107+checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09"
113dependencies = [
108dependencies = [
114 "memchr",
109 "memchr",
110+ "once_cell",
115 "regex-automata",
111 "regex-automata",
116 "serde",
112 "serde",
117]
113]
@@ -131,6 +127,12 @@ version = "3.12.0"
131source = "registry+https://github.com/rust-lang/crates.io-index"
127source = "registry+https://github.com/rust-lang/crates.io-index"
132checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
128checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
133
129
130+[[package]]
131+name = "bytecount"
132+version = "0.6.3"
133+source = "registry+https://github.com/rust-lang/crates.io-index"
134+checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c"
135+
134[[package]]
136[[package]]
135name = "bytes"
137name = "bytes"
136version = "1.4.0"
138version = "1.4.0"
@@ -145,12 +147,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
145
147
146[[package]]
148[[package]]
147name = "cc"
149name = "cc"
148−version = "1.0.84"
150+version = "1.0.79"
149source = "registry+https://github.com/rust-lang/crates.io-index"
151source = "registry+https://github.com/rust-lang/crates.io-index"
150−checksum = "0f8e7c90afad890484a21653d08b6e209ae34770fb5ee298f9c699fcc1e5c856"
152+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
151−dependencies = [
152− "libc",
153−]
154
153
155[[package]]
154[[package]]
156name = "cfg-if"
155name = "cfg-if"
@@ -171,23 +170,25 @@ dependencies = [
171
170
172[[package]]
171[[package]]
173name = "chrono"
172name = "chrono"
174−version = "0.4.31"
173+version = "0.4.26"
175source = "registry+https://github.com/rust-lang/crates.io-index"
174source = "registry+https://github.com/rust-lang/crates.io-index"
176−checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
175+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
177dependencies = [
176dependencies = [
178 "android-tzdata",
177 "android-tzdata",
179 "iana-time-zone",
178 "iana-time-zone",
180 "num-traits",
179 "num-traits",
181− "windows-targets 0.48.0",
180+ "winapi",
182]
181]
183
182
184[[package]]
183[[package]]
185name = "clipboard-win"
184name = "clipboard-win"
186−version = "5.0.0"
185+version = "4.5.0"
187source = "registry+https://github.com/rust-lang/crates.io-index"
186source = "registry+https://github.com/rust-lang/crates.io-index"
188−checksum = "c57002a5d9be777c1ef967e33674dac9ebd310d8893e4e3437b14d5f0f6372cc"
187+checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362"
189dependencies = [
188dependencies = [
190 "error-code",
189 "error-code",
190+ "str-buf",
191+ "winapi",
191]
192]
192
193
193[[package]]
194[[package]]
@@ -221,12 +222,6 @@ version = "0.8.4"
221source = "registry+https://github.com/rust-lang/crates.io-index"
222source = "registry+https://github.com/rust-lang/crates.io-index"
222checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
223checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
223
224
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−
230[[package]]
225[[package]]
231name = "crc32fast"
226name = "crc32fast"
232version = "1.3.2"
227version = "1.3.2"
@@ -236,58 +231,14 @@ dependencies = [
236 "cfg-if",
231 "cfg-if",
237]
232]
238
233
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−
282[[package]]
234[[package]]
283name = "crossterm"
235name = "crossterm"
284−version = "0.27.0"
236+version = "0.26.1"
285source = "registry+https://github.com/rust-lang/crates.io-index"
237source = "registry+https://github.com/rust-lang/crates.io-index"
286−checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
238+checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13"
287dependencies = [
239dependencies = [
288− "bitflags 2.4.1",
240+ "bitflags 1.3.2",
289 "crossterm_winapi",
241 "crossterm_winapi",
290− "filedescriptor",
291 "futures-core",
242 "futures-core",
292 "libc",
243 "libc",
293 "mio",
244 "mio",
@@ -299,9 +250,9 @@ dependencies = [
299
250
300[[package]]
251[[package]]
301name = "crossterm_winapi"
252name = "crossterm_winapi"
302−version = "0.9.1"
253+version = "0.9.0"
303source = "registry+https://github.com/rust-lang/crates.io-index"
254source = "registry+https://github.com/rust-lang/crates.io-index"
304−checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
255+checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c"
305dependencies = [
256dependencies = [
306 "winapi",
257 "winapi",
307]
258]
@@ -330,7 +281,7 @@ dependencies = [
330 "proc-macro2",
281 "proc-macro2",
331 "quote",
282 "quote",
332 "scratch",
283 "scratch",
333− "syn 2.0.38",
284+ "syn 2.0.15",
334]
285]
335
286
336[[package]]
287[[package]]
@@ -347,7 +298,7 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
347dependencies = [
298dependencies = [
348 "proc-macro2",
299 "proc-macro2",
349 "quote",
300 "quote",
350− "syn 2.0.38",
301+ "syn 2.0.15",
351]
302]
352
303
353[[package]]
304[[package]]
@@ -364,9 +315,9 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
364
315
365[[package]]
316[[package]]
366name = "encoding_rs"
317name = "encoding_rs"
367−version = "0.8.33"
318+version = "0.8.32"
368source = "registry+https://github.com/rust-lang/crates.io-index"
319source = "registry+https://github.com/rust-lang/crates.io-index"
369−checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
320+checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
370dependencies = [
321dependencies = [
371 "cfg-if",
322 "cfg-if",
372]
323]
@@ -381,26 +332,35 @@ dependencies = [
381]
332]
382
333
383[[package]]
334[[package]]
384−name = "equivalent"
335+name = "errno"
385−version = "1.0.0"
336+version = "0.3.1"
386source = "registry+https://github.com/rust-lang/crates.io-index"
337source = "registry+https://github.com/rust-lang/crates.io-index"
387−checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"
338+checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
339+dependencies = [
340+ "errno-dragonfly",
341+ "libc",
342+ "windows-sys 0.48.0",
343+]
388
344
389[[package]]
345[[package]]
390−name = "errno"
346+name = "errno-dragonfly"
391−version = "0.3.8"
347+version = "0.1.2"
392source = "registry+https://github.com/rust-lang/crates.io-index"
348source = "registry+https://github.com/rust-lang/crates.io-index"
393−checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
349+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
394dependencies = [
350dependencies = [
351+ "cc",
395 "libc",
352 "libc",
396− "windows-sys 0.52.0",
397]
353]
398
354
399[[package]]
355[[package]]
400name = "error-code"
356name = "error-code"
401−version = "3.0.0"
357+version = "2.3.1"
402source = "registry+https://github.com/rust-lang/crates.io-index"
358source = "registry+https://github.com/rust-lang/crates.io-index"
403−checksum = "281e452d3bad4005426416cdba5ccfd4f5c1280e10099e21db27f7c1c28347fc"
359+checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21"
360+dependencies = [
361+ "libc",
362+ "str-buf",
363+]
404
364
405[[package]]
365[[package]]
406name = "etcetera"
366name = "etcetera"
@@ -414,20 +374,14 @@ dependencies = [
414]
374]
415
375
416[[package]]
376[[package]]
417−name = "faster-hex"
377+name = "fastrand"
418−version = "0.9.0"
378+version = "1.9.0"
419source = "registry+https://github.com/rust-lang/crates.io-index"
379source = "registry+https://github.com/rust-lang/crates.io-index"
420−checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183"
380+checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
421dependencies = [
381dependencies = [
422− "serde",
382+ "instant",
423]
383]
424
384
425−[[package]]
426−name = "fastrand"
427−version = "2.0.0"
428−source = "registry+https://github.com/rust-lang/crates.io-index"
429−checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
430−
431[[package]]
385[[package]]
432name = "fern"
386name = "fern"
433version = "0.6.2"
387version = "0.6.2"
@@ -438,46 +392,53 @@ dependencies = [
438]
392]
439
393
440[[package]]
394[[package]]
441−name = "filedescriptor"
395+name = "filetime"
442−version = "0.8.2"
396+version = "0.2.21"
443source = "registry+https://github.com/rust-lang/crates.io-index"
397source = "registry+https://github.com/rust-lang/crates.io-index"
444−checksum = "7199d965852c3bac31f779ef99cbb4537f80e952e2d6aa0ffeb30cce00f4f46e"
398+checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153"
445dependencies = [
399dependencies = [
400+ "cfg-if",
446 "libc",
401 "libc",
447− "thiserror",
402+ "redox_syscall 0.2.16",
448− "winapi",
403+ "windows-sys 0.48.0",
449]
404]
450
405
451[[package]]
406[[package]]
452name = "flate2"
407name = "flate2"
453−version = "1.0.27"
408+version = "1.0.25"
454source = "registry+https://github.com/rust-lang/crates.io-index"
409source = "registry+https://github.com/rust-lang/crates.io-index"
455−checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
410+checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
456dependencies = [
411dependencies = [
457 "crc32fast",
412 "crc32fast",
458 "miniz_oxide",
413 "miniz_oxide",
459]
414]
460
415
416+[[package]]
417+name = "fnv"
418+version = "1.0.7"
419+source = "registry+https://github.com/rust-lang/crates.io-index"
420+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
421+
461[[package]]
422[[package]]
462name = "form_urlencoded"
423name = "form_urlencoded"
463−version = "1.2.1"
424+version = "1.2.0"
464source = "registry+https://github.com/rust-lang/crates.io-index"
425source = "registry+https://github.com/rust-lang/crates.io-index"
465−checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
426+checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
466dependencies = [
427dependencies = [
467 "percent-encoding",
428 "percent-encoding",
468]
429]
469
430
470[[package]]
431[[package]]
471name = "futures-core"
432name = "futures-core"
472−version = "0.3.30"
433+version = "0.3.28"
473source = "registry+https://github.com/rust-lang/crates.io-index"
434source = "registry+https://github.com/rust-lang/crates.io-index"
474−checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
435+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
475
436
476[[package]]
437[[package]]
477name = "futures-executor"
438name = "futures-executor"
478−version = "0.3.29"
439+version = "0.3.28"
479source = "registry+https://github.com/rust-lang/crates.io-index"
440source = "registry+https://github.com/rust-lang/crates.io-index"
480−checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
441+checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
481dependencies = [
442dependencies = [
482 "futures-core",
443 "futures-core",
483 "futures-task",
444 "futures-task",
@@ -486,15 +447,15 @@ dependencies = [
486
447
487[[package]]
448[[package]]
488name = "futures-task"
449name = "futures-task"
489−version = "0.3.30"
450+version = "0.3.28"
490source = "registry+https://github.com/rust-lang/crates.io-index"
451source = "registry+https://github.com/rust-lang/crates.io-index"
491−checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
452+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
492
453
493[[package]]
454[[package]]
494name = "futures-util"
455name = "futures-util"
495−version = "0.3.30"
456+version = "0.3.28"
496source = "registry+https://github.com/rust-lang/crates.io-index"
457source = "registry+https://github.com/rust-lang/crates.io-index"
497−checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
458+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
498dependencies = [
459dependencies = [
499 "futures-core",
460 "futures-core",
500 "futures-task",
461 "futures-task",
@@ -503,6 +464,15 @@ dependencies = [
503 "slab",
464 "slab",
504]
465]
505
466
467+[[package]]
468+name = "fuzzy-matcher"
469+version = "0.3.7"
470+source = "registry+https://github.com/rust-lang/crates.io-index"
471+checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94"
472+dependencies = [
473+ "thread_local",
474+]
475+
506[[package]]
476[[package]]
507name = "getrandom"
477name = "getrandom"
508version = "0.2.9"
478version = "0.2.9"
@@ -514,21 +484,17 @@ dependencies = [
514 "wasi",
484 "wasi",
515]
485]
516
486
517−[[package]]
518−name = "gimli"
519−version = "0.27.3"
520−source = "registry+https://github.com/rust-lang/crates.io-index"
521−checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
522−
523[[package]]
487[[package]]
524name = "gix"
488name = "gix"
525−version = "0.57.0"
489+version = "0.46.0"
526source = "registry+https://github.com/rust-lang/crates.io-index"
490source = "registry+https://github.com/rust-lang/crates.io-index"
527−checksum = "721c7497ab24b665ed5a1eb2b3526936aa60068e61ba260651f7e77c52feec69"
491+checksum = "99368b48a2f68c3fdc26e62c6425bdc4baeb4f30a4f24eb2e0904d29a2ba97ab"
528dependencies = [
492dependencies = [
529 "gix-actor",
493 "gix-actor",
494+ "gix-attributes",
530 "gix-commitgraph",
495 "gix-commitgraph",
531 "gix-config",
496 "gix-config",
497+ "gix-credentials",
532 "gix-date",
498 "gix-date",
533 "gix-diff",
499 "gix-diff",
534 "gix-discover",
500 "gix-discover",
@@ -537,25 +503,29 @@ dependencies = [
537 "gix-glob",
503 "gix-glob",
538 "gix-hash",
504 "gix-hash",
539 "gix-hashtable",
505 "gix-hashtable",
506+ "gix-ignore",
507+ "gix-index",
540 "gix-lock",
508 "gix-lock",
541− "gix-macros",
509+ "gix-mailmap",
510+ "gix-negotiate",
542 "gix-object",
511 "gix-object",
543 "gix-odb",
512 "gix-odb",
544 "gix-pack",
513 "gix-pack",
545 "gix-path",
514 "gix-path",
515+ "gix-prompt",
546 "gix-ref",
516 "gix-ref",
547 "gix-refspec",
517 "gix-refspec",
548 "gix-revision",
518 "gix-revision",
549− "gix-revwalk",
550 "gix-sec",
519 "gix-sec",
551 "gix-tempfile",
520 "gix-tempfile",
552− "gix-trace",
553 "gix-traverse",
521 "gix-traverse",
554 "gix-url",
522 "gix-url",
555 "gix-utils",
523 "gix-utils",
556 "gix-validate",
524 "gix-validate",
525+ "gix-worktree",
526+ "log",
557 "once_cell",
527 "once_cell",
558− "parking_lot",
528+ "signal-hook",
559 "smallvec",
529 "smallvec",
560 "thiserror",
530 "thiserror",
561 "unicode-normalization",
531 "unicode-normalization",
@@ -563,32 +533,67 @@ dependencies = [
563
533
564[[package]]
534[[package]]
565name = "gix-actor"
535name = "gix-actor"
566−version = "0.29.0"
536+version = "0.21.0"
567source = "registry+https://github.com/rust-lang/crates.io-index"
537source = "registry+https://github.com/rust-lang/crates.io-index"
568−checksum = "886014c4865b93ce268f1d3eddd4fd3261242c3f3ee61eb36009f913016a9059"
538+checksum = "9fe73f9f6be1afbf1bd5be919a9636fa560e2f14d42262a934423ed6760cd838"
569dependencies = [
539dependencies = [
570 "bstr",
540 "bstr",
571 "btoi",
541 "btoi",
572 "gix-date",
542 "gix-date",
573 "itoa",
543 "itoa",
544+ "nom",
545+ "thiserror",
546+]
547+
548+[[package]]
549+name = "gix-attributes"
550+version = "0.13.1"
551+source = "registry+https://github.com/rust-lang/crates.io-index"
552+checksum = "78b79590ac382f80d87e06416f5fcac6fee5d83dcb152a00ed0bdbaa988acc31"
553+dependencies = [
554+ "bstr",
555+ "gix-glob",
556+ "gix-path",
557+ "gix-quote",
558+ "kstring",
559+ "log",
560+ "smallvec",
561+ "thiserror",
562+ "unicode-bom",
563+]
564+
565+[[package]]
566+name = "gix-bitmap"
567+version = "0.2.4"
568+source = "registry+https://github.com/rust-lang/crates.io-index"
569+checksum = "fc02feb20ad313d52a450852f2005c2205d24f851e74d82b7807cbe12c371667"
570+dependencies = [
574 "thiserror",
571 "thiserror",
575− "winnow 0.5.28",
576]
572]
577
573
578[[package]]
574[[package]]
579name = "gix-chunk"
575name = "gix-chunk"
580−version = "0.4.6"
576+version = "0.4.2"
581source = "registry+https://github.com/rust-lang/crates.io-index"
577source = "registry+https://github.com/rust-lang/crates.io-index"
582−checksum = "2ade37ef69870de0ed966b97c57a3a947a22ff3482a52c3b99b205f77bcb08fb"
578+checksum = "a7acf3bc6c4b91e8fb260086daf5e105ea3a6d913f5fd3318137f7e309d6e540"
583dependencies = [
579dependencies = [
584 "thiserror",
580 "thiserror",
585]
581]
586
582
583+[[package]]
584+name = "gix-command"
585+version = "0.2.5"
586+source = "registry+https://github.com/rust-lang/crates.io-index"
587+checksum = "5f6141b70cfb21255223e42f3379855037cbbe8673b58dd8318d2f09b516fad1"
588+dependencies = [
589+ "bstr",
590+]
591+
587[[package]]
592[[package]]
588name = "gix-commitgraph"
593name = "gix-commitgraph"
589−version = "0.23.0"
594+version = "0.16.0"
590source = "registry+https://github.com/rust-lang/crates.io-index"
595source = "registry+https://github.com/rust-lang/crates.io-index"
591−checksum = "e7559ea9cefee188cd88b05afcc8e3ef7a3cb4a5c647bccf06b981e591b02b77"
596+checksum = "e8490ae1b3d55c47e6a71d247c082304a2f79f8d0332c1a2f5693d42a2021a09"
592dependencies = [
597dependencies = [
593 "bstr",
598 "bstr",
594 "gix-chunk",
599 "gix-chunk",
@@ -600,9 +605,9 @@ dependencies = [
600
605
601[[package]]
606[[package]]
602name = "gix-config"
607name = "gix-config"
603−version = "0.33.0"
608+version = "0.23.0"
604source = "registry+https://github.com/rust-lang/crates.io-index"
609source = "registry+https://github.com/rust-lang/crates.io-index"
605−checksum = "9c35dc7f9c00a42bbc9cfa1ca2ec0a78ad1b76ff0736d3d35dfd612962244467"
610+checksum = "51f310120ae1ba8f0ca52fb22876ce9bad5b15c8ffb3eb7302e4b64a3b9f681c"
606dependencies = [
611dependencies = [
607 "bstr",
612 "bstr",
608 "gix-config-value",
613 "gix-config-value",
@@ -611,32 +616,49 @@ dependencies = [
611 "gix-path",
616 "gix-path",
612 "gix-ref",
617 "gix-ref",
613 "gix-sec",
618 "gix-sec",
619+ "log",
614 "memchr",
620 "memchr",
621+ "nom",
615 "once_cell",
622 "once_cell",
616 "smallvec",
623 "smallvec",
617 "thiserror",
624 "thiserror",
618 "unicode-bom",
625 "unicode-bom",
619− "winnow 0.5.28",
620]
626]
621
627
622[[package]]
628[[package]]
623name = "gix-config-value"
629name = "gix-config-value"
624−version = "0.14.2"
630+version = "0.12.1"
625source = "registry+https://github.com/rust-lang/crates.io-index"
631source = "registry+https://github.com/rust-lang/crates.io-index"
626−checksum = "39f388cb2396aee82d6f460a2e7770659bdf8854e9e5478f7d2b1324a9698284"
632+checksum = "6f216df1c33e6e1555923eff0096858a879e8aaadd35b5d788641e4e8064c892"
627dependencies = [
633dependencies = [
628− "bitflags 2.4.1",
634+ "bitflags 2.3.2",
629 "bstr",
635 "bstr",
630 "gix-path",
636 "gix-path",
631 "libc",
637 "libc",
632 "thiserror",
638 "thiserror",
633]
639]
634
640
641+[[package]]
642+name = "gix-credentials"
643+version = "0.15.0"
644+source = "registry+https://github.com/rust-lang/crates.io-index"
645+checksum = "c6f89fea8acd28f5ef8fa5042146f1637afd4d834bc8f13439d8fd1e5aca0d65"
646+dependencies = [
647+ "bstr",
648+ "gix-command",
649+ "gix-config-value",
650+ "gix-path",
651+ "gix-prompt",
652+ "gix-sec",
653+ "gix-url",
654+ "thiserror",
655+]
656+
635[[package]]
657[[package]]
636name = "gix-date"
658name = "gix-date"
637−version = "0.8.2"
659+version = "0.5.1"
638source = "registry+https://github.com/rust-lang/crates.io-index"
660source = "registry+https://github.com/rust-lang/crates.io-index"
639−checksum = "9d85f4a01e0d05c3de585e28bae514d4baf01655e3fc3f14ce6f30bf62405345"
661+checksum = "bc164145670e9130a60a21670d9b6f0f4f8de04e5dd256c51fa5a0340c625902"
640dependencies = [
662dependencies = [
641 "bstr",
663 "bstr",
642 "itoa",
664 "itoa",
@@ -646,21 +668,21 @@ dependencies = [
646
668
647[[package]]
669[[package]]
648name = "gix-diff"
670name = "gix-diff"
649−version = "0.39.0"
671+version = "0.30.1"
650source = "registry+https://github.com/rust-lang/crates.io-index"
672source = "registry+https://github.com/rust-lang/crates.io-index"
651−checksum = "ac0e75f5afd2f6c47c800b6b0a000a08045739d0450d20482e8faa42543f62d1"
673+checksum = "9029ad0083cc286a4bd2f5b3bf66bb66398abc26f2731a2824cd5edfc41a0e33"
652dependencies = [
674dependencies = [
653− "bstr",
654 "gix-hash",
675 "gix-hash",
655 "gix-object",
676 "gix-object",
677+ "imara-diff",
656 "thiserror",
678 "thiserror",
657]
679]
658
680
659[[package]]
681[[package]]
660name = "gix-discover"
682name = "gix-discover"
661−version = "0.28.0"
683+version = "0.19.0"
662source = "registry+https://github.com/rust-lang/crates.io-index"
684source = "registry+https://github.com/rust-lang/crates.io-index"
663−checksum = "f0b63ce2ad81632ac1a84ac370f85a5e580c3261580bd85ea17ff35d3a0bba18"
685+checksum = "aba9c6c0d1f2b2efe65581de73de4305004612d49c83773e783202a7ef204f46"
664dependencies = [
686dependencies = [
665 "bstr",
687 "bstr",
666 "dunce",
688 "dunce",
@@ -673,14 +695,13 @@ dependencies = [
673
695
674[[package]]
696[[package]]
675name = "gix-features"
697name = "gix-features"
676−version = "0.37.0"
698+version = "0.30.0"
677source = "registry+https://github.com/rust-lang/crates.io-index"
699source = "registry+https://github.com/rust-lang/crates.io-index"
678−checksum = "befe7edea299a824504b5acc96d7a3a538125b38c42f3a8379f6912a29c90c81"
700+checksum = "3a8c493409bf6060d408eec9bbdd1b12ea351266b50012e2a522f75dfc7b8314"
679dependencies = [
701dependencies = [
680 "crc32fast",
702 "crc32fast",
681 "flate2",
703 "flate2",
682 "gix-hash",
704 "gix-hash",
683− "gix-trace",
684 "libc",
705 "libc",
685 "once_cell",
706 "once_cell",
686 "prodash",
707 "prodash",
@@ -691,20 +712,20 @@ dependencies = [
691
712
692[[package]]
713[[package]]
693name = "gix-fs"
714name = "gix-fs"
694−version = "0.9.0"
715+version = "0.2.0"
695source = "registry+https://github.com/rust-lang/crates.io-index"
716source = "registry+https://github.com/rust-lang/crates.io-index"
696−checksum = "007017ce93b819ea52c0ec68306f7d72212a2d307c3d70f1548c7141c015d0a1"
717+checksum = "30da8997008adb87f94e15beb7ee229f8a48e97af585a584bfee4a5a1880aab5"
697dependencies = [
718dependencies = [
698 "gix-features",
719 "gix-features",
699]
720]
700
721
701[[package]]
722[[package]]
702name = "gix-glob"
723name = "gix-glob"
703−version = "0.15.0"
724+version = "0.8.0"
704source = "registry+https://github.com/rust-lang/crates.io-index"
725source = "registry+https://github.com/rust-lang/crates.io-index"
705−checksum = "61fb116c2516d3a1170e010118f639944a6389872c875a008960cdab2a44ac72"
726+checksum = "cd0ade1e80ab1f079703d1824e1daf73009096386aa7fd2f0477f6e4ac0a558e"
706dependencies = [
727dependencies = [
707− "bitflags 2.4.1",
728+ "bitflags 2.3.2",
708 "bstr",
729 "bstr",
709 "gix-features",
730 "gix-features",
710 "gix-path",
731 "gix-path",
@@ -712,30 +733,64 @@ dependencies = [
712
733
713[[package]]
734[[package]]
714name = "gix-hash"
735name = "gix-hash"
715−version = "0.14.0"
736+version = "0.11.2"
716source = "registry+https://github.com/rust-lang/crates.io-index"
737source = "registry+https://github.com/rust-lang/crates.io-index"
717−checksum = "c52c3170a17b6031833cd2eb4ad7bc23f2755d06e6e70f78dec21d42e8fe1b30"
738+checksum = "ee181c85d3955f54c4426e6bfaeeada4428692e1a39b8788c2ac7785fc301dd8"
718dependencies = [
739dependencies = [
719− "faster-hex",
740+ "hex",
720 "thiserror",
741 "thiserror",
721]
742]
722
743
723[[package]]
744[[package]]
724name = "gix-hashtable"
745name = "gix-hashtable"
725−version = "0.5.0"
746+version = "0.2.1"
726source = "registry+https://github.com/rust-lang/crates.io-index"
747source = "registry+https://github.com/rust-lang/crates.io-index"
727−checksum = "40a838e6366a5e5b84668b6997ce0981b833136468e8ba949f424c0ef2927eba"
748+checksum = "bd259bd0d96e6153e357a8cdaca76c48e103fd34208b6c0ce77b1ad995834bd2"
728dependencies = [
749dependencies = [
729 "gix-hash",
750 "gix-hash",
730− "hashbrown 0.14.3",
751+ "hashbrown 0.13.2",
731 "parking_lot",
752 "parking_lot",
732]
753]
733
754
755+[[package]]
756+name = "gix-ignore"
757+version = "0.3.0"
758+source = "registry+https://github.com/rust-lang/crates.io-index"
759+checksum = "fc6f7f101a0ccce808dbf7008ba131dede94e20257e7bde7a44cbb2f8c775625"
760+dependencies = [
761+ "bstr",
762+ "gix-glob",
763+ "gix-path",
764+ "unicode-bom",
765+]
766+
767+[[package]]
768+name = "gix-index"
769+version = "0.18.0"
770+source = "registry+https://github.com/rust-lang/crates.io-index"
771+checksum = "ca0380cdab7863e67966eee4aed32856c864c20b077e026b637af6bb3a9281b4"
772+dependencies = [
773+ "bitflags 2.3.2",
774+ "bstr",
775+ "btoi",
776+ "filetime",
777+ "gix-bitmap",
778+ "gix-features",
779+ "gix-hash",
780+ "gix-lock",
781+ "gix-object",
782+ "gix-traverse",
783+ "itoa",
784+ "memmap2",
785+ "smallvec",
786+ "thiserror",
787+]
788+
734[[package]]
789[[package]]
735name = "gix-lock"
790name = "gix-lock"
736−version = "12.0.0"
791+version = "6.0.0"
737source = "registry+https://github.com/rust-lang/crates.io-index"
792source = "registry+https://github.com/rust-lang/crates.io-index"
738−checksum = "6cf112ddee94223c119a8534dad027740dc3aba3365ac5edeef8a7f6660c74db"
793+checksum = "3ec5d5e6f07316d3553aa7425e3ecd935ec29882556021fe1696297a448af8d2"
739dependencies = [
794dependencies = [
740 "gix-tempfile",
795 "gix-tempfile",
741 "gix-utils",
796 "gix-utils",
@@ -743,43 +798,57 @@ dependencies = [
743]
798]
744
799
745[[package]]
800[[package]]
746−name = "gix-macros"
801+name = "gix-mailmap"
747−version = "0.1.2"
802+version = "0.13.0"
748source = "registry+https://github.com/rust-lang/crates.io-index"
803source = "registry+https://github.com/rust-lang/crates.io-index"
749−checksum = "fc207b64189cf71bcb17fc841ab99a5d63d0845546b611e2703ce467f659323a"
804+checksum = "4653701922c920e009f1bc4309feaff14882ade017770788f9a150928da3fa6a"
750dependencies = [
805dependencies = [
751− "proc-macro2",
806+ "bstr",
752− "quote",
807+ "gix-actor",
753− "syn 2.0.38",
808+ "thiserror",
809+]
810+
811+[[package]]
812+name = "gix-negotiate"
813+version = "0.2.1"
814+source = "registry+https://github.com/rust-lang/crates.io-index"
815+checksum = "945c3ef1e912e44a5f405fc9e924edf42000566a1b257ed52cb1293300f6f08c"
816+dependencies = [
817+ "bitflags 2.3.2",
818+ "gix-commitgraph",
819+ "gix-hash",
820+ "gix-object",
821+ "gix-revision",
822+ "smallvec",
823+ "thiserror",
754]
824]
755
825
756[[package]]
826[[package]]
757name = "gix-object"
827name = "gix-object"
758−version = "0.40.0"
828+version = "0.30.0"
759source = "registry+https://github.com/rust-lang/crates.io-index"
829source = "registry+https://github.com/rust-lang/crates.io-index"
760−checksum = "e4c77e47ffba92127faf632a841fce23d19547e269bd8b88e68961a70eab4e93"
830+checksum = "8926c8f51c44dec3e709cb5dbc93deb9e8d4064c43c9efc54c158dcdfe8446c7"
761dependencies = [
831dependencies = [
762 "bstr",
832 "bstr",
763 "btoi",
833 "btoi",
764 "gix-actor",
834 "gix-actor",
765− "gix-date",
766 "gix-features",
835 "gix-features",
767 "gix-hash",
836 "gix-hash",
768 "gix-validate",
837 "gix-validate",
838+ "hex",
769 "itoa",
839 "itoa",
840+ "nom",
770 "smallvec",
841 "smallvec",
771 "thiserror",
842 "thiserror",
772− "winnow 0.5.28",
773]
843]
774
844
775[[package]]
845[[package]]
776name = "gix-odb"
846name = "gix-odb"
777−version = "0.56.0"
847+version = "0.47.0"
778source = "registry+https://github.com/rust-lang/crates.io-index"
848source = "registry+https://github.com/rust-lang/crates.io-index"
779−checksum = "a3254f2005cc7553ea78e85e816a09150c6f7a64e6b7627b8d1fdc56721bea73"
849+checksum = "91d98eaba4f649fed17250651c4ddfaf997c80a30f5ee4b47ac9bc18ffe3eb16"
780dependencies = [
850dependencies = [
781 "arc-swap",
851 "arc-swap",
782− "gix-date",
783 "gix-features",
852 "gix-features",
784 "gix-hash",
853 "gix-hash",
785 "gix-object",
854 "gix-object",
@@ -793,18 +862,20 @@ dependencies = [
793
862
794[[package]]
863[[package]]
795name = "gix-pack"
864name = "gix-pack"
796−version = "0.46.0"
865+version = "0.37.0"
797source = "registry+https://github.com/rust-lang/crates.io-index"
866source = "registry+https://github.com/rust-lang/crates.io-index"
798−checksum = "02ebc8cd657eec207d82d8f876ca402361308ecd3c87a47935b0299506257b4f"
867+checksum = "82e9e228f18cd87e7596e687b38619b5e4caebc678644ae6bb3d842598166d72"
799dependencies = [
868dependencies = [
800 "clru",
869 "clru",
801 "gix-chunk",
870 "gix-chunk",
871+ "gix-diff",
802 "gix-features",
872 "gix-features",
803 "gix-hash",
873 "gix-hash",
804 "gix-hashtable",
874 "gix-hashtable",
805 "gix-object",
875 "gix-object",
806 "gix-path",
876 "gix-path",
807 "gix-tempfile",
877 "gix-tempfile",
878+ "gix-traverse",
808 "memmap2",
879 "memmap2",
809 "parking_lot",
880 "parking_lot",
810 "smallvec",
881 "smallvec",
@@ -813,22 +884,34 @@ dependencies = [
813
884
814[[package]]
885[[package]]
815name = "gix-path"
886name = "gix-path"
816−version = "0.10.2"
887+version = "0.8.1"
817source = "registry+https://github.com/rust-lang/crates.io-index"
888source = "registry+https://github.com/rust-lang/crates.io-index"
818−checksum = "10931652a3da126990ac93bce1b1c600cc99d7c268d712b6360ed52174ce1b68"
889+checksum = "c1226f2e50adeb4d76c754c1856c06f13a24cad1624801653fbf09b869e5b808"
819dependencies = [
890dependencies = [
820 "bstr",
891 "bstr",
821− "gix-trace",
822 "home",
892 "home",
823 "once_cell",
893 "once_cell",
824 "thiserror",
894 "thiserror",
825]
895]
826
896
897+[[package]]
898+name = "gix-prompt"
899+version = "0.5.1"
900+source = "registry+https://github.com/rust-lang/crates.io-index"
901+checksum = "e15fe57fa48572b7d3bf465d6a2a0351cd3c55cba74fd5f0b9c23689f9c1a31e"
902+dependencies = [
903+ "gix-command",
904+ "gix-config-value",
905+ "parking_lot",
906+ "rustix",
907+ "thiserror",
908+]
909+
827[[package]]
910[[package]]
828name = "gix-quote"
911name = "gix-quote"
829−version = "0.4.9"
912+version = "0.4.4"
830source = "registry+https://github.com/rust-lang/crates.io-index"
913source = "registry+https://github.com/rust-lang/crates.io-index"
831−checksum = "6c43530cb94a7759807e6f8d180e17ac9c65673b891645c6c433831dc0cf4342"
914+checksum = "29d59489bff95b06dcdabe763b7266d3dc0a628cac1ac1caf65a7ca0a43eeae0"
832dependencies = [
915dependencies = [
833 "bstr",
916 "bstr",
834 "btoi",
917 "btoi",
@@ -837,12 +920,11 @@ dependencies = [
837
920
838[[package]]
921[[package]]
839name = "gix-ref"
922name = "gix-ref"
840−version = "0.40.0"
923+version = "0.30.0"
841source = "registry+https://github.com/rust-lang/crates.io-index"
924source = "registry+https://github.com/rust-lang/crates.io-index"
842−checksum = "baa951b3b850d6d1be4f900768e49af20b76bf9505beac22af723d57249a2f1d"
925+checksum = "ebdd999256f4ce8a5eefa89999879c159c263f3493a951d62aa5ce42c0397e1c"
843dependencies = [
926dependencies = [
844 "gix-actor",
927 "gix-actor",
845− "gix-date",
846 "gix-features",
928 "gix-features",
847 "gix-fs",
929 "gix-fs",
848 "gix-hash",
930 "gix-hash",
@@ -852,15 +934,15 @@ dependencies = [
852 "gix-tempfile",
934 "gix-tempfile",
853 "gix-validate",
935 "gix-validate",
854 "memmap2",
936 "memmap2",
937+ "nom",
855 "thiserror",
938 "thiserror",
856− "winnow 0.5.28",
857]
939]
858
940
859[[package]]
941[[package]]
860name = "gix-refspec"
942name = "gix-refspec"
861−version = "0.21.0"
943+version = "0.11.0"
862source = "registry+https://github.com/rust-lang/crates.io-index"
944source = "registry+https://github.com/rust-lang/crates.io-index"
863−checksum = "88c61f849d58c06e3068a0b601cf10127d2a07cdad00a725ed66cf303f76f6b3"
945+checksum = "72bfd622abc86dd8ad1ec51b9eb77b4f1a766b94e3a1b87cf4a022c5b5570cf4"
864dependencies = [
946dependencies = [
865 "bstr",
947 "bstr",
866 "gix-hash",
948 "gix-hash",
@@ -872,9 +954,9 @@ dependencies = [
872
954
873[[package]]
955[[package]]
874name = "gix-revision"
956name = "gix-revision"
875−version = "0.25.0"
957+version = "0.15.2"
876source = "registry+https://github.com/rust-lang/crates.io-index"
958source = "registry+https://github.com/rust-lang/crates.io-index"
877−checksum = "bcbbf91f4200c5c76802ef5f057b96f5a336827508881fe55a780be71a794d22"
959+checksum = "5044f56cd7a487ce9b034cbe0252ae0b6b47ff56ca3dabd79bc30214d0932cd7"
878dependencies = [
960dependencies = [
879 "bstr",
961 "bstr",
880 "gix-date",
962 "gix-date",
@@ -882,18 +964,16 @@ dependencies = [
882 "gix-hashtable",
964 "gix-hashtable",
883 "gix-object",
965 "gix-object",
884 "gix-revwalk",
966 "gix-revwalk",
885− "gix-trace",
886 "thiserror",
967 "thiserror",
887]
968]
888
969
889[[package]]
970[[package]]
890name = "gix-revwalk"
971name = "gix-revwalk"
891−version = "0.11.0"
972+version = "0.1.0"
892source = "registry+https://github.com/rust-lang/crates.io-index"
973source = "registry+https://github.com/rust-lang/crates.io-index"
893−checksum = "33ab66354d83f70f2730391747d0c75f94ef3c3dd40ebde2e206db9faaf7a0a7"
974+checksum = "bc2623ba8747914f151f5e12b65adac576ab459dbed5f50a36c7a3e9cbf2d3ca"
894dependencies = [
975dependencies = [
895 "gix-commitgraph",
976 "gix-commitgraph",
896− "gix-date",
897 "gix-hash",
977 "gix-hash",
898 "gix-hashtable",
978 "gix-hashtable",
899 "gix-object",
979 "gix-object",
@@ -903,43 +983,38 @@ dependencies = [
903
983
904[[package]]
984[[package]]
905name = "gix-sec"
985name = "gix-sec"
906−version = "0.10.2"
986+version = "0.8.1"
907source = "registry+https://github.com/rust-lang/crates.io-index"
987source = "registry+https://github.com/rust-lang/crates.io-index"
908−checksum = "a9963f38a42144253ed4d571882d7db5ef644c12e6726e4b75135597cc9d0e1a"
988+checksum = "b2b7b38b766eb95dcc5350a9c450030b69892c0902fa35f4a6d0809273bd9dae"
909dependencies = [
989dependencies = [
910− "bitflags 2.4.1",
990+ "bitflags 2.3.2",
911 "gix-path",
991 "gix-path",
912 "libc",
992 "libc",
913− "windows 0.52.0",
993+ "windows",
914]
994]
915
995
916[[package]]
996[[package]]
917name = "gix-tempfile"
997name = "gix-tempfile"
918−version = "12.0.0"
998+version = "6.0.0"
919source = "registry+https://github.com/rust-lang/crates.io-index"
999source = "registry+https://github.com/rust-lang/crates.io-index"
920−checksum = "e76a494bd530e1a1309188ff971825a24f159c76c2db0bf71fa5dfb469a2c915"
1000+checksum = "b3785cb010e9dc5c446dfbf02bc1119fc17d3a48a27c029efcb3a3c32953eb10"
921dependencies = [
1001dependencies = [
922 "gix-fs",
1002 "gix-fs",
923 "libc",
1003 "libc",
924 "once_cell",
1004 "once_cell",
925 "parking_lot",
1005 "parking_lot",
1006+ "signal-hook",
1007+ "signal-hook-registry",
926 "tempfile",
1008 "tempfile",
927]
1009]
928
1010
929−[[package]]
930−name = "gix-trace"
931−version = "0.1.5"
932−source = "registry+https://github.com/rust-lang/crates.io-index"
933−checksum = "bda62acb44dd86a40c7c3762a5403cfc1ac789ea559df54085cedf79864f809e"
934−
935[[package]]
1011[[package]]
936name = "gix-traverse"
1012name = "gix-traverse"
937−version = "0.36.0"
1013+version = "0.27.0"
938source = "registry+https://github.com/rust-lang/crates.io-index"
1014source = "registry+https://github.com/rust-lang/crates.io-index"
939−checksum = "8661fab39985c9214e56d81a63ceb5886ac948cec2fba76c39494d1e0e307ea8"
1015+checksum = "8673546506391a10fdfd4e48c8e0f3ec92355cf1fac787d2e714c7d45e301ede"
940dependencies = [
1016dependencies = [
941 "gix-commitgraph",
1017 "gix-commitgraph",
942− "gix-date",
943 "gix-hash",
1018 "gix-hash",
944 "gix-hashtable",
1019 "gix-hashtable",
945 "gix-object",
1020 "gix-object",
@@ -950,9 +1025,9 @@ dependencies = [
950
1025
951[[package]]
1026[[package]]
952name = "gix-url"
1027name = "gix-url"
953−version = "0.26.0"
1028+version = "0.19.0"
954source = "registry+https://github.com/rust-lang/crates.io-index"
1029source = "registry+https://github.com/rust-lang/crates.io-index"
955−checksum = "10a0129c1e8b52736d7c5128300a4485dbc85863001371e2771ac1754bd89fd7"
1030+checksum = "f1663df25ac42047a2547618d2a6979a26f478073f6306997429235d2cd4c863"
956dependencies = [
1031dependencies = [
957 "bstr",
1032 "bstr",
958 "gix-features",
1033 "gix-features",
@@ -964,70 +1039,93 @@ dependencies = [
964
1039
965[[package]]
1040[[package]]
966name = "gix-utils"
1041name = "gix-utils"
967−version = "0.1.7"
1042+version = "0.1.2"
968source = "registry+https://github.com/rust-lang/crates.io-index"
1043source = "registry+https://github.com/rust-lang/crates.io-index"
969−checksum = "ab9277a5e32e85d53f738096d872a4a9b76067ad471894ad31bd99c8fa2da1dc"
1044+checksum = "dbcfcb150c7ef553d76988467d223254045bdcad0dc6724890f32fbe96415da5"
970dependencies = [
1045dependencies = [
971 "fastrand",
1046 "fastrand",
972]
1047]
973
1048
974[[package]]
1049[[package]]
975name = "gix-validate"
1050name = "gix-validate"
976−version = "0.8.2"
1051+version = "0.7.5"
977source = "registry+https://github.com/rust-lang/crates.io-index"
1052source = "registry+https://github.com/rust-lang/crates.io-index"
978−checksum = "f805ebbdbaa4bfd98e2ee43e6d14099b8a4d9141f5d7b8202fea4d48e44263e7"
1053+checksum = "57ea5845b506c7728b9d89f4227cc369a5fc5a1d5b26c3add0f0d323413a3a60"
979dependencies = [
1054dependencies = [
980 "bstr",
1055 "bstr",
981 "thiserror",
1056 "thiserror",
982]
1057]
983
1058
1059+[[package]]
1060+name = "gix-worktree"
1061+version = "0.19.0"
1062+source = "registry+https://github.com/rust-lang/crates.io-index"
1063+checksum = "0b32a0e7ed52577bfb050f5350bdee2741d1b08a9ed02a2f2df6effe353896ca"
1064+dependencies = [
1065+ "bstr",
1066+ "filetime",
1067+ "gix-attributes",
1068+ "gix-features",
1069+ "gix-fs",
1070+ "gix-glob",
1071+ "gix-hash",
1072+ "gix-ignore",
1073+ "gix-index",
1074+ "gix-object",
1075+ "gix-path",
1076+ "io-close",
1077+ "thiserror",
1078+]
1079+
984[[package]]
1080[[package]]
985name = "globset"
1081name = "globset"
986−version = "0.4.14"
1082+version = "0.4.10"
987source = "registry+https://github.com/rust-lang/crates.io-index"
1083source = "registry+https://github.com/rust-lang/crates.io-index"
988−checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
1084+checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
989dependencies = [
1085dependencies = [
990− "aho-corasick",
1086+ "aho-corasick 0.7.20",
991 "bstr",
1087 "bstr",
1088+ "fnv",
992 "log",
1089 "log",
993− "regex-automata",
1090+ "regex",
994− "regex-syntax",
995]
1091]
996
1092
997[[package]]
1093[[package]]
998name = "grep-matcher"
1094name = "grep-matcher"
999−version = "0.1.7"
1095+version = "0.1.6"
1000source = "registry+https://github.com/rust-lang/crates.io-index"
1096source = "registry+https://github.com/rust-lang/crates.io-index"
1001−checksum = "47a3141a10a43acfedc7c98a60a834d7ba00dfe7bec9071cbfc19b55b292ac02"
1097+checksum = "3902ca28f26945fe35cad349d776f163981d777fee382ccd6ef451126f51b319"
1002dependencies = [
1098dependencies = [
1003 "memchr",
1099 "memchr",
1004]
1100]
1005
1101
1006[[package]]
1102[[package]]
1007name = "grep-regex"
1103name = "grep-regex"
1008−version = "0.1.12"
1104+version = "0.1.11"
1009source = "registry+https://github.com/rust-lang/crates.io-index"
1105source = "registry+https://github.com/rust-lang/crates.io-index"
1010−checksum = "f748bb135ca835da5cbc67ca0e6955f968db9c5df74ca4f56b18e1ddbc68230d"
1106+checksum = "997598b41d53a37a2e3fc5300d5c11d825368c054420a9c65125b8fe1078463f"
1011dependencies = [
1107dependencies = [
1108+ "aho-corasick 0.7.20",
1012 "bstr",
1109 "bstr",
1013 "grep-matcher",
1110 "grep-matcher",
1014 "log",
1111 "log",
1015− "regex-automata",
1112+ "regex",
1016− "regex-syntax",
1113+ "regex-syntax 0.6.29",
1114+ "thread_local",
1017]
1115]
1018
1116
1019[[package]]
1117[[package]]
1020name = "grep-searcher"
1118name = "grep-searcher"
1021−version = "0.1.13"
1119+version = "0.1.11"
1022source = "registry+https://github.com/rust-lang/crates.io-index"
1120source = "registry+https://github.com/rust-lang/crates.io-index"
1023−checksum = "ba536ae4f69bec62d8839584dd3153d3028ef31bb229f04e09fb5a9e5a193c54"
1121+checksum = "5601c4b9f480f0c9ebb40b1f6cbf447b8a50c5369223937a6c5214368c58779f"
1024dependencies = [
1122dependencies = [
1025 "bstr",
1123 "bstr",
1124+ "bytecount",
1026 "encoding_rs",
1125 "encoding_rs",
1027 "encoding_rs_io",
1126 "encoding_rs_io",
1028 "grep-matcher",
1127 "grep-matcher",
1029 "log",
1128 "log",
1030− "memchr",
1031 "memmap2",
1129 "memmap2",
1032]
1130]
1033
1131
@@ -1036,36 +1134,43 @@ name = "hashbrown"
1036version = "0.12.3"
1134version = "0.12.3"
1037source = "registry+https://github.com/rust-lang/crates.io-index"
1135source = "registry+https://github.com/rust-lang/crates.io-index"
1038checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
1136checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
1137+dependencies = [
1138+ "ahash 0.7.6",
1139+]
1039
1140
1040[[package]]
1141[[package]]
1041name = "hashbrown"
1142name = "hashbrown"
1042−version = "0.14.3"
1143+version = "0.13.2"
1043source = "registry+https://github.com/rust-lang/crates.io-index"
1144source = "registry+https://github.com/rust-lang/crates.io-index"
1044−checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
1145+checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
1146+
1147+[[package]]
1148+name = "hashbrown"
1149+version = "0.14.0"
1150+source = "registry+https://github.com/rust-lang/crates.io-index"
1151+checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
1045dependencies = [
1152dependencies = [
1046− "ahash",
1153+ "ahash 0.8.3",
1047 "allocator-api2",
1154 "allocator-api2",
1048]
1155]
1049
1156
1050[[package]]
1157[[package]]
1051name = "helix-core"
1158name = "helix-core"
1052−version = "23.10.0"
1159+version = "0.6.0"
1053dependencies = [
1160dependencies = [
1054− "ahash",
1161+ "ahash 0.8.3",
1055 "arc-swap",
1162 "arc-swap",
1056− "bitflags 2.4.1",
1163+ "bitflags 2.3.2",
1057 "chrono",
1164 "chrono",
1058 "dunce",
1165 "dunce",
1059 "encoding_rs",
1166 "encoding_rs",
1060 "etcetera",
1167 "etcetera",
1061− "hashbrown 0.14.3",
1168+ "hashbrown 0.14.0",
1062 "helix-loader",
1169 "helix-loader",
1063 "imara-diff",
1170 "imara-diff",
1064 "indoc",
1171 "indoc",
1065 "log",
1172 "log",
1066− "nucleo",
1067 "once_cell",
1173 "once_cell",
1068− "parking_lot",
1069 "quickcheck",
1174 "quickcheck",
1070 "regex",
1175 "regex",
1071 "ropey",
1176 "ropey",
@@ -1084,7 +1189,7 @@ dependencies = [
1084
1189
1085[[package]]
1190[[package]]
1086name = "helix-dap"
1191name = "helix-dap"
1087−version = "23.10.0"
1192+version = "0.6.0"
1088dependencies = [
1193dependencies = [
1089 "anyhow",
1194 "anyhow",
1090 "fern",
1195 "fern",
@@ -1097,21 +1202,12 @@ dependencies = [
1097 "which",
1202 "which",
1098]
1203]
1099
1204
1100−[[package]]
1101−name = "helix-event"
1102−version = "23.10.0"
1103−dependencies = [
1104− "parking_lot",
1105− "tokio",
1106−]
1107−
1108[[package]]
1205[[package]]
1109name = "helix-loader"
1206name = "helix-loader"
1110−version = "23.10.0"
1207+version = "0.6.0"
1111dependencies = [
1208dependencies = [
1112 "anyhow",
1209 "anyhow",
1113 "cc",
1210 "cc",
1114− "dunce",
1115 "etcetera",
1211 "etcetera",
1116 "libloading",
1212 "libloading",
1117 "log",
1213 "log",
@@ -1126,12 +1222,11 @@ dependencies = [
1126
1222
1127[[package]]
1223[[package]]
1128name = "helix-lsp"
1224name = "helix-lsp"
1129−version = "23.10.0"
1225+version = "0.6.0"
1130dependencies = [
1226dependencies = [
1131 "anyhow",
1227 "anyhow",
1132 "futures-executor",
1228 "futures-executor",
1133 "futures-util",
1229 "futures-util",
1134− "globset",
1135 "helix-core",
1230 "helix-core",
1136 "helix-loader",
1231 "helix-loader",
1137 "helix-parsec",
1232 "helix-parsec",
@@ -1148,11 +1243,11 @@ dependencies = [
1148
1243
1149[[package]]
1244[[package]]
1150name = "helix-parsec"
1245name = "helix-parsec"
1151−version = "23.10.0"
1246+version = "0.6.0"
1152
1247
1153[[package]]
1248[[package]]
1154name = "helix-term"
1249name = "helix-term"
1155−version = "23.10.0"
1250+version = "0.6.0"
1156dependencies = [
1251dependencies = [
1157 "anyhow",
1252 "anyhow",
1158 "arc-swap",
1253 "arc-swap",
@@ -1161,11 +1256,11 @@ dependencies = [
1161 "crossterm",
1256 "crossterm",
1162 "fern",
1257 "fern",
1163 "futures-util",
1258 "futures-util",
1259+ "fuzzy-matcher",
1164 "grep-regex",
1260 "grep-regex",
1165 "grep-searcher",
1261 "grep-searcher",
1166 "helix-core",
1262 "helix-core",
1167 "helix-dap",
1263 "helix-dap",
1168− "helix-event",
1169 "helix-loader",
1264 "helix-loader",
1170 "helix-lsp",
1265 "helix-lsp",
1171 "helix-tui",
1266 "helix-tui",
@@ -1175,9 +1270,7 @@ dependencies = [
1175 "indoc",
1270 "indoc",
1176 "libc",
1271 "libc",
1177 "log",
1272 "log",
1178− "nucleo",
1179 "once_cell",
1273 "once_cell",
1180− "open",
1181 "pulldown-cmark",
1274 "pulldown-cmark",
1182 "serde",
1275 "serde",
1183 "serde_json",
1276 "serde_json",
@@ -1188,15 +1281,14 @@ dependencies = [
1188 "tokio",
1281 "tokio",
1189 "tokio-stream",
1282 "tokio-stream",
1190 "toml",
1283 "toml",
1191− "url",
1192 "which",
1284 "which",
1193]
1285]
1194
1286
1195[[package]]
1287[[package]]
1196name = "helix-tui"
1288name = "helix-tui"
1197−version = "23.10.0"
1289+version = "0.6.0"
1198dependencies = [
1290dependencies = [
1199− "bitflags 2.4.1",
1291+ "bitflags 2.3.2",
1200 "cassowary",
1292 "cassowary",
1201 "crossterm",
1293 "crossterm",
1202 "helix-core",
1294 "helix-core",
@@ -1210,13 +1302,12 @@ dependencies = [
1210
1302
1211[[package]]
1303[[package]]
1212name = "helix-vcs"
1304name = "helix-vcs"
1213−version = "23.10.0"
1305+version = "0.6.0"
1214dependencies = [
1306dependencies = [
1215 "anyhow",
1307 "anyhow",
1216 "arc-swap",
1308 "arc-swap",
1217 "gix",
1309 "gix",
1218 "helix-core",
1310 "helix-core",
1219− "helix-event",
1220 "imara-diff",
1311 "imara-diff",
1221 "log",
1312 "log",
1222 "parking_lot",
1313 "parking_lot",
@@ -1226,18 +1317,17 @@ dependencies = [
1226
1317
1227[[package]]
1318[[package]]
1228name = "helix-view"
1319name = "helix-view"
1229−version = "23.10.0"
1320+version = "0.6.0"
1230dependencies = [
1321dependencies = [
1231 "anyhow",
1322 "anyhow",
1232 "arc-swap",
1323 "arc-swap",
1233− "bitflags 2.4.1",
1324+ "bitflags 2.3.2",
1234 "chardetng",
1325 "chardetng",
1235 "clipboard-win",
1326 "clipboard-win",
1236 "crossterm",
1327 "crossterm",
1237 "futures-util",
1328 "futures-util",
1238 "helix-core",
1329 "helix-core",
1239 "helix-dap",
1330 "helix-dap",
1240− "helix-event",
1241 "helix-loader",
1331 "helix-loader",
1242 "helix-lsp",
1332 "helix-lsp",
1243 "helix-tui",
1333 "helix-tui",
@@ -1246,7 +1336,6 @@ dependencies = [
1246 "log",
1336 "log",
1247 "once_cell",
1337 "once_cell",
1248 "parking_lot",
1338 "parking_lot",
1249− "rustix",
1250 "serde",
1339 "serde",
1251 "serde_json",
1340 "serde_json",
1252 "slotmap",
1341 "slotmap",
@@ -1266,13 +1355,25 @@ dependencies = [
1266 "libc",
1355 "libc",
1267]
1356]
1268
1357
1358+[[package]]
1359+name = "hermit-abi"
1360+version = "0.3.1"
1361+source = "registry+https://github.com/rust-lang/crates.io-index"
1362+checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
1363+
1364+[[package]]
1365+name = "hex"
1366+version = "0.4.3"
1367+source = "registry+https://github.com/rust-lang/crates.io-index"
1368+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
1369+
1269[[package]]
1370[[package]]
1270name = "home"
1371name = "home"
1271−version = "0.5.5"
1372+version = "0.5.4"
1272source = "registry+https://github.com/rust-lang/crates.io-index"
1373source = "registry+https://github.com/rust-lang/crates.io-index"
1273−checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
1374+checksum = "747309b4b440c06d57b0b25f2aee03ee9b5e5397d288c60e21fc709bb98a7408"
1274dependencies = [
1375dependencies = [
1275− "windows-sys 0.48.0",
1376+ "winapi",
1276]
1377]
1277
1378
1278[[package]]
1379[[package]]
@@ -1286,7 +1387,7 @@ dependencies = [
1286 "iana-time-zone-haiku",
1387 "iana-time-zone-haiku",
1287 "js-sys",
1388 "js-sys",
1288 "wasm-bindgen",
1389 "wasm-bindgen",
1289− "windows 0.48.0",
1390+ "windows",
1290]
1391]
1291
1392
1292[[package]]
1393[[package]]
@@ -1301,9 +1402,9 @@ dependencies = [
1301
1402
1302[[package]]
1403[[package]]
1303name = "idna"
1404name = "idna"
1304−version = "0.5.0"
1405+version = "0.4.0"
1305source = "registry+https://github.com/rust-lang/crates.io-index"
1406source = "registry+https://github.com/rust-lang/crates.io-index"
1306−checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
1407+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
1307dependencies = [
1408dependencies = [
1308 "unicode-bidi",
1409 "unicode-bidi",
1309 "unicode-normalization",
1410 "unicode-normalization",
@@ -1311,16 +1412,17 @@ dependencies = [
1311
1412
1312[[package]]
1413[[package]]
1313name = "ignore"
1414name = "ignore"
1314−version = "0.4.21"
1415+version = "0.4.20"
1315source = "registry+https://github.com/rust-lang/crates.io-index"
1416source = "registry+https://github.com/rust-lang/crates.io-index"
1316−checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060"
1417+checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492"
1317dependencies = [
1418dependencies = [
1318− "crossbeam-deque",
1319 "globset",
1419 "globset",
1420+ "lazy_static",
1320 "log",
1421 "log",
1321 "memchr",
1422 "memchr",
1322− "regex-automata",
1423+ "regex",
1323 "same-file",
1424 "same-file",
1425+ "thread_local",
1324 "walkdir",
1426 "walkdir",
1325 "winapi-util",
1427 "winapi-util",
1326]
1428]
@@ -1331,43 +1433,54 @@ version = "0.1.5"
1331source = "registry+https://github.com/rust-lang/crates.io-index"
1433source = "registry+https://github.com/rust-lang/crates.io-index"
1332checksum = "e98c1d0ad70fc91b8b9654b1f33db55e59579d3b3de2bffdced0fdb810570cb8"
1434checksum = "e98c1d0ad70fc91b8b9654b1f33db55e59579d3b3de2bffdced0fdb810570cb8"
1333dependencies = [
1435dependencies = [
1334− "ahash",
1436+ "ahash 0.8.3",
1335 "hashbrown 0.12.3",
1437 "hashbrown 0.12.3",
1336]
1438]
1337
1439
1338[[package]]
1440[[package]]
1339name = "indexmap"
1441name = "indexmap"
1340−version = "2.0.0"
1442+version = "1.9.3"
1341source = "registry+https://github.com/rust-lang/crates.io-index"
1443source = "registry+https://github.com/rust-lang/crates.io-index"
1342−checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
1444+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
1343dependencies = [
1445dependencies = [
1344− "equivalent",
1446+ "autocfg",
1345− "hashbrown 0.14.3",
1447+ "hashbrown 0.12.3",
1346]
1448]
1347
1449
1348[[package]]
1450[[package]]
1349name = "indoc"
1451name = "indoc"
1350−version = "2.0.4"
1452+version = "2.0.1"
1351source = "registry+https://github.com/rust-lang/crates.io-index"
1453source = "registry+https://github.com/rust-lang/crates.io-index"
1352−checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
1454+checksum = "9f2cb48b81b1dc9f39676bf99f5499babfec7cd8fe14307f7b3d747208fb5690"
1353
1455
1354[[package]]
1456[[package]]
1355−name = "is-docker"
1457+name = "instant"
1356−version = "0.2.0"
1458+version = "0.1.12"
1357source = "registry+https://github.com/rust-lang/crates.io-index"
1459source = "registry+https://github.com/rust-lang/crates.io-index"
1358−checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3"
1460+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
1359dependencies = [
1461dependencies = [
1360− "once_cell",
1462+ "cfg-if",
1361]
1463]
1362
1464
1363[[package]]
1465[[package]]
1364−name = "is-wsl"
1466+name = "io-close"
1365−version = "0.4.0"
1467+version = "0.3.7"
1366source = "registry+https://github.com/rust-lang/crates.io-index"
1468source = "registry+https://github.com/rust-lang/crates.io-index"
1367−checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5"
1469+checksum = "9cadcf447f06744f8ce713d2d6239bb5bde2c357a452397a9ed90c625da390bc"
1368dependencies = [
1470dependencies = [
1369− "is-docker",
1471+ "libc",
1370− "once_cell",
1472+ "winapi",
1473+]
1474+
1475+[[package]]
1476+name = "io-lifetimes"
1477+version = "1.0.10"
1478+source = "registry+https://github.com/rust-lang/crates.io-index"
1479+checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
1480+dependencies = [
1481+ "hermit-abi 0.3.1",
1482+ "libc",
1483+ "windows-sys 0.48.0",
1371]
1484]
1372
1485
1373[[package]]
1486[[package]]
@@ -1385,17 +1498,32 @@ dependencies = [
1385 "wasm-bindgen",
1498 "wasm-bindgen",
1386]
1499]
1387
1500
1501+[[package]]
1502+name = "kstring"
1503+version = "2.0.0"
1504+source = "registry+https://github.com/rust-lang/crates.io-index"
1505+checksum = "ec3066350882a1cd6d950d055997f379ac37fd39f81cd4d8ed186032eb3c5747"
1506+dependencies = [
1507+ "static_assertions",
1508+]
1509+
1510+[[package]]
1511+name = "lazy_static"
1512+version = "1.4.0"
1513+source = "registry+https://github.com/rust-lang/crates.io-index"
1514+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
1515+
1388[[package]]
1516[[package]]
1389name = "libc"
1517name = "libc"
1390−version = "0.2.151"
1518+version = "0.2.146"
1391source = "registry+https://github.com/rust-lang/crates.io-index"
1519source = "registry+https://github.com/rust-lang/crates.io-index"
1392−checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
1520+checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
1393
1521
1394[[package]]
1522[[package]]
1395name = "libloading"
1523name = "libloading"
1396−version = "0.8.1"
1524+version = "0.8.0"
1397source = "registry+https://github.com/rust-lang/crates.io-index"
1525source = "registry+https://github.com/rust-lang/crates.io-index"
1398−checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
1526+checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb"
1399dependencies = [
1527dependencies = [
1400 "cfg-if",
1528 "cfg-if",
1401 "windows-sys 0.48.0",
1529 "windows-sys 0.48.0",
@@ -1412,9 +1540,9 @@ dependencies = [
1412
1540
1413[[package]]
1541[[package]]
1414name = "linux-raw-sys"
1542name = "linux-raw-sys"
1415−version = "0.4.11"
1543+version = "0.3.4"
1416source = "registry+https://github.com/rust-lang/crates.io-index"
1544source = "registry+https://github.com/rust-lang/crates.io-index"
1417−checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"
1545+checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf"
1418
1546
1419[[package]]
1547[[package]]
1420name = "lock_api"
1548name = "lock_api"
@@ -1428,15 +1556,15 @@ dependencies = [
1428
1556
1429[[package]]
1557[[package]]
1430name = "log"
1558name = "log"
1431−version = "0.4.20"
1559+version = "0.4.19"
1432source = "registry+https://github.com/rust-lang/crates.io-index"
1560source = "registry+https://github.com/rust-lang/crates.io-index"
1433−checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
1561+checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
1434
1562
1435[[package]]
1563[[package]]
1436name = "lsp-types"
1564name = "lsp-types"
1437−version = "0.95.0"
1565+version = "0.94.0"
1438source = "registry+https://github.com/rust-lang/crates.io-index"
1566source = "registry+https://github.com/rust-lang/crates.io-index"
1439−checksum = "158c1911354ef73e8fe42da6b10c0484cb65c7f1007f28022e847706c1ab6984"
1567+checksum = "0b63735a13a1f9cd4f4835223d828ed9c2e35c8c5e61837774399f558b6a1237"
1440dependencies = [
1568dependencies = [
1441 "bitflags 1.3.2",
1569 "bitflags 1.3.2",
1442 "serde",
1570 "serde",
@@ -1447,69 +1575,54 @@ dependencies = [
1447
1575
1448[[package]]
1576[[package]]
1449name = "memchr"
1577name = "memchr"
1450−version = "2.6.3"
1578+version = "2.5.0"
1451source = "registry+https://github.com/rust-lang/crates.io-index"
1579source = "registry+https://github.com/rust-lang/crates.io-index"
1452−checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
1580+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
1453
1581
1454[[package]]
1582[[package]]
1455name = "memmap2"
1583name = "memmap2"
1456−version = "0.9.0"
1584+version = "0.5.10"
1457source = "registry+https://github.com/rust-lang/crates.io-index"
1585source = "registry+https://github.com/rust-lang/crates.io-index"
1458−checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375"
1586+checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
1459dependencies = [
1587dependencies = [
1460 "libc",
1588 "libc",
1461]
1589]
1462
1590
1463[[package]]
1591[[package]]
1464−name = "memoffset"
1592+name = "minimal-lexical"
1465−version = "0.9.0"
1593+version = "0.2.1"
1466source = "registry+https://github.com/rust-lang/crates.io-index"
1594source = "registry+https://github.com/rust-lang/crates.io-index"
1467−checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
1595+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
1468−dependencies = [
1469− "autocfg",
1470−]
1471
1596
1472[[package]]
1597[[package]]
1473name = "miniz_oxide"
1598name = "miniz_oxide"
1474−version = "0.7.1"
1599+version = "0.6.2"
1475source = "registry+https://github.com/rust-lang/crates.io-index"
1600source = "registry+https://github.com/rust-lang/crates.io-index"
1476−checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
1601+checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
1477dependencies = [
1602dependencies = [
1478 "adler",
1603 "adler",
1479]
1604]
1480
1605
1481[[package]]
1606[[package]]
1482name = "mio"
1607name = "mio"
1483−version = "0.8.9"
1608+version = "0.8.6"
1484source = "registry+https://github.com/rust-lang/crates.io-index"
1609source = "registry+https://github.com/rust-lang/crates.io-index"
1485−checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
1610+checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
1486dependencies = [
1611dependencies = [
1487 "libc",
1612 "libc",
1488 "log",
1613 "log",
1489 "wasi",
1614 "wasi",
1490− "windows-sys 0.48.0",
1615+ "windows-sys 0.45.0",
1491−]
1492−
1493−[[package]]
1494−name = "nucleo"
1495−version = "0.2.1"
1496−source = "registry+https://github.com/rust-lang/crates.io-index"
1497−checksum = "ae5331f4bcce475cf28cb29c95366c3091af4b0aa7703f1a6bc858f29718fdf3"
1498−dependencies = [
1499− "nucleo-matcher",
1500− "parking_lot",
1501− "rayon",
1502]
1616]
1503
1617
1504[[package]]
1618[[package]]
1505−name = "nucleo-matcher"
1619+name = "nom"
1506−version = "0.2.0"
1620+version = "7.1.3"
1507source = "registry+https://github.com/rust-lang/crates.io-index"
1621source = "registry+https://github.com/rust-lang/crates.io-index"
1508−checksum = "1b702b402fe286162d1f00b552a046ce74365d2ac473a2607ff36ba650f9bd57"
1622+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
1509dependencies = [
1623dependencies = [
1510− "cov-mark",
1511 "memchr",
1624 "memchr",
1512− "unicode-segmentation",
1625+ "minimal-lexical",
1513]
1626]
1514
1627
1515[[package]]
1628[[package]]
@@ -1527,7 +1640,7 @@ version = "1.15.0"
1527source = "registry+https://github.com/rust-lang/crates.io-index"
1640source = "registry+https://github.com/rust-lang/crates.io-index"
1528checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
1641checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
1529dependencies = [
1642dependencies = [
1530− "hermit-abi",
1643+ "hermit-abi 0.2.6",
1531 "libc",
1644 "libc",
1532]
1645]
1533
1646
@@ -1540,31 +1653,11 @@ dependencies = [
1540 "libc",
1653 "libc",
1541]
1654]
1542
1655
1543−[[package]]
1544−name = "object"
1545−version = "0.31.1"
1546−source = "registry+https://github.com/rust-lang/crates.io-index"
1547−checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
1548−dependencies = [
1549− "memchr",
1550−]
1551−
1552[[package]]
1656[[package]]
1553name = "once_cell"
1657name = "once_cell"
1554−version = "1.19.0"
1658+version = "1.18.0"
1555−source = "registry+https://github.com/rust-lang/crates.io-index"
1556−checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
1557−
1558−[[package]]
1559−name = "open"
1560−version = "5.0.1"
1561source = "registry+https://github.com/rust-lang/crates.io-index"
1659source = "registry+https://github.com/rust-lang/crates.io-index"
1562−checksum = "90878fb664448b54c4e592455ad02831e23a3f7e157374a8b95654731aac7349"
1660+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
1563−dependencies = [
1564− "is-wsl",
1565− "libc",
1566− "pathdiff",
1567−]
1568
1661
1569[[package]]
1662[[package]]
1570name = "parking_lot"
1663name = "parking_lot"
@@ -1589,23 +1682,17 @@ dependencies = [
1589 "windows-sys 0.45.0",
1682 "windows-sys 0.45.0",
1590]
1683]
1591
1684
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−
1598[[package]]
1685[[package]]
1599name = "percent-encoding"
1686name = "percent-encoding"
1600−version = "2.3.1"
1687+version = "2.3.0"
1601source = "registry+https://github.com/rust-lang/crates.io-index"
1688source = "registry+https://github.com/rust-lang/crates.io-index"
1602−checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
1689+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
1603
1690
1604[[package]]
1691[[package]]
1605name = "pin-project-lite"
1692name = "pin-project-lite"
1606−version = "0.2.12"
1693+version = "0.2.9"
1607source = "registry+https://github.com/rust-lang/crates.io-index"
1694source = "registry+https://github.com/rust-lang/crates.io-index"
1608−checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05"
1695+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
1609
1696
1610[[package]]
1697[[package]]
1611name = "pin-utils"
1698name = "pin-utils"
@@ -1615,18 +1702,18 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
1615
1702
1616[[package]]
1703[[package]]
1617name = "proc-macro2"
1704name = "proc-macro2"
1618−version = "1.0.69"
1705+version = "1.0.56"
1619source = "registry+https://github.com/rust-lang/crates.io-index"
1706source = "registry+https://github.com/rust-lang/crates.io-index"
1620−checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
1707+checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
1621dependencies = [
1708dependencies = [
1622 "unicode-ident",
1709 "unicode-ident",
1623]
1710]
1624
1711
1625[[package]]
1712[[package]]
1626name = "prodash"
1713name = "prodash"
1627−version = "28.0.0"
1714+version = "25.0.0"
1628source = "registry+https://github.com/rust-lang/crates.io-index"
1715source = "registry+https://github.com/rust-lang/crates.io-index"
1629−checksum = "744a264d26b88a6a7e37cbad97953fa233b94d585236310bcbc88474b4092d79"
1716+checksum = "3236ce1618b6da4c7b618e0143c4d5b5dc190f75f81c49f248221382f7e9e9ae"
1630
1717
1631[[package]]
1718[[package]]
1632name = "pulldown-cmark"
1719name = "pulldown-cmark"
@@ -1650,9 +1737,9 @@ dependencies = [
1650
1737
1651[[package]]
1738[[package]]
1652name = "quote"
1739name = "quote"
1653−version = "1.0.29"
1740+version = "1.0.26"
1654source = "registry+https://github.com/rust-lang/crates.io-index"
1741source = "registry+https://github.com/rust-lang/crates.io-index"
1655−checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"
1742+checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
1656dependencies = [
1743dependencies = [
1657 "proc-macro2",
1744 "proc-macro2",
1658]
1745]
@@ -1675,28 +1762,6 @@ dependencies = [
1675 "getrandom",
1762 "getrandom",
1676]
1763]
1677
1764
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−
1700[[package]]
1765[[package]]
1701name = "redox_syscall"
1766name = "redox_syscall"
1702version = "0.2.16"
1767version = "0.2.16"
@@ -1708,69 +1773,64 @@ dependencies = [
1708
1773
1709[[package]]
1774[[package]]
1710name = "redox_syscall"
1775name = "redox_syscall"
1711−version = "0.4.1"
1776+version = "0.3.5"
1712source = "registry+https://github.com/rust-lang/crates.io-index"
1777source = "registry+https://github.com/rust-lang/crates.io-index"
1713−checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
1778+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
1714dependencies = [
1779dependencies = [
1715 "bitflags 1.3.2",
1780 "bitflags 1.3.2",
1716]
1781]
1717
1782
1718[[package]]
1783[[package]]
1719name = "regex"
1784name = "regex"
1720−version = "1.10.2"
1785+version = "1.8.4"
1721source = "registry+https://github.com/rust-lang/crates.io-index"
1786source = "registry+https://github.com/rust-lang/crates.io-index"
1722−checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
1787+checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
1723dependencies = [
1788dependencies = [
1724− "aho-corasick",
1789+ "aho-corasick 1.0.1",
1725 "memchr",
1790 "memchr",
1726− "regex-automata",
1727− "regex-syntax",
1791+ "regex-syntax 0.7.2",
1728]
1792]
1729
1793
1730[[package]]
1794[[package]]
1731name = "regex-automata"
1795name = "regex-automata"
1732−version = "0.4.3"
1796+version = "0.1.10"
1733source = "registry+https://github.com/rust-lang/crates.io-index"
1797source = "registry+https://github.com/rust-lang/crates.io-index"
1734−checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
1798+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
1735−dependencies = [
1736− "aho-corasick",
1737− "memchr",
1738− "regex-syntax",
1739−]
1740
1799
1741[[package]]
1800[[package]]
1742name = "regex-syntax"
1801name = "regex-syntax"
1743−version = "0.8.2"
1802+version = "0.6.29"
1744source = "registry+https://github.com/rust-lang/crates.io-index"
1803source = "registry+https://github.com/rust-lang/crates.io-index"
1745−checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
1804+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
1805+
1806+[[package]]
1807+name = "regex-syntax"
1808+version = "0.7.2"
1809+source = "registry+https://github.com/rust-lang/crates.io-index"
1810+checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
1746
1811
1747[[package]]
1812[[package]]
1748name = "ropey"
1813name = "ropey"
1749−version = "1.6.1"
1814+version = "1.6.0"
1750source = "registry+https://github.com/rust-lang/crates.io-index"
1815source = "registry+https://github.com/rust-lang/crates.io-index"
1751−checksum = "93411e420bcd1a75ddd1dc3caf18c23155eda2c090631a85af21ba19e97093b5"
1816+checksum = "53ce7a2c43a32e50d666e33c5a80251b31147bb4b49024bcab11fb6f20c671ed"
1752dependencies = [
1817dependencies = [
1753 "smallvec",
1818 "smallvec",
1754 "str_indices",
1819 "str_indices",
1755]
1820]
1756
1821
1757−[[package]]
1758−name = "rustc-demangle"
1759−version = "0.1.23"
1760−source = "registry+https://github.com/rust-lang/crates.io-index"
1761−checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
1762−
1763[[package]]
1822[[package]]
1764name = "rustix"
1823name = "rustix"
1765−version = "0.38.28"
1824+version = "0.37.15"
1766source = "registry+https://github.com/rust-lang/crates.io-index"
1825source = "registry+https://github.com/rust-lang/crates.io-index"
1767−checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
1826+checksum = "a0661814f891c57c930a610266415528da53c4933e6dea5fb350cbfe048a9ece"
1768dependencies = [
1827dependencies = [
1769− "bitflags 2.4.1",
1828+ "bitflags 1.3.2",
1770 "errno",
1829 "errno",
1830+ "io-lifetimes",
1771 "libc",
1831 "libc",
1772 "linux-raw-sys",
1832 "linux-raw-sys",
1773− "windows-sys 0.52.0",
1833+ "windows-sys 0.48.0",
1774]
1834]
1775
1835
1776[[package]]
1836[[package]]
@@ -1802,29 +1862,29 @@ checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
1802
1862
1803[[package]]
1863[[package]]
1804name = "serde"
1864name = "serde"
1805−version = "1.0.193"
1865+version = "1.0.164"
1806source = "registry+https://github.com/rust-lang/crates.io-index"
1866source = "registry+https://github.com/rust-lang/crates.io-index"
1807−checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
1867+checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d"
1808dependencies = [
1868dependencies = [
1809 "serde_derive",
1869 "serde_derive",
1810]
1870]
1811
1871
1812[[package]]
1872[[package]]
1813name = "serde_derive"
1873name = "serde_derive"
1814−version = "1.0.193"
1874+version = "1.0.164"
1815source = "registry+https://github.com/rust-lang/crates.io-index"
1875source = "registry+https://github.com/rust-lang/crates.io-index"
1816−checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
1876+checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
1817dependencies = [
1877dependencies = [
1818 "proc-macro2",
1878 "proc-macro2",
1819 "quote",
1879 "quote",
1820− "syn 2.0.38",
1880+ "syn 2.0.15",
1821]
1881]
1822
1882
1823[[package]]
1883[[package]]
1824name = "serde_json"
1884name = "serde_json"
1825−version = "1.0.108"
1885+version = "1.0.97"
1826source = "registry+https://github.com/rust-lang/crates.io-index"
1886source = "registry+https://github.com/rust-lang/crates.io-index"
1827−checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
1887+checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a"
1828dependencies = [
1888dependencies = [
1829 "itoa",
1889 "itoa",
1830 "ryu",
1890 "ryu",
@@ -1839,14 +1899,14 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
1839dependencies = [
1899dependencies = [
1840 "proc-macro2",
1900 "proc-macro2",
1841 "quote",
1901 "quote",
1842− "syn 2.0.38",
1902+ "syn 2.0.15",
1843]
1903]
1844
1904
1845[[package]]
1905[[package]]
1846name = "serde_spanned"
1906name = "serde_spanned"
1847−version = "0.6.3"
1907+version = "0.6.2"
1848source = "registry+https://github.com/rust-lang/crates.io-index"
1908source = "registry+https://github.com/rust-lang/crates.io-index"
1849−checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
1909+checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d"
1850dependencies = [
1910dependencies = [
1851 "serde",
1911 "serde",
1852]
1912]
@@ -1859,9 +1919,9 @@ checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
1859
1919
1860[[package]]
1920[[package]]
1861name = "signal-hook"
1921name = "signal-hook"
1862−version = "0.3.17"
1922+version = "0.3.15"
1863source = "registry+https://github.com/rust-lang/crates.io-index"
1923source = "registry+https://github.com/rust-lang/crates.io-index"
1864−checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
1924+checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9"
1865dependencies = [
1925dependencies = [
1866 "libc",
1926 "libc",
1867 "signal-hook-registry",
1927 "signal-hook-registry",
@@ -1910,18 +1970,18 @@ dependencies = [
1910
1970
1911[[package]]
1971[[package]]
1912name = "slotmap"
1972name = "slotmap"
1913−version = "1.0.7"
1973+version = "1.0.6"
1914source = "registry+https://github.com/rust-lang/crates.io-index"
1974source = "registry+https://github.com/rust-lang/crates.io-index"
1915−checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a"
1975+checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342"
1916dependencies = [
1976dependencies = [
1917 "version_check",
1977 "version_check",
1918]
1978]
1919
1979
1920[[package]]
1980[[package]]
1921name = "smallvec"
1981name = "smallvec"
1922−version = "1.11.2"
1982+version = "1.10.0"
1923source = "registry+https://github.com/rust-lang/crates.io-index"
1983source = "registry+https://github.com/rust-lang/crates.io-index"
1924−checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
1984+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
1925
1985
1926[[package]]
1986[[package]]
1927name = "smartstring"
1987name = "smartstring"
@@ -1942,12 +2002,12 @@ checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043"
1942
2002
1943[[package]]
2003[[package]]
1944name = "socket2"
2004name = "socket2"
1945−version = "0.5.5"
2005+version = "0.4.9"
1946source = "registry+https://github.com/rust-lang/crates.io-index"
2006source = "registry+https://github.com/rust-lang/crates.io-index"
1947−checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
2007+checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
1948dependencies = [
2008dependencies = [
1949 "libc",
2009 "libc",
1950− "windows-sys 0.48.0",
2010+ "winapi",
1951]
2011]
1952
2012
1953[[package]]
2013[[package]]
@@ -1956,6 +2016,12 @@ version = "1.1.0"
1956source = "registry+https://github.com/rust-lang/crates.io-index"
2016source = "registry+https://github.com/rust-lang/crates.io-index"
1957checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
2017checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
1958
2018
2019+[[package]]
2020+name = "str-buf"
2021+version = "1.0.6"
2022+source = "registry+https://github.com/rust-lang/crates.io-index"
2023+checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
2024+
1959[[package]]
2025[[package]]
1960name = "str_indices"
2026name = "str_indices"
1961version = "0.4.1"
2027version = "0.4.1"
@@ -1975,9 +2041,9 @@ dependencies = [
1975
2041
1976[[package]]
2042[[package]]
1977name = "syn"
2043name = "syn"
1978−version = "2.0.38"
2044+version = "2.0.15"
1979source = "registry+https://github.com/rust-lang/crates.io-index"
2045source = "registry+https://github.com/rust-lang/crates.io-index"
1980−checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
2046+checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
1981dependencies = [
2047dependencies = [
1982 "proc-macro2",
2048 "proc-macro2",
1983 "quote",
2049 "quote",
@@ -1986,13 +2052,14 @@ dependencies = [
1986
2052
1987[[package]]
2053[[package]]
1988name = "tempfile"
2054name = "tempfile"
1989−version = "3.8.1"
2055+version = "3.6.0"
1990source = "registry+https://github.com/rust-lang/crates.io-index"
2056source = "registry+https://github.com/rust-lang/crates.io-index"
1991−checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
2057+checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6"
1992dependencies = [
2058dependencies = [
2059+ "autocfg",
1993 "cfg-if",
2060 "cfg-if",
1994 "fastrand",
2061 "fastrand",
1995− "redox_syscall 0.4.1",
2062+ "redox_syscall 0.3.5",
1996 "rustix",
2063 "rustix",
1997 "windows-sys 0.48.0",
2064 "windows-sys 0.48.0",
1998]
2065]
@@ -2028,22 +2095,32 @@ dependencies = [
2028
2095
2029[[package]]
2096[[package]]
2030name = "thiserror"
2097name = "thiserror"
2031−version = "1.0.52"
2098+version = "1.0.40"
2032source = "registry+https://github.com/rust-lang/crates.io-index"
2099source = "registry+https://github.com/rust-lang/crates.io-index"
2033−checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d"
2100+checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
2034dependencies = [
2101dependencies = [
2035 "thiserror-impl",
2102 "thiserror-impl",
2036]
2103]
2037
2104
2038[[package]]
2105[[package]]
2039name = "thiserror-impl"
2106name = "thiserror-impl"
2040−version = "1.0.52"
2107+version = "1.0.40"
2041source = "registry+https://github.com/rust-lang/crates.io-index"
2108source = "registry+https://github.com/rust-lang/crates.io-index"
2042−checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3"
2109+checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
2043dependencies = [
2110dependencies = [
2044 "proc-macro2",
2111 "proc-macro2",
2045 "quote",
2112 "quote",
2046− "syn 2.0.38",
2113+ "syn 2.0.15",
2114+]
2115+
2116+[[package]]
2117+name = "thread_local"
2118+version = "1.1.7"
2119+source = "registry+https://github.com/rust-lang/crates.io-index"
2120+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
2121+dependencies = [
2122+ "cfg-if",
2123+ "once_cell",
2047]
2124]
2048
2125
2049[[package]]
2126[[package]]
@@ -2057,9 +2134,9 @@ dependencies = [
2057
2134
2058[[package]]
2135[[package]]
2059name = "time"
2136name = "time"
2060−version = "0.3.23"
2137+version = "0.3.20"
2061source = "registry+https://github.com/rust-lang/crates.io-index"
2138source = "registry+https://github.com/rust-lang/crates.io-index"
2062−checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446"
2139+checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
2063dependencies = [
2140dependencies = [
2064 "itoa",
2141 "itoa",
2065 "libc",
2142 "libc",
@@ -2071,15 +2148,15 @@ dependencies = [
2071
2148
2072[[package]]
2149[[package]]
2073name = "time-core"
2150name = "time-core"
2074−version = "0.1.1"
2151+version = "0.1.0"
2075source = "registry+https://github.com/rust-lang/crates.io-index"
2152source = "registry+https://github.com/rust-lang/crates.io-index"
2076−checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
2153+checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
2077
2154
2078[[package]]
2155[[package]]
2079name = "time-macros"
2156name = "time-macros"
2080−version = "0.2.10"
2157+version = "0.2.8"
2081source = "registry+https://github.com/rust-lang/crates.io-index"
2158source = "registry+https://github.com/rust-lang/crates.io-index"
2082−checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4"
2159+checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36"
2083dependencies = [
2160dependencies = [
2084 "time-core",
2161 "time-core",
2085]
2162]
@@ -2101,11 +2178,11 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
2101
2178
2102[[package]]
2179[[package]]
2103name = "tokio"
2180name = "tokio"
2104−version = "1.35.1"
2181+version = "1.28.2"
2105source = "registry+https://github.com/rust-lang/crates.io-index"
2182source = "registry+https://github.com/rust-lang/crates.io-index"
2106−checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
2183+checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
2107dependencies = [
2184dependencies = [
2108− "backtrace",
2185+ "autocfg",
2109 "bytes",
2186 "bytes",
2110 "libc",
2187 "libc",
2111 "mio",
2188 "mio",
@@ -2120,13 +2197,13 @@ dependencies = [
2120
2197
2121[[package]]
2198[[package]]
2122name = "tokio-macros"
2199name = "tokio-macros"
2123−version = "2.2.0"
2200+version = "2.1.0"
2124source = "registry+https://github.com/rust-lang/crates.io-index"
2201source = "registry+https://github.com/rust-lang/crates.io-index"
2125−checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
2202+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
2126dependencies = [
2203dependencies = [
2127 "proc-macro2",
2204 "proc-macro2",
2128 "quote",
2205 "quote",
2129− "syn 2.0.38",
2206+ "syn 2.0.15",
2130]
2207]
2131
2208
2132[[package]]
2209[[package]]
@@ -2142,9 +2219,9 @@ dependencies = [
2142
2219
2143[[package]]
2220[[package]]
2144name = "toml"
2221name = "toml"
2145−version = "0.7.6"
2222+version = "0.7.4"
2146source = "registry+https://github.com/rust-lang/crates.io-index"
2223source = "registry+https://github.com/rust-lang/crates.io-index"
2147−checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
2224+checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec"
2148dependencies = [
2225dependencies = [
2149 "serde",
2226 "serde",
2150 "serde_spanned",
2227 "serde_spanned",
@@ -2154,30 +2231,31 @@ dependencies = [
2154
2231
2155[[package]]
2232[[package]]
2156name = "toml_datetime"
2233name = "toml_datetime"
2157−version = "0.6.3"
2234+version = "0.6.2"
2158source = "registry+https://github.com/rust-lang/crates.io-index"
2235source = "registry+https://github.com/rust-lang/crates.io-index"
2159−checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
2236+checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
2160dependencies = [
2237dependencies = [
2161 "serde",
2238 "serde",
2162]
2239]
2163
2240
2164[[package]]
2241[[package]]
2165name = "toml_edit"
2242name = "toml_edit"
2166−version = "0.19.12"
2243+version = "0.19.9"
2167source = "registry+https://github.com/rust-lang/crates.io-index"
2244source = "registry+https://github.com/rust-lang/crates.io-index"
2168−checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78"
2245+checksum = "92d964908cec0d030b812013af25a0e57fddfadb1e066ecc6681d86253129d4f"
2169dependencies = [
2246dependencies = [
2170 "indexmap",
2247 "indexmap",
2171 "serde",
2248 "serde",
2172 "serde_spanned",
2249 "serde_spanned",
2173 "toml_datetime",
2250 "toml_datetime",
2174− "winnow 0.4.6",
2251+ "winnow",
2175]
2252]
2176
2253
2177[[package]]
2254[[package]]
2178name = "tree-sitter"
2255name = "tree-sitter"
2179version = "0.20.10"
2256version = "0.20.10"
2180−source = "git+https://github.com/tree-sitter/tree-sitter?rev=ab09ae20d640711174b8da8a654f6b3dec93da1a#ab09ae20d640711174b8da8a654f6b3dec93da1a"
2257+source = "registry+https://github.com/rust-lang/crates.io-index"
2258+checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d"
2181dependencies = [
2259dependencies = [
2182 "cc",
2260 "cc",
2183 "regex",
2261 "regex",
@@ -2218,9 +2296,13 @@ checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
2218
2296
2219[[package]]
2297[[package]]
2220name = "unicode-linebreak"
2298name = "unicode-linebreak"
2221−version = "0.1.5"
2299+version = "0.1.4"
2222source = "registry+https://github.com/rust-lang/crates.io-index"
2300source = "registry+https://github.com/rust-lang/crates.io-index"
2223−checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
2301+checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137"
2302+dependencies = [
2303+ "hashbrown 0.12.3",
2304+ "regex",
2305+]
2224
2306
2225[[package]]
2307[[package]]
2226name = "unicode-normalization"
2308name = "unicode-normalization"
@@ -2239,15 +2321,15 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
2239
2321
2240[[package]]
2322[[package]]
2241name = "unicode-width"
2323name = "unicode-width"
2242−version = "0.1.11"
2324+version = "0.1.10"
2243source = "registry+https://github.com/rust-lang/crates.io-index"
2325source = "registry+https://github.com/rust-lang/crates.io-index"
2244−checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
2326+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
2245
2327
2246[[package]]
2328[[package]]
2247name = "url"
2329name = "url"
2248−version = "2.5.0"
2330+version = "2.4.0"
2249source = "registry+https://github.com/rust-lang/crates.io-index"
2331source = "registry+https://github.com/rust-lang/crates.io-index"
2250−checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
2332+checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
2251dependencies = [
2333dependencies = [
2252 "form_urlencoded",
2334 "form_urlencoded",
2253 "idna",
2335 "idna",
@@ -2263,9 +2345,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
2263
2345
2264[[package]]
2346[[package]]
2265name = "walkdir"
2347name = "walkdir"
2266−version = "2.4.0"
2348+version = "2.3.3"
2267source = "registry+https://github.com/rust-lang/crates.io-index"
2349source = "registry+https://github.com/rust-lang/crates.io-index"
2268−checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
2350+checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
2269dependencies = [
2351dependencies = [
2270 "same-file",
2352 "same-file",
2271 "winapi-util",
2353 "winapi-util",
@@ -2333,15 +2415,13 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
2333
2415
2334[[package]]
2416[[package]]
2335name = "which"
2417name = "which"
2336−version = "5.0.0"
2418+version = "4.4.0"
2337source = "registry+https://github.com/rust-lang/crates.io-index"
2419source = "registry+https://github.com/rust-lang/crates.io-index"
2338−checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14"
2420+checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
2339dependencies = [
2421dependencies = [
2340 "either",
2422 "either",
2341− "home",
2423+ "libc",
2342 "once_cell",
2424 "once_cell",
2343− "rustix",
2344− "windows-sys 0.48.0",
2345]
2425]
2346
2426
2347[[package]]
2427[[package]]
@@ -2384,25 +2464,6 @@ dependencies = [
2384 "windows-targets 0.48.0",
2464 "windows-targets 0.48.0",
2385]
2465]
2386
2466
2387−[[package]]
2388−name = "windows"
2389−version = "0.52.0"
2390−source = "registry+https://github.com/rust-lang/crates.io-index"
2391−checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
2392−dependencies = [
2393− "windows-core",
2394− "windows-targets 0.52.0",
2395−]
2396−
2397−[[package]]
2398−name = "windows-core"
2399−version = "0.52.0"
2400−source = "registry+https://github.com/rust-lang/crates.io-index"
2401−checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
2402−dependencies = [
2403− "windows-targets 0.52.0",
2404−]
2405−
2406[[package]]
2467[[package]]
2407name = "windows-sys"
2468name = "windows-sys"
2408version = "0.45.0"
2469version = "0.45.0"
@@ -2421,15 +2482,6 @@ dependencies = [
2421 "windows-targets 0.48.0",
2482 "windows-targets 0.48.0",
2422]
2483]
2423
2484
2424−[[package]]
2425−name = "windows-sys"
2426−version = "0.52.0"
2427−source = "registry+https://github.com/rust-lang/crates.io-index"
2428−checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
2429−dependencies = [
2430− "windows-targets 0.52.0",
2431−]
2432−
2433[[package]]
2485[[package]]
2434name = "windows-targets"
2486name = "windows-targets"
2435version = "0.42.2"
2487version = "0.42.2"
@@ -2460,21 +2512,6 @@ dependencies = [
2460 "windows_x86_64_msvc 0.48.0",
2512 "windows_x86_64_msvc 0.48.0",
2461]
2513]
2462
2514
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−
2478[[package]]
2515[[package]]
2479name = "windows_aarch64_gnullvm"
2516name = "windows_aarch64_gnullvm"
2480version = "0.42.2"
2517version = "0.42.2"
@@ -2487,12 +2524,6 @@ version = "0.48.0"
2487source = "registry+https://github.com/rust-lang/crates.io-index"
2524source = "registry+https://github.com/rust-lang/crates.io-index"
2488checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
2525checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
2489
2526
2490−[[package]]
2491−name = "windows_aarch64_gnullvm"
2492−version = "0.52.0"
2493−source = "registry+https://github.com/rust-lang/crates.io-index"
2494−checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
2495−
2496[[package]]
2527[[package]]
2497name = "windows_aarch64_msvc"
2528name = "windows_aarch64_msvc"
2498version = "0.42.2"
2529version = "0.42.2"
@@ -2505,12 +2536,6 @@ version = "0.48.0"
2505source = "registry+https://github.com/rust-lang/crates.io-index"
2536source = "registry+https://github.com/rust-lang/crates.io-index"
2506checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
2537checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
2507
2538
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−
2514[[package]]
2539[[package]]
2515name = "windows_i686_gnu"
2540name = "windows_i686_gnu"
2516version = "0.42.2"
2541version = "0.42.2"
@@ -2523,12 +2548,6 @@ version = "0.48.0"
2523source = "registry+https://github.com/rust-lang/crates.io-index"
2548source = "registry+https://github.com/rust-lang/crates.io-index"
2524checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
2549checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
2525
2550
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−
2532[[package]]
2551[[package]]
2533name = "windows_i686_msvc"
2552name = "windows_i686_msvc"
2534version = "0.42.2"
2553version = "0.42.2"
@@ -2541,12 +2560,6 @@ version = "0.48.0"
2541source = "registry+https://github.com/rust-lang/crates.io-index"
2560source = "registry+https://github.com/rust-lang/crates.io-index"
2542checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
2561checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
2543
2562
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−
2550[[package]]
2563[[package]]
2551name = "windows_x86_64_gnu"
2564name = "windows_x86_64_gnu"
2552version = "0.42.2"
2565version = "0.42.2"
@@ -2559,12 +2572,6 @@ version = "0.48.0"
2559source = "registry+https://github.com/rust-lang/crates.io-index"
2572source = "registry+https://github.com/rust-lang/crates.io-index"
2560checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
2573checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
2561
2574
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−
2568[[package]]
2575[[package]]
2569name = "windows_x86_64_gnullvm"
2576name = "windows_x86_64_gnullvm"
2570version = "0.42.2"
2577version = "0.42.2"
@@ -2577,12 +2584,6 @@ version = "0.48.0"
2577source = "registry+https://github.com/rust-lang/crates.io-index"
2584source = "registry+https://github.com/rust-lang/crates.io-index"
2578checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
2585checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
2579
2586
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−
2586[[package]]
2587[[package]]
2587name = "windows_x86_64_msvc"
2588name = "windows_x86_64_msvc"
2588version = "0.42.2"
2589version = "0.42.2"
@@ -2595,12 +2596,6 @@ version = "0.48.0"
2595source = "registry+https://github.com/rust-lang/crates.io-index"
2596source = "registry+https://github.com/rust-lang/crates.io-index"
2596checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
2597checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
2597
2598
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−
2604[[package]]
2599[[package]]
2605name = "winnow"
2600name = "winnow"
2606version = "0.4.6"
2601version = "0.4.6"
@@ -2610,18 +2605,9 @@ dependencies = [
2610 "memchr",
2605 "memchr",
2611]
2606]
2612
2607
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−
2622[[package]]
2608[[package]]
2623name = "xtask"
2609name = "xtask"
2624−version = "23.10.0"
2610+version = "0.6.0"
2625dependencies = [
2611dependencies = [
2626 "helix-core",
2612 "helix-core",
2627 "helix-loader",
2613 "helix-loader",
@@ -2629,23 +2615,3 @@ dependencies = [
2629 "helix-view",
2615 "helix-view",
2630 "toml",
2616 "toml",
2631]
2617]
2632−
2633−[[package]]
2634−name = "zerocopy"
2635−version = "0.7.31"
2636−source = "registry+https://github.com/rust-lang/crates.io-index"
2637−checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
2638−dependencies = [
2639− "zerocopy-derive",
2640−]
2641−
2642−[[package]]
2643−name = "zerocopy-derive"
2644−version = "0.7.31"
2645−source = "registry+https://github.com/rust-lang/crates.io-index"
2646−checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
2647−dependencies = [
2648− "proc-macro2",
2649− "quote",
2650− "syn 2.0.38",
2651−]
Cargo.toml−16
@@ -1,12 +1,10 @@
1[workspace]
1[workspace]
2−resolver = "2"
3members = [
2members = [
4 "helix-core",
3 "helix-core",
5 "helix-view",
4 "helix-view",
6 "helix-term",
5 "helix-term",
7 "helix-tui",
6 "helix-tui",
8 "helix-lsp",
7 "helix-lsp",
9− "helix-event",
10 "helix-dap",
8 "helix-dap",
11 "helix-loader",
9 "helix-loader",
12 "helix-vcs",
10 "helix-vcs",
@@ -34,17 +32,3 @@ inherits = "test"
34package.helix-core.opt-level = 2
32package.helix-core.opt-level = 2
35package.helix-tui.opt-level = 2
33package.helix-tui.opt-level = 2
36package.helix-term.opt-level = 2
34package.helix-term.opt-level = 2
37−
38−[workspace.dependencies]
39−tree-sitter = { version = "0.20", git = "https://github.com/tree-sitter/tree-sitter", rev = "ab09ae20d640711174b8da8a654f6b3dec93da1a" }
40−nucleo = "0.2.0"
41−
42−[workspace.package]
43−version = "23.10.0"
44−edition = "2021"
45−authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
46−categories = ["editor"]
47−repository = "https://github.com/helix-editor/helix"
48−homepage = "https://helix-editor.com"
49−license = "MPL-2.0"
50−rust-version = "1.70"
README.md+2−2
@@ -18,7 +18,7 @@
18
18
19![Screenshot](./screenshot.png)
19![Screenshot](./screenshot.png)
20
20
21−A [Kakoune](https://github.com/mawww/kakoune) / [Neovim](https://github.com/neovim/neovim) inspired editor, written in Rust.
21+A Kakoune / Neovim inspired editor, written in Rust.
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.
@@ -61,4 +61,4 @@ Discuss the project on the community [Matrix Space](https://matrix.to/#/#helix-c
61
61
62# Credits
62# Credits
63
63
64−Thanks to [@jakenvac](https://github.com/jakenvac) for designing the logo!
64+Thanks to [@JakeHL](https://github.com/JakeHL) for designing the logo!
VERSIONnew file+1
@@ -0,0 +1 @@
1+23.05
book/book.toml−4
@@ -10,7 +10,3 @@ default-theme = "colibri"
10preferred-dark-theme = "colibri"
10preferred-dark-theme = "colibri"
11git-repository-url = "https://github.com/helix-editor/helix"
11git-repository-url = "https://github.com/helix-editor/helix"
12edit-url-template = "https://github.com/helix-editor/helix/edit/master/book/{path}"
12edit-url-template = "https://github.com/helix-editor/helix/edit/master/book/{path}"
13−additional-css = ["custom.css"]
14−
15−[output.html.search]
16−use-boolean-and = true
book/custom.cssdeleted−231
@@ -1,231 +0,0 @@
1−html {
2− font-family: "Inter", sans-serif;
3−}
4−
5−.sidebar .sidebar-scrollbox {
6− padding: 0;
7−}
8−
9−.chapter {
10− margin: 0.25rem 0;
11−}
12−
13−.chapter li.chapter-item {
14− line-height: initial;
15− margin: 0;
16− padding: 1rem 1.5rem;
17−}
18−
19−.chapter .section li.chapter-item {
20− line-height: inherit;
21− padding: .5rem .5rem 0 .5rem;
22−}
23−
24−.content {
25− overflow-y: auto;
26− padding: 0 15px;
27− padding-bottom: 50px;
28−}
29−
30−/* 2 1.75 1.5 1.25 1 .875 */
31−.content h1 { font-size: 2em }
32−.content h2 { font-size: 1.75em }
33−.content h3 { font-size: 1.5em }
34−.content h4 { font-size: 1.25em }
35−.content h5 { font-size: 1em }
36−.content h6 { font-size: .875em }
37−
38−.content h1,
39−.content h2,
40−.content h3,
41−.content h4 {
42− font-weight: 500;
43− margin-top: 1.275em;
44− margin-bottom: .875em;
45−}
46−
47−.content p,
48−.content ol,
49−.content ul,
50−.content table {
51− margin-top: 0;
52− margin-bottom: .875em;
53−}
54−
55−.content ul li {
56− margin-bottom: .25rem;
57−}
58−
59−.content ul {
60− list-style-type: square;
61−}
62−
63−.content ul ul,
64−.content ol ul {
65− margin-bottom: .5rem;
66−}
67−
68−.content li p {
69− margin-bottom: .5em;
70−}
71−
72−blockquote {
73− margin: 1.5rem 0;
74− padding: 1rem 1.5rem;
75− color: var(--fg);
76− opacity: .9;
77− background-color: var(--quote-bg);
78− border-left: 4px solid var(--quote-border);
79− border-top: none;
80− border-bottom: none;
81−}
82−
83−blockquote *:last-child {
84− margin-bottom: 0;
85−}
86−
87−table {
88− width: 100%;
89−}
90−
91−table thead th {
92− padding: .75rem;
93− text-align: left;
94− font-weight: 500;
95− line-height: 1.5;
96− width: auto;
97−}
98−
99−table td {
100− padding: .75rem;
101− border: none;
102−}
103−
104−table thead tr {
105− border: none;
106− border-bottom: 2px var(--table-border-color) solid;
107−}
108−
109−table tbody tr {
110− border-bottom: 1px var(--table-border-line) solid;
111−}
112−
113−table tbody tr:nth-child(2n) {
114− background: unset;
115−}
116−
117−pre code.hljs {
118− display: block;
119− overflow-x: auto;
120− padding: 1em;
121−}
122−
123−code.hljs {
124− padding: 3px 5px;
125−}
126−
127−.colibri {
128− --bg: #3b224c;
129− --fg: #bcbdd0;
130− --heading-fg: #fff;
131−
132− --sidebar-bg: #281733;
133− --sidebar-fg: #c8c9db;
134− --sidebar-non-existent: #505274;
135− --sidebar-active: #a4a0e8;
136− --sidebar-spacer: #2d334f;
137−
138− --scrollbar: var(--sidebar-fg);
139−
140− --icons: #737480;
141− --icons-hover: #b7b9cc;
142−
143− /* --links: #a4a0e8; */
144− --links: #ECCDBA;
145−
146− --inline-code-color: hsl(48.7, 7.8%, 70%);
147−
148− --theme-popup-bg: #161923;
149− --theme-popup-border: #737480;
150− --theme-hover: rgba(0, 0, 0, .2);
151−
152− --quote-bg: #281733;
153− --quote-border: hsl(226, 15%, 22%);
154−
155− --table-border-color: hsl(226, 23%, 76%);
156− --table-header-bg: hsla(226, 23%, 31%, 0);
157− --table-alternate-bg: hsl(226, 23%, 14%);
158− --table-border-line: hsla(201deg, 20%, 92%, 0.2);
159−
160− --searchbar-border-color: #aaa;
161− --searchbar-bg: #aeaec6;
162− --searchbar-fg: #000;
163− --searchbar-shadow-color: #aaa;
164− --searchresults-header-fg: #5f5f71;
165− --searchresults-border-color: #5c5c68;
166− --searchresults-li-bg: #242430;
167− --search-mark-bg: #a2cff5;
168−}
169−
170−.colibri .content .header {
171− color: #fff;
172−}
173−
174−/* highlight.js theme, :where() is used to avoid increasing specificity */
175−
176−:where(.colibri) .hljs {
177− background: #2f1e2e;
178− color: #a39e9b;
179−}
180−
181−:where(.colibri) .hljs-comment,
182−:where(.colibri) .hljs-quote {
183− color: #8d8687;
184−}
185−
186−:where(.colibri) .hljs-link,
187−:where(.colibri) .hljs-meta,
188−:where(.colibri) .hljs-name,
189−:where(.colibri) .hljs-regexp,
190−:where(.colibri) .hljs-selector-class,
191−:where(.colibri) .hljs-selector-id,
192−:where(.colibri) .hljs-tag,
193−:where(.colibri) .hljs-template-variable,
194−:where(.colibri) .hljs-variable {
195− color: #ef6155;
196−}
197−
198−:where(.colibri) .hljs-built_in,
199−:where(.colibri) .hljs-deletion,
200−:where(.colibri) .hljs-literal,
201−:where(.colibri) .hljs-number,
202−:where(.colibri) .hljs-params,
203−:where(.colibri) .hljs-type {
204− color: #f99b15;
205−}
206−
207−:where(.colibri) .hljs-attribute,
208−:where(.colibri) .hljs-section,
209−:where(.colibri) .hljs-title {
210− color: #fec418;
211−}
212−
213−:where(.colibri) .hljs-addition,
214−:where(.colibri) .hljs-bullet,
215−:where(.colibri) .hljs-string,
216−:where(.colibri) .hljs-symbol {
217− color: #48b685;
218−}
219−
220−:where(.colibri) .hljs-keyword,
221−:where(.colibri) .hljs-selector-tag {
222− color: #815ba4;
223−}
224−
225−:where(.colibri) .hljs-emphasis {
226− font-style: italic;
227−}
228−
229−:where(.colibri) .hljs-strong {
230− font-weight: 700;
231−}
book/src/configuration.md+11−38
@@ -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 | `250` |
54+| `idle-timeout` | Time in milliseconds since last keypress before idle timers trigger. Used for autocompletion, set to 0 for instant | `400` |
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,9 +64,6 @@ 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`
70
67
71### `[editor.statusline]` Section
68### `[editor.statusline]` Section
72
69
@@ -92,9 +89,9 @@ The `[editor.statusline]` key takes the following sub-keys:
92
89
93| Key | Description | Default |
90| Key | Description | Default |
94| --- | --- | --- |
91| --- | --- | --- |
95−| `left` | A list of elements aligned to the left of the statusline | `["mode", "spinner", "file-name", "read-only-indicator", "file-modification-indicator"]` |
92+| `left` | A list of elements aligned to the left of the statusline | `["mode", "spinner", "file-name"]` |
96| `center` | A list of elements aligned to the middle of the statusline | `[]` |
93| `center` | A list of elements aligned to the middle of the statusline | `[]` |
97−| `right` | A list of elements aligned to the right of the statusline | `["diagnostics", "selections", "register", "position", "file-encoding"]` |
94+| `right` | A list of elements aligned to the right of the statusline | `["diagnostics", "selections", "position", "file-encoding"]` |
98| `separator` | The character used to separate elements in the statusline | `"│"` |
95| `separator` | The character used to separate elements in the statusline | `"│"` |
99| `mode.normal` | The text shown in the `mode` element for normal mode | `"NOR"` |
96| `mode.normal` | The text shown in the `mode` element for normal mode | `"NOR"` |
100| `mode.insert` | The text shown in the `mode` element for insert mode | `"INS"` |
97| `mode.insert` | The text shown in the `mode` element for insert mode | `"INS"` |
@@ -111,7 +108,6 @@ The following statusline elements can be configured:
111| `file-modification-indicator` | The indicator to show whether the file is modified (a `[+]` appears when there are unsaved changes) |
108| `file-modification-indicator` | The indicator to show whether the file is modified (a `[+]` appears when there are unsaved changes) |
112| `file-encoding` | The encoding of the opened file if it differs from UTF-8 |
109| `file-encoding` | The encoding of the opened file if it differs from UTF-8 |
113| `file-line-ending` | The file line endings (CRLF or LF) |
110| `file-line-ending` | The file line endings (CRLF or LF) |
114−| `read-only-indicator` | An indicator that shows `[readonly]` when a file cannot be written |
115| `total-line-numbers` | The total line numbers of the opened file |
111| `total-line-numbers` | The total line numbers of the opened file |
116| `file-type` | The type of the opened file |
112| `file-type` | The type of the opened file |
117| `diagnostics` | The number of warnings and/or errors |
113| `diagnostics` | The number of warnings and/or errors |
@@ -168,31 +164,16 @@ All git related options are only enabled in a git repository.
168
164
169| Key | Description | Default |
165| Key | Description | Default |
170|--|--|---------|
166|--|--|---------|
171−|`hidden` | Enables ignoring hidden files | `true`
167+|`hidden` | Enables ignoring hidden files | true
172−|`follow-symlinks` | Follow symlinks instead of ignoring them | `true`
168+|`follow-symlinks` | Follow symlinks instead of ignoring them | true
173−|`deduplicate-links` | Ignore symlinks that point at files already shown in the picker | `true`
169+|`deduplicate-links` | Ignore symlinks that point at files already shown in the picker | true
174−|`parents` | Enables reading ignore files from parent directories | `true`
170+|`parents` | Enables reading ignore files from parent directories | true
175−|`ignore` | Enables reading `.ignore` files | `true`
171+|`ignore` | Enables reading `.ignore` files | true
176−|`git-ignore` | Enables reading `.gitignore` files | `true`
172+|`git-ignore` | Enables reading `.gitignore` files | true
177−|`git-global` | Enables reading global `.gitignore`, whose path is specified in git's config: `core.excludesfile` option | `true`
173+|`git-global` | Enables reading global `.gitignore`, whose path is specified in git's config: `core.excludefile` option | true
178−|`git-exclude` | Enables reading `.git/info/exclude` files | `true`
174+|`git-exclude` | Enables reading `.git/info/exclude` files | true
179|`max-depth` | Set with an integer value for maximum depth to recurse | Defaults to `None`.
175|`max-depth` | Set with an integer value for maximum depth to recurse | Defaults to `None`.
180
176
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−
196### `[editor.auto-pairs]` Section
177### `[editor.auto-pairs]` Section
197
178
198Enables automatic insertion of pairs to parentheses, brackets, etc. Can be a
179Enables automatic insertion of pairs to parentheses, brackets, etc. Can be a
@@ -366,11 +347,3 @@ max-wrap = 25 # increase value to reduce forced mid-word wrapping
366max-indent-retain = 0
347max-indent-retain = 0
367wrap-indicator = "" # set wrap-indicator to "" to hide it
348wrap-indicator = "" # set wrap-indicator to "" to hide it
368```
349```
369−
370−### `[editor.smart-tab]` Section
371−
372−
373−| Key | Description | Default |
374−|------------|-------------|---------|
375−| `enable` | If set to true, then when the cursor is in a position with non-whitespace to its left, instead of inserting a tab, it will run `move_parent_node_end`. If there is only whitespace to the left, then it inserts a tab as normal. With the default bindings, to explicitly insert a tab character, press Shift-tab. | `true` |
376−| `supersede-menu` | Normally, when a menu is on screen, such as when auto complete is triggered, the tab key is bound to cycling through the items. This means when menus are on screen, one cannot use the tab key to trigger the `smart-tab` command. If this option is set to true, the `smart-tab` command always takes precedence, which means one cannot use the tab key to cycle through menu items. One of the other bindings must be used instead, such as arrow keys or `C-n`/`C-p`. | `false` |
book/src/generated/lang-support.md+15−36
@@ -1,9 +1,8 @@
1| Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Default LSP |
1| Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Default LSP |
2| --- | --- | --- | --- | --- |
2| --- | --- | --- | --- | --- |
3−| agda | ✓ | | | |
4| astro | ✓ | | | |
3| astro | ✓ | | | |
5| awk | ✓ | ✓ | | `awk-language-server` |
4| awk | ✓ | ✓ | | `awk-language-server` |
6−| bash | ✓ | ✓ | ✓ | `bash-language-server` |
5+| bash | ✓ | | ✓ | `bash-language-server` |
7| bass | ✓ | | | `bass` |
6| bass | ✓ | | | `bass` |
8| beancount | ✓ | | | |
7| beancount | ✓ | | | |
9| bibtex | ✓ | | | `texlab` |
8| bibtex | ✓ | | | `texlab` |
@@ -11,13 +10,13 @@
11| blueprint | ✓ | | | `blueprint-compiler` |
10| blueprint | ✓ | | | `blueprint-compiler` |
12| c | ✓ | ✓ | ✓ | `clangd` |
11| c | ✓ | ✓ | ✓ | `clangd` |
13| c-sharp | ✓ | ✓ | | `OmniSharp` |
12| c-sharp | ✓ | ✓ | | `OmniSharp` |
14−| cabal | | | | `haskell-language-server-wrapper` |
13+| cabal | | | | |
15| cairo | ✓ | ✓ | ✓ | `cairo-language-server` |
14| cairo | ✓ | ✓ | ✓ | `cairo-language-server` |
16| capnp | ✓ | | ✓ | |
15| capnp | ✓ | | ✓ | |
17| clojure | ✓ | | | `clojure-lsp` |
16| clojure | ✓ | | | `clojure-lsp` |
18| cmake | ✓ | ✓ | ✓ | `cmake-language-server` |
17| cmake | ✓ | ✓ | ✓ | `cmake-language-server` |
19| comment | ✓ | | | |
18| comment | ✓ | | | |
20−| common-lisp | ✓ | | ✓ | `cl-lsp` |
19+| common-lisp | ✓ | | | `cl-lsp` |
21| cpon | ✓ | | ✓ | |
20| cpon | ✓ | | ✓ | |
22| cpp | ✓ | ✓ | ✓ | `clangd` |
21| cpp | ✓ | ✓ | ✓ | `clangd` |
23| crystal | ✓ | ✓ | | `crystalline` |
22| crystal | ✓ | ✓ | | `crystalline` |
@@ -25,7 +24,6 @@
25| cue | ✓ | | | `cuelsp` |
24| cue | ✓ | | | `cuelsp` |
26| d | ✓ | ✓ | ✓ | `serve-d` |
25| d | ✓ | ✓ | ✓ | `serve-d` |
27| dart | ✓ | | ✓ | `dart` |
26| dart | ✓ | | ✓ | `dart` |
28−| dbml | ✓ | | | |
29| devicetree | ✓ | | | |
27| devicetree | ✓ | | | |
30| dhall | ✓ | ✓ | | `dhall-lsp-server` |
28| dhall | ✓ | ✓ | | `dhall-lsp-server` |
31| diff | ✓ | | | |
29| diff | ✓ | | | |
@@ -45,10 +43,7 @@
45| fish | ✓ | ✓ | ✓ | |
43| fish | ✓ | ✓ | ✓ | |
46| forth | ✓ | | | `forth-lsp` |
44| forth | ✓ | | | `forth-lsp` |
47| fortran | ✓ | | ✓ | `fortls` |
45| fortran | ✓ | | ✓ | `fortls` |
48−| fsharp | ✓ | | | `fsautocomplete` |
49−| gas | ✓ | ✓ | | |
50| gdscript | ✓ | ✓ | ✓ | |
46| gdscript | ✓ | ✓ | ✓ | |
51−| gemini | ✓ | | | |
52| git-attributes | ✓ | | | |
47| git-attributes | ✓ | | | |
53| git-commit | ✓ | ✓ | | |
48| git-commit | ✓ | ✓ | | |
54| git-config | ✓ | | | |
49| git-config | ✓ | | | |
@@ -56,16 +51,14 @@
56| git-rebase | ✓ | | | |
51| git-rebase | ✓ | | | |
57| gleam | ✓ | ✓ | | `gleam` |
52| gleam | ✓ | ✓ | | `gleam` |
58| glsl | ✓ | ✓ | ✓ | |
53| glsl | ✓ | ✓ | ✓ | |
59−| gn | ✓ | | | |
54+| go | ✓ | ✓ | ✓ | `gopls` |
60−| go | ✓ | ✓ | ✓ | `gopls`, `golangci-lint-langserver` |
61| godot-resource | ✓ | | | |
55| godot-resource | ✓ | | | |
62| gomod | ✓ | | | `gopls` |
56| gomod | ✓ | | | `gopls` |
63| gotmpl | ✓ | | | `gopls` |
57| gotmpl | ✓ | | | `gopls` |
64| gowork | ✓ | | | `gopls` |
58| gowork | ✓ | | | `gopls` |
65−| graphql | ✓ | | | `graphql-lsp` |
59+| graphql | ✓ | | | |
66| hare | ✓ | | | |
60| hare | ✓ | | | |
67| haskell | ✓ | ✓ | | `haskell-language-server-wrapper` |
61| haskell | ✓ | ✓ | | `haskell-language-server-wrapper` |
68−| haskell-persistent | ✓ | | | |
69| hcl | ✓ | | ✓ | `terraform-ls` |
62| hcl | ✓ | | ✓ | `terraform-ls` |
70| heex | ✓ | ✓ | | `elixir-ls` |
63| heex | ✓ | ✓ | | `elixir-ls` |
71| hosts | ✓ | | | |
64| hosts | ✓ | | | |
@@ -74,18 +67,15 @@
74| idris | | | | `idris2-lsp` |
67| idris | | | | `idris2-lsp` |
75| iex | ✓ | | | |
68| iex | ✓ | | | |
76| ini | ✓ | | | |
69| ini | ✓ | | | |
77−| janet | ✓ | | | |
78−| java | ✓ | ✓ | ✓ | `jdtls` |
70+| java | ✓ | ✓ | | `jdtls` |
79| javascript | ✓ | ✓ | ✓ | `typescript-language-server` |
71| javascript | ✓ | ✓ | ✓ | `typescript-language-server` |
80−| jinja | ✓ | | | |
81| jsdoc | ✓ | | | |
72| jsdoc | ✓ | | | |
82| json | ✓ | | ✓ | `vscode-json-language-server` |
73| json | ✓ | | ✓ | `vscode-json-language-server` |
83−| json5 | ✓ | | | |
84| jsonnet | ✓ | | | `jsonnet-language-server` |
74| jsonnet | ✓ | | | `jsonnet-language-server` |
85| jsx | ✓ | ✓ | ✓ | `typescript-language-server` |
75| jsx | ✓ | ✓ | ✓ | `typescript-language-server` |
86| julia | ✓ | ✓ | ✓ | `julia` |
76| julia | ✓ | ✓ | ✓ | `julia` |
87| just | ✓ | ✓ | ✓ | |
77| just | ✓ | ✓ | ✓ | |
88−| kdl | ✓ | ✓ | ✓ | |
78+| kdl | ✓ | | | |
89| kotlin | ✓ | | | `kotlin-language-server` |
79| kotlin | ✓ | | | `kotlin-language-server` |
90| latex | ✓ | ✓ | | `texlab` |
80| latex | ✓ | ✓ | | `texlab` |
91| lean | ✓ | | | `lean` |
81| lean | ✓ | | | `lean` |
@@ -93,8 +83,6 @@
93| llvm | ✓ | ✓ | ✓ | |
83| llvm | ✓ | ✓ | ✓ | |
94| llvm-mir | ✓ | ✓ | ✓ | |
84| llvm-mir | ✓ | ✓ | ✓ | |
95| llvm-mir-yaml | ✓ | | ✓ | |
85| llvm-mir-yaml | ✓ | | ✓ | |
96−| log | ✓ | | | |
97−| lpf | ✓ | | | |
98| lua | ✓ | ✓ | ✓ | `lua-language-server` |
86| lua | ✓ | ✓ | ✓ | `lua-language-server` |
99| make | ✓ | | | |
87| make | ✓ | | | |
100| markdoc | ✓ | | | `markdoc-ls` |
88| markdoc | ✓ | | | `markdoc-ls` |
@@ -109,8 +97,7 @@
109| nickel | ✓ | | ✓ | `nls` |
97| nickel | ✓ | | ✓ | `nls` |
110| nim | ✓ | ✓ | ✓ | `nimlangserver` |
98| nim | ✓ | ✓ | ✓ | `nimlangserver` |
111| nix | ✓ | | | `nil` |
99| nix | ✓ | | | `nil` |
112−| nu | ✓ | | | `nu` |
100+| nu | ✓ | | | |
113−| nunjucks | ✓ | | | |
114| ocaml | ✓ | | ✓ | `ocamllsp` |
101| ocaml | ✓ | | ✓ | `ocamllsp` |
115| ocaml-interface | ✓ | | | `ocamllsp` |
102| ocaml-interface | ✓ | | | `ocamllsp` |
116| odin | ✓ | | ✓ | `ols` |
103| odin | ✓ | | ✓ | `ols` |
@@ -123,17 +110,16 @@
123| perl | ✓ | ✓ | ✓ | `perlnavigator` |
110| perl | ✓ | ✓ | ✓ | `perlnavigator` |
124| php | ✓ | ✓ | ✓ | `intelephense` |
111| php | ✓ | ✓ | ✓ | `intelephense` |
125| po | ✓ | ✓ | | |
112| po | ✓ | ✓ | | |
126−| pod | ✓ | | | |
127| ponylang | ✓ | ✓ | ✓ | |
113| ponylang | ✓ | ✓ | ✓ | |
128| prisma | ✓ | | | `prisma-language-server` |
114| prisma | ✓ | | | `prisma-language-server` |
129| prolog | | | | `swipl` |
115| prolog | | | | `swipl` |
130−| protobuf | ✓ | | ✓ | `bufls`, `pb` |
116+| protobuf | ✓ | | ✓ | |
131| prql | ✓ | | | |
117| prql | ✓ | | | |
132−| purescript | ✓ | ✓ | | `purescript-language-server` |
118+| purescript | ✓ | | | `purescript-language-server` |
133| python | ✓ | ✓ | ✓ | `pylsp` |
119| python | ✓ | ✓ | ✓ | `pylsp` |
134| qml | ✓ | | ✓ | `qmlls` |
120| qml | ✓ | | ✓ | `qmlls` |
135| r | ✓ | | | `R` |
121| r | ✓ | | | `R` |
136−| racket | ✓ | | ✓ | `racket` |
122+| racket | ✓ | | | `racket` |
137| regex | ✓ | | | |
123| regex | ✓ | | | |
138| rego | ✓ | | | `regols` |
124| rego | ✓ | | | `regols` |
139| rescript | ✓ | ✓ | | `rescript-language-server` |
125| rescript | ✓ | ✓ | | `rescript-language-server` |
@@ -145,36 +131,30 @@
145| rust | ✓ | ✓ | ✓ | `rust-analyzer` |
131| rust | ✓ | ✓ | ✓ | `rust-analyzer` |
146| sage | ✓ | ✓ | | |
132| sage | ✓ | ✓ | | |
147| scala | ✓ | | ✓ | `metals` |
133| scala | ✓ | | ✓ | `metals` |
148−| scheme | ✓ | | ✓ | |
134+| scheme | ✓ | | | |
149| scss | ✓ | | | `vscode-css-language-server` |
135| scss | ✓ | | | `vscode-css-language-server` |
150| slint | ✓ | | ✓ | `slint-lsp` |
136| slint | ✓ | | ✓ | `slint-lsp` |
151−| smali | ✓ | | ✓ | |
152| smithy | ✓ | | | `cs` |
137| smithy | ✓ | | | `cs` |
153| sml | ✓ | | | |
138| sml | ✓ | | | |
154| solidity | ✓ | | | `solc` |
139| solidity | ✓ | | | `solc` |
155| sql | ✓ | | | |
140| sql | ✓ | | | |
156| sshclientconfig | ✓ | | | |
141| sshclientconfig | ✓ | | | |
157| starlark | ✓ | ✓ | | |
142| starlark | ✓ | ✓ | | |
158−| strace | ✓ | | | |
159−| svelte | ✓ | | ✓ | `svelteserver` |
143+| svelte | ✓ | | | `svelteserver` |
160| sway | ✓ | ✓ | ✓ | `forc` |
144| sway | ✓ | ✓ | ✓ | `forc` |
161| swift | ✓ | | | `sourcekit-lsp` |
145| swift | ✓ | | | `sourcekit-lsp` |
162| t32 | ✓ | | | |
146| t32 | ✓ | | | |
163| tablegen | ✓ | ✓ | ✓ | |
147| tablegen | ✓ | ✓ | ✓ | |
164| task | ✓ | | | |
148| task | ✓ | | | |
165−| templ | ✓ | | | `templ` |
166| tfvars | ✓ | | ✓ | `terraform-ls` |
149| tfvars | ✓ | | ✓ | `terraform-ls` |
167−| todotxt | ✓ | | | |
168| toml | ✓ | | | `taplo` |
150| toml | ✓ | | | `taplo` |
169| tsq | ✓ | | | |
151| tsq | ✓ | | | |
170| tsx | ✓ | ✓ | ✓ | `typescript-language-server` |
152| tsx | ✓ | ✓ | ✓ | `typescript-language-server` |
171| twig | ✓ | | | |
153| twig | ✓ | | | |
172| typescript | ✓ | ✓ | ✓ | `typescript-language-server` |
154| typescript | ✓ | ✓ | ✓ | `typescript-language-server` |
173−| typst | ✓ | | | `typst-lsp` |
174| ungrammar | ✓ | | | |
155| ungrammar | ✓ | | | |
175−| unison | ✓ | | | |
176| uxntal | ✓ | | | |
156| uxntal | ✓ | | | |
177−| v | ✓ | ✓ | ✓ | `v-analyzer` |
157+| v | ✓ | ✓ | ✓ | `v` |
178| vala | ✓ | | | `vala-language-server` |
158| vala | ✓ | | | `vala-language-server` |
179| verilog | ✓ | ✓ | | `svlangserver` |
159| verilog | ✓ | ✓ | | `svlangserver` |
180| vhdl | ✓ | | | `vhdl_ls` |
160| vhdl | ✓ | | | `vhdl_ls` |
@@ -185,9 +165,8 @@
185| webc | ✓ | | | |
165| webc | ✓ | | | |
186| wgsl | ✓ | | | `wgsl_analyzer` |
166| wgsl | ✓ | | | `wgsl_analyzer` |
187| wit | ✓ | | ✓ | |
167| wit | ✓ | | ✓ | |
188−| wren | ✓ | ✓ | ✓ | |
189| xit | ✓ | | | |
168| xit | ✓ | | | |
190| xml | ✓ | | ✓ | |
169| xml | ✓ | | ✓ | |
191−| yaml | ✓ | | ✓ | `yaml-language-server`, `ansible-language-server` |
170+| yaml | ✓ | | ✓ | `yaml-language-server` |
192| yuck | ✓ | | | |
171| yuck | ✓ | | | |
193| zig | ✓ | ✓ | ✓ | `zls` |
172| zig | ✓ | ✓ | ✓ | `zls` |
book/src/generated/typable-cmd.md+1−5
@@ -17,14 +17,13 @@
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-16 for number of spaces.) |
20+| `:indent-style` | Set the indentation style for editing. ('t' for tabs or 1-8 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. |
24| `:write-quit`, `:wq`, `:x` | Write changes to disk and close the current view. Accepts an optional path (:wq some/path.txt) |
24| `:write-quit`, `:wq`, `:x` | Write changes to disk and close the current view. Accepts an optional path (:wq some/path.txt) |
25| `:write-quit!`, `:wq!`, `:x!` | Write changes to disk and close the current view forcefully. Accepts an optional path (:wq! some/path.txt) |
25| `:write-quit!`, `:wq!`, `:x!` | Write changes to disk and close the current view forcefully. Accepts an optional path (:wq! some/path.txt) |
26| `:write-all`, `:wa` | Write changes from all buffers to disk. |
26| `:write-all`, `:wa` | Write changes from all buffers to disk. |
27−| `:write-all!`, `:wa!` | Forcefully write changes from all buffers to disk creating necessary subdirectories. |
28| `:write-quit-all`, `:wqa`, `:xa` | Write changes from all buffers to disk and close all views. |
27| `:write-quit-all`, `:wqa`, `:xa` | Write changes from all buffers to disk and close all views. |
29| `:write-quit-all!`, `:wqa!`, `:xa!` | Write changes from all buffers to disk and close all views forcefully (ignoring unsaved changes). |
28| `:write-quit-all!`, `:wqa!`, `:xa!` | Write changes from all buffers to disk and close all views forcefully (ignoring unsaved changes). |
30| `:quit-all`, `:qa` | Close all views. |
29| `:quit-all`, `:qa` | Close all views. |
@@ -55,7 +54,6 @@
55| `:lsp-restart` | Restarts the language servers used by the current doc |
54| `: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 |
55| `: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. |
56| `: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. |
59| `:debug-start`, `:dbg` | Start a debug session from a given template with given parameters. |
57| `:debug-start`, `:dbg` | Start a debug 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. |
58| `:debug-remote`, `:dbg-tcp` | Connect to a debug adapter by TCP address and start a debugging session from a given template with given parameters. |
61| `:debug-eval` | Evaluate expression in current debug context. |
59| `:debug-eval` | Evaluate expression in current debug context. |
@@ -84,5 +82,3 @@
84| `:run-shell-command`, `:sh` | Run a shell command |
82| `:run-shell-command`, `:sh` | Run a shell command |
85| `:reset-diff-change`, `:diffget`, `:diffg` | Reset the diff change at the cursor position. |
83| `:reset-diff-change`, `:diffget`, `:diffg` | Reset the diff change at the cursor position. |
86| `:clear-register` | Clear given register. If no argument is provided, clear all registers. |
84| `: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,7 +36,6 @@ 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).
40
39
41> 💡 In Helix, the first matching query takes precedence when evaluating
40> 💡 In Helix, the first matching query takes precedence when evaluating
42> queries, which is different from other editors such as Neovim where the last
41> queries, which is different from other editors such as Neovim where the last
@@ -52,4 +51,3 @@ below.
52 grammars.
51 grammars.
53- If a parser is causing a segfault, or you want to remove it, make sure to
52- If a parser is causing a segfault, or you want to remove it, make sure to
54 remove the compiled parser located at `runtime/grammars/<name>.so`.
53 remove the compiled parser located at `runtime/grammars/<name>.so`.
55−- If you are attempting to add queries and Helix is unable to locate them, ensure that the environment variable `HELIX_RUNTIME` is set to the location of the `runtime` folder you're developing in.
book/src/guides/indent.md+43−319
@@ -1,308 +1,76 @@
1# Adding indent queries
1# Adding indent queries
2
2
3−Helix uses tree-sitter to correctly indent new lines. This requires a tree-
3+Helix uses tree-sitter to correctly indent new lines. This requires
4−sitter grammar and an `indent.scm` query file placed in `runtime/queries/
4+a tree-sitter grammar and an `indent.scm` query file placed in
5−{language}/indents.scm`. The indentation for a line is calculated by traversing
5+`runtime/queries/{language}/indents.scm`. The indentation for a line
6−the syntax tree from the lowest node at the beginning of the new line (see
6+is calculated by traversing the syntax tree from the lowest node at the
7−[Indent queries](#indent-queries)). Each of these nodes contributes to the total
7+beginning of the new line. Each of these nodes contributes to the total
8−indent when it is captured by the query (in what way depends on the name of
8+indent when it is captured by the query (in what way depends on the name
9−the capture.
9+of the capture).
10
10
11Note that it matters where these added indents begin. For example,
11Note 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
13−the total indent level by 1. See [Capture types](#capture-types).
13+the total indent level by 1.
14
14
15−By default, Helix uses the `hybrid` indentation heuristic. This means that
15+## Scopes
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
16
24−## Indent queries
17+Added indents don't always apply to the whole node. For example, in most
25−
18+cases when a node should be indented, we actually only want everything
26−When Helix is inserting a new line through `o`, `O`, or `<ret>`, to determine
19+except for its first line to be indented. For this, there are several
27−the indent level for the new line, the query in `indents.scm` is run on the
20+scopes (more scopes may be added in the future if required):
28−document. The starting position of the query is the end of the line above where
29−a new line will be inserted.
30−
31−For `o`, the inserted line is the line below the cursor, so that starting
32−position of the query is the end of the current line.
33−
34−```rust
35−fn need_hero(some_hero: Hero, life: Life) -> {
36− matches!(some_hero, Hero { // ←─────────────────╮
37− strong: true,//←╮ ↑ ↑ │
38− fast: true, // │ │ ╰── query start │
39− sure: true, // │ ╰───── cursor ├─ traversal
40− soon: true, // ╰──────── new line inserted │ start node
41− }) && // │
42−// ↑ │
43−// ╰───────────────────────────────────────────────╯
44− some_hero > life
45−}
46−```
47−
48−For `O`, the newly inserted line is the *current* line, so the starting position
49−of the query is the end of the line above the cursor.
50−
51−```rust
52−fn need_hero(some_hero: Hero, life: Life) -> { // ←─╮
53− matches!(some_hero, Hero { // ←╮ ↑ │
54− strong: true,// ↑ ╭───╯ │ │
55− fast: true, // │ │ query start ─╯ │
56− sure: true, // ╰───┼ cursor ├─ traversal
57− soon: true, // ╰ new line inserted │ start node
58− }) && // │
59− some_hero > life // │
60−} // ←──────────────────────────────────────────────╯
61−```
62−
63−From this starting node, the syntax tree is traversed up until the root node.
64−Each indent capture is collected along the way, and then combined according to
65−their [capture types](#capture-types) and [scopes](#scopes) to a final indent
66−level for the line.
67−
68−### Capture types
69−
70−- `@indent` (default scope `tail`):
71− Increase the indent level by 1. Multiple occurrences in the same line *do not*
72− stack. If there is at least one `@indent` and one `@outdent` capture on the
73− same line, the indent level isn't changed at all.
74−- `@outdent` (default scope `all`):
75− Decrease the indent level by 1. The same rules as for `@indent` apply.
76−- `@indent.always` (default scope `tail`):
77− Increase the indent level by 1. Multiple occurrences on the same line *do*
78− stack. The final indent level is `@indent.always` – `@outdent.always`. If
79− an `@indent` and an `@indent.always` are on the same line, the `@indent` is
80− ignored.
81−- `@outdent.always` (default scope `all`):
82− Decrease the indent level by 1. The same rules as for `@indent.always` apply.
83−- `@align` (default scope `all`):
84− Align everything inside this node to some anchor. The anchor is given
85− by the start of the node captured by `@anchor` in the same pattern.
86− Every pattern with an `@align` should contain exactly one `@anchor`.
87− Indent (and outdent) for nodes below (in terms of their starting line)
88− the `@align` node is added to the indentation required for alignment.
89−- `@extend`:
90− Extend the range of this node to the end of the line and to lines that are
91− indented more than the line that this node starts on. This is useful for
92− languages like Python, where for the purpose of indentation some nodes (like
93− functions or classes) should also contain indented lines that follow them.
94−- `@extend.prevent-once`:
95− Prevents the first extension of an ancestor of this node. For example, in Python
96− a return expression always ends the block that it is in. Note that this only
97− stops the extension of the next `@extend` capture. If multiple ancestors are
98− captured, only the extension of the innermost one is prevented. All other
99− ancestors are unaffected (regardless of whether the innermost ancestor would
100− actually have been extended).
101−
102−#### `@indent` / `@outdent`
103−
104−Consider this example:
105−
106−```rust
107−fn shout(things: Vec<Thing>) {
108− // ↑
109− // ├───────────────────────╮ indent level
110− // @indent ├┄┄┄┄┄┄┄┄┄┄┄┄┄┄
111− // │
112− let it_all = |out| { things.filter(|thing| { // │ 1
113− // ↑ ↑ │
114− // ├───────────────────────┼─────┼┄┄┄┄┄┄┄┄┄┄┄┄┄┄
115− // @indent @indent │
116− // │ 2
117− thing.can_do_with(out) // │
118− })}; // ├┄┄┄┄┄┄┄┄┄┄┄┄┄┄
119− //↑↑↑ │ 1
120−} //╰┼┴──────────────────────────────────────────────┴┄┄┄┄┄┄┄┄┄┄┄┄┄┄
121−// 3x @outdent
122−```
123−
124−```scm
125−((block) @indent)
126−["}" ")"] @outdent
127−```
128−
129−Note how on the second line, we have two blocks begin on the same line. In this
130−case, since both captures occur on the same line, they are combined and only
131−result in a net increase of 1. Also note that the closing `}`s are part of the
132−`@indent` captures, but the 3 `@outdent`s also combine into 1 and result in that
133−line losing one indent level.
134−
135−#### `@extend` / `@extend.prevent-once`
136−
137−For an example of where `@extend` can be useful, consider Python, which is
138−whitespace-sensitive.
139−
140−```scm
141−]
142− (parenthesized_expression)
143− (function_definition)
144− (class_definition)
145−] @indent
146−
147−```
148−
149−```python
150−class Hero:
151− def __init__(self, strong, fast, sure, soon):# ←─╮
152− self.is_strong = strong # │
153− self.is_fast = fast # ╭─── query start │
154− self.is_sure = sure # │ ╭─ cursor │
155− self.is_soon = soon # │ │ │
156− # ↑ ↑ │ │ │
157− # │ ╰──────╯ │ │
158− # ╰─────────────────────╯ │
159− # ├─ traversal
160− def need_hero(self, life): # │ start node
161− return ( # │
162− self.is_strong # │
163− and self.is_fast # │
164− and self.is_sure # │
165− and self.is_soon # │
166− and self > life # │
167− ) # ←─────────────────────────────────────────╯
168−```
169−
170−Without braces to catch the scope of the function, the smallest descendant of
171−the cursor on a line feed ends up being the entire inside of the class. Because
172−of this, it will miss the entire function node and its indent capture, leading
173−to an indent level one too small.
174−
175−To address this case, `@extend` tells helix to "extend" the captured node's span
176−to the line feed and every consecutive line that has a greater indent level than
177−the line of the node.
178−
179−```scm
180−(parenthesized_expression) @indent
181−
182−]
183− (function_definition)
184− (class_definition)
185−] @indent @extend
186−
187−```
188−
189−```python
190−class Hero:
191− def __init__(self, strong, fast, sure, soon):# ←─╮
192− self.is_strong = strong # │
193− self.is_fast = fast # ╭─── query start ├─ traversal
194− self.is_sure = sure # │ ╭─ cursor │ start node
195− self.is_soon = soon # │ │ ←───────────────╯
196− # ↑ ↑ │ │
197− # │ ╰──────╯ │
198− # ╰─────────────────────╯
199− def need_hero(self, life):
200− return (
201− self.is_strong
202− and self.is_fast
203− and self.is_sure
204− and self.is_soon
205− and self > life
206− )
207−```
208−
209−Furthermore, there are some cases where extending to everything with a greater
210−indent level may not be desirable. Consider the `need_hero` function above. If
211−our cursor is on the last line of the returned expression.
212−
213−```python
214−class Hero:
215− def __init__(self, strong, fast, sure, soon):
216− self.is_strong = strong
217− self.is_fast = fast
218− self.is_sure = sure
219− self.is_soon = soon
220−
221− def need_hero(self, life):
222− return (
223− self.is_strong
224− and self.is_fast
225− and self.is_sure
226− and self.is_soon
227− and self > life
228− ) # ←─── cursor
229− #←────────── where cursor should go on new line
230−```
231
21
232−In Python, the are a few tokens that will always end a scope, such as a return
22+- `all`:
233−statement. Since the scope ends, so should the indent level. But because the
23+This scope applies to the whole captured node. This is only different from
234−function span is extended to every line with a greater indent level, a new line
24+`tail` when the captured node is the first node on its line.
235−would just continue on the same level. And an `@outdent` would not help us here
236−either, since it would cause everything in the parentheses to become outdented
237−as well.
238
25
239−To help, we need to signal an end to the extension. We can do this with
26+- `tail`:
240−`@extend.prevent-once`.
27+This scope applies to everything except for the first line of the
28+captured node.
241
29
30+Every capture type has a default scope which should do the right thing
31+in most situations. When a different scope is required, this can be
32+changed by using a `#set!` declaration anywhere in the pattern:
242```scm
33```scm
243−(parenthesized_expression) @indent
34+(assignment_expression
244−
35+ right: (_) @indent
245−]
36+ (#set! "scope" "all"))
246− (function_definition)
247− (class_definition)
248−] @indent @extend
249−
250−(return_statement) @extend.prevent-once
251```
37```
252
38
253−#### `@indent.always` / `@outdent.always`
39+## Capture types
254−
255−As mentioned before, normally if there is more than one `@indent` or `@outdent`
256−capture on the same line, they are combined.
257
40
258−Sometimes, there are cases when you may want to ensure that every indent capture
41+- `@indent` (default scope `tail`):
259−is additive, regardless of how many occur on the same line. Consider this
42+Increase the indent level by 1. Multiple occurrences in the same line
260−example in YAML.
43+don't stack. If there is at least one `@indent` and one `@outdent`
44+capture on the same line, the indent level isn't changed at all.
261
45
262−```yaml
46+- `@outdent` (default scope `all`):
263− - foo: bar
47+Decrease the indent level by 1. The same rules as for `@indent` apply.
264−# ↑ ↑
265−# │ ╰─────────────── start of map
266−# ╰───────────────── start of list element
267− baz: quux # ←─── cursor
268− # ←───────────── where the cursor should go on a new line
269− garply: waldo
270− - quux:
271− bar: baz
272− xyzzy: thud
273− fred: plugh
274−```
275
48
276−In YAML, you often have lists of maps. In these cases, the syntax is such that
49+- `@extend`:
277−the list element and the map both start on the same line. But we really do want
50+Extend the range of this node to the end of the line and to lines that
278−to start an indentation for each of these so that subsequent keys in the map
51+are indented more than the line that this node starts on. This is useful
279−hang over the list and align properly. This is where `@indent.always` helps.
52+for languages like Python, where for the purpose of indentation some nodes
53+(like functions or classes) should also contain indented lines that follow them.
280
54
281−```scm
55+- `@extend.prevent-once`:
282−((block_sequence_item) @item @indent.always @extend
56+Prevents the first extension of an ancestor of this node. For example, in Python
283− (#not-one-line? @item))
57+a return expression always ends the block that it is in. Note that this only stops the
58+extension of the next `@extend` capture. If multiple ancestors are captured,
59+only the extension of the innermost one is prevented. All other ancestors are unaffected
60+(regardless of whether the innermost ancestor would actually have been extended).
284
61
285−((block_mapping_pair
286− key: (_) @key
287− value: (_) @val
288− (#not-same-line? @key @val)
289− ) @indent.always @extend
290−)
291−```
292
62
293## Predicates
63## Predicates
294
64
295In some cases, an S-expression cannot express exactly what pattern should be matched.
65In some cases, an S-expression cannot express exactly what pattern should be matched.
296For that, tree-sitter allows for predicates to appear anywhere within a pattern,
66For that, tree-sitter allows for predicates to appear anywhere within a pattern,
297similar to how `#set!` declarations work:
67similar to how `#set!` declarations work:
298−
299```scm
68```scm
300(some_kind
69(some_kind
301 (child_kind) @indent
70 (child_kind) @indent
302 (#predicate? arg1 arg2 ...)
71 (#predicate? arg1 arg2 ...)
303)
72)
304```
73```
305−
306The number of arguments depends on the predicate that's used.
74The number of arguments depends on the predicate that's used.
307Each argument is either a capture (`@name`) or a string (`"some string"`).
75Each argument is either a capture (`@name`) or a string (`"some string"`).
308The following predicates are supported by tree-sitter:
76The following predicates are supported by tree-sitter:
@@ -323,47 +91,3 @@ argument (a string).
323
91
324- `#same-line?`/`#not-same-line?`:
92- `#same-line?`/`#not-same-line?`:
325The captures given by the 2 arguments must/must not start on the same line.
93The captures given by the 2 arguments must/must not start on the same line.
326−
327−- `#one-line?`/`#not-one-line?`:
328−The captures given by the fist argument must/must span a total of one line.
329−
330−### Scopes
331−
332−Added indents don't always apply to the whole node. For example, in most
333−cases when a node should be indented, we actually only want everything
334−except for its first line to be indented. For this, there are several
335−scopes (more scopes may be added in the future if required):
336−
337−- `tail`:
338−This scope applies to everything except for the first line of the
339−captured node.
340−- `all`:
341−This scope applies to the whole captured node. This is only different from
342−`tail` when the captured node is the first node on its line.
343−
344−For example, imagine we have the following function
345−
346−```rust
347−fn aha() { // ←─────────────────────────────────────╮
348− let take = "on me"; // ←──────────────╮ scope: │
349− let take = "me on"; // ├─ "tail" ├─ (block) @indent
350− let ill = be_gone_days(1 || 2); // │ │
351−} // ←───────────────────────────────────┴──────────┴─ "}" @outdent
352− // scope: "all"
353−```
354−
355−We can write the following query with the `#set!` declaration:
356−
357− ```scm
358− ((block) @indent
359− (#set! "scope" "tail"))
360− ("}" @outdent
361− (#set! "scope" "all"))
362− ```
363−
364−As we can see, the "tail" scope covers the node, except for the first line.
365−Everything up to and including the closing brace gets an indent level of 1.
366−Then, on the closing brace, we encounter an outdent with a scope of "all", which
367−means the first line is included, and the indent level is cancelled out on this
368−line. (Note these scopes are the defaults for `@indent` and `@outdent`—they are
369−written explicitly for demonstration.)
book/src/guides/injection.md+1−1
@@ -1,7 +1,7 @@
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+18−53
@@ -6,14 +6,12 @@
6- [Linux](#linux)
6- [Linux](#linux)
7 - [Ubuntu](#ubuntu)
7 - [Ubuntu](#ubuntu)
8 - [Fedora/RHEL](#fedorarhel)
8 - [Fedora/RHEL](#fedorarhel)
9− - [Arch Linux extra](#arch-linux-extra)
9+ - [Arch Linux community](#arch-linux-community)
10 - [NixOS](#nixos)
10 - [NixOS](#nixos)
11 - [Flatpak](#flatpak)
11 - [Flatpak](#flatpak)
12− - [Snap](#snap)
13 - [AppImage](#appimage)
12 - [AppImage](#appimage)
14- [macOS](#macos)
13- [macOS](#macos)
15 - [Homebrew Core](#homebrew-core)
14 - [Homebrew Core](#homebrew-core)
16− - [MacPorts](#macports)
17- [Windows](#windows)
15- [Windows](#windows)
18 - [Winget](#winget)
16 - [Winget](#winget)
19 - [Scoop](#scoop)
17 - [Scoop](#scoop)
@@ -65,13 +63,16 @@ sudo apt install helix
65
63
66### Fedora/RHEL
64### Fedora/RHEL
67
65
66+Enable the `COPR` repository for Helix:
67+
68```sh
68```sh
69+sudo dnf copr enable varlad/helix
69sudo dnf install helix
70sudo dnf install helix
70```
71```
71
72
72−### Arch Linux extra
73+### Arch Linux community
73
74
74−Releases are available in the `extra` repository:
75+Releases are available in the `community` repository:
75
76
76```sh
77```sh
77sudo pacman -S helix
78sudo pacman -S helix
@@ -103,16 +104,6 @@ flatpak install flathub com.helix_editor.Helix
103flatpak run com.helix_editor.Helix
104flatpak run com.helix_editor.Helix
104```
105```
105
106
106−### Snap
107−
108−Helix is available on [Snapcraft](https://snapcraft.io/helix) and can be installed with:
109−
110−```sh
111−snap install --classic helix
112−```
113−
114−This will install Helix as both `/snap/bin/helix` and `/snap/bin/hx`, so make sure `/snap/bin` is in your `PATH`.
115−
116### AppImage
107### AppImage
117
108
118Install Helix using the Linux [AppImage](https://appimage.org/) format.
109Install Helix using the Linux [AppImage](https://appimage.org/) format.
@@ -131,12 +122,6 @@ chmod +x helix-*.AppImage # change permission for executable mode
131brew install helix
122brew install helix
132```
123```
133
124
134−### MacPorts
135−
136−```sh
137−port install helix
138−```
139−
140## Windows
125## Windows
141
126
142Install on Windows using [Winget](https://learn.microsoft.com/en-us/windows/package-manager/winget/), [Scoop](https://scoop.sh/), [Chocolatey](https://chocolatey.org/)
127Install on Windows using [Winget](https://learn.microsoft.com/en-us/windows/package-manager/winget/), [Scoop](https://scoop.sh/), [Chocolatey](https://chocolatey.org/)
@@ -190,19 +175,19 @@ RUSTFLAGS="-C target-feature=-crt-static"
190
175
1911. Clone the repository:
1761. Clone the repository:
192
177
193− ```sh
178+```sh
194− git clone https://github.com/helix-editor/helix
179+git clone https://github.com/helix-editor/helix
195− cd helix
180+cd helix
196− ```
181+```
197
182
1982. Compile from source:
1832. Compile from source:
199
184
200− ```sh
185+```sh
201− cargo install --path helix-term --locked
186+cargo install --path helix-term --locked
202− ```
187+```
203
188
204− This command will create the `hx` executable and construct the tree-sitter
189+This command will create the `hx` executable and construct the tree-sitter
205− grammars in the local `runtime` folder.
190+grammars in the local `runtime` folder.
206
191
207> 💡 Tree-sitter grammars can be fetched and compiled if not pre-packaged. Fetch
192> 💡 Tree-sitter grammars can be fetched and compiled if not pre-packaged. Fetch
208> grammars with `hx --grammar fetch` and compile them with
193> grammars with `hx --grammar fetch` and compile them with
@@ -228,7 +213,7 @@ Or, create a symbolic link:
228ln -Ts $PWD/runtime ~/.config/helix/runtime
213ln -Ts $PWD/runtime ~/.config/helix/runtime
229```
214```
230
215
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.
216+If the above command fails to create a symbolic link because the file exists either move `~/.config/helix/runtime` to a new location or delete it, then run the symlink command above again.
232
217
233#### Windows
218#### Windows
234
219
@@ -261,32 +246,12 @@ following order:
2611. `runtime/` sibling directory to `$CARGO_MANIFEST_DIR` directory (this is intended for
2461. `runtime/` sibling directory to `$CARGO_MANIFEST_DIR` directory (this is intended for
262 developing and testing helix only).
247 developing and testing helix only).
2632. `runtime/` subdirectory of OS-dependent helix user config directory.
2482. `runtime/` subdirectory of OS-dependent helix user config directory.
264−3. `$HELIX_RUNTIME`
249+3. `$HELIX_RUNTIME`.
265−4. Distribution-specific fallback directory (set at compile time—not run time—
266− with the `HELIX_DEFAULT_RUNTIME` environment variable)
267−5. `runtime/` subdirectory of path to Helix executable.
250+4. `runtime/` subdirectory of path to Helix executable.
268
251
269This order also sets the priority for selecting which file will be used if multiple runtime
252This order also sets the priority for selecting which file will be used if multiple runtime
270directories have files with the same name.
253directories have files with the same name.
271
254
272−#### Note to packagers
273−
274−If you are making a package of Helix for end users, to provide a good out of
275−the box experience, you should set the `HELIX_DEFAULT_RUNTIME` environment
276−variable at build time (before invoking `cargo build`) to a directory which
277−will store the final runtime files after installation. For example, say you want
278−to package the runtime into `/usr/lib/helix/runtime`. The rough steps a build
279−script could follow are:
280−
281−1. `export HELIX_DEFAULT_RUNTIME=/usr/lib/helix/runtime`
282−1. `cargo build --profile opt --locked --path helix-term`
283−1. `cp -r runtime $BUILD_DIR/usr/lib/helix/`
284−1. `cp target/opt/hx $BUILD_DIR/usr/bin/hx`
285−
286−This way the resulting `hx` binary will always look for its runtime directory in
287−`/usr/lib/helix/runtime` if the user has no custom runtime in `~/.config/helix`
288−or `HELIX_RUNTIME`.
289−
290### Validating the installation
255### Validating the installation
291
256
292To make sure everything is set up as expected you should run the Helix health
257To make sure everything is set up as expected you should run the Helix health
book/src/keymap.md+15−16
@@ -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. You can return to it from other modes by pressing the `Escape` key.
28+Normal mode is the default mode when you launch helix. Return to it from other modes by typing `Escape`.
29
29
30### Movement
30### Movement
31
31
@@ -291,7 +291,7 @@ This layer is a kludge of mappings, mostly pickers.
291| `w` | Enter [window mode](#window-mode) | N/A |
291| `w` | Enter [window mode](#window-mode) | N/A |
292| `p` | Paste system clipboard after selections | `paste_clipboard_after` |
292| `p` | Paste system clipboard after selections | `paste_clipboard_after` |
293| `P` | Paste system clipboard before selections | `paste_clipboard_before` |
293| `P` | Paste system clipboard before selections | `paste_clipboard_before` |
294−| `y` | Yank selections to clipboard | `yank_to_clipboard` |
294+| `y` | Join and yank selections to clipboard | `yank_joined_to_clipboard` |
295| `Y` | Yank main selection to clipboard | `yank_main_selection_to_clipboard` |
295| `Y` | Yank main selection to clipboard | `yank_main_selection_to_clipboard` |
296| `R` | Replace selections by clipboard contents | `replace_selections_with_clipboard` |
296| `R` | Replace selections by clipboard contents | `replace_selections_with_clipboard` |
297| `/` | Global search in workspace folder | `global_search` |
297| `/` | Global search in workspace folder | `global_search` |
@@ -411,20 +411,19 @@ you to selectively add search terms to your selections.
411
411
412Keys to use within picker. Remapping currently not supported.
412Keys to use within picker. Remapping currently not supported.
413
413
414−| Key | Description |
414+| Key | Description |
415−| ----- | ------------- |
415+| ----- | ------------- |
416−| `Shift-Tab`, `Up`, `Ctrl-p` | Previous entry |
416+| `Shift-Tab`, `Up`, `Ctrl-p` | Previous entry |
417−| `Tab`, `Down`, `Ctrl-n` | Next entry |
417+| `Tab`, `Down`, `Ctrl-n` | Next entry |
418−| `PageUp`, `Ctrl-u` | Page up |
418+| `PageUp`, `Ctrl-u` | Page up |
419−| `PageDown`, `Ctrl-d` | Page down |
419+| `PageDown`, `Ctrl-d` | Page down |
420−| `Home` | Go to first entry |
420+| `Home` | Go to first entry |
421−| `End` | Go to last entry |
421+| `End` | Go to last entry |
422−| `Enter` | Open selected |
422+| `Enter` | Open selected |
423−| `Alt-Enter` | Open selected in the background without closing the picker |
424−| `Ctrl-s` | Open horizontally |
423+| `Ctrl-s` | Open horizontally |
425−| `Ctrl-v` | Open vertically |
424+| `Ctrl-v` | Open vertically |
426−| `Ctrl-t` | Toggle preview |
425+| `Ctrl-t` | Toggle preview |
427−| `Escape`, `Ctrl-c` | Close picker |
426+| `Escape`, `Ctrl-c` | Close picker |
428
427
429## Prompt
428## Prompt
430
429
book/src/languages.md+1−3
@@ -66,10 +66,8 @@ 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)
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` |
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` |
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. |
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. |
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.
73
71
74### File-type detection and the `file-types` key
72### File-type detection and the `file-types` key
75
73
@@ -129,7 +127,7 @@ These are the available options for a language server.
129| `environment` | Any environment variables that will be used when starting the language server `{ "KEY1" = "Value1", "KEY2" = "Value2" }` |
127| `environment` | Any environment variables that will be used when starting the language server `{ "KEY1" = "Value1", "KEY2" = "Value2" }` |
130
128
131A `format` sub-table within `config` can be used to pass extra formatting options to
129A `format` sub-table within `config` can be used to pass extra formatting options to
132−[Document Formatting Requests](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_formatting).
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).
133For example, with typescript:
131For example, with typescript:
134
132
135```toml
133```toml
book/src/themes.md+1−9
@@ -70,7 +70,6 @@ over it and is merged into the default palette.
70
70
71| Color Name |
71| Color Name |
72| --- |
72| --- |
73−| `default` |
74| `black` |
73| `black` |
75| `red` |
74| `red` |
76| `green` |
75| `green` |
@@ -155,7 +154,6 @@ We use a similar set of scopes as
155
154
156- `type` - Types
155- `type` - Types
157 - `builtin` - Primitive types provided by the language (`int`, `usize`)
156 - `builtin` - Primitive types provided by the language (`int`, `usize`)
158− - `parameter` - Generic type parameters (`T`)
159 - `enum`
157 - `enum`
160 - `variant`
158 - `variant`
161- `constructor`
159- `constructor`
@@ -246,12 +244,9 @@ We use a similar set of scopes as
246
244
247- `diff` - version control changes
245- `diff` - version control changes
248 - `plus` - additions
246 - `plus` - additions
249− - `gutter` - gutter indicator
250 - `minus` - deletions
247 - `minus` - deletions
251− - `gutter` - gutter indicator
252 - `delta` - modifications
248 - `delta` - modifications
253 - `moved` - renamed or moved files/changes
249 - `moved` - renamed or moved files/changes
254− - `gutter` - gutter indicator
255
250
256#### Interface
251#### Interface
257
252
@@ -296,14 +291,11 @@ These scopes are used for theming the editor interface:
296| `ui.statusline.insert` | Statusline mode during insert mode ([only if `editor.color-modes` is enabled][editor-section]) |
291| `ui.statusline.insert` | Statusline mode during insert mode ([only if `editor.color-modes` is enabled][editor-section]) |
297| `ui.statusline.select` | Statusline mode during select mode ([only if `editor.color-modes` is enabled][editor-section]) |
292| `ui.statusline.select` | Statusline mode during select mode ([only if `editor.color-modes` is enabled][editor-section]) |
298| `ui.statusline.separator` | Separator character in statusline |
293| `ui.statusline.separator` | Separator character in statusline |
299−| `ui.bufferline` | Style for the buffer line |
300−| `ui.bufferline.active` | Style for the active buffer in buffer line |
301−| `ui.bufferline.background` | Style for bufferline background |
302| `ui.popup` | Documentation popups (e.g. Space + k) |
294| `ui.popup` | Documentation popups (e.g. Space + k) |
303| `ui.popup.info` | Prompt for multiple key options |
295| `ui.popup.info` | Prompt for multiple key options |
304| `ui.window` | Borderlines separating splits |
296| `ui.window` | Borderlines separating splits |
305| `ui.help` | Description box for commands |
297| `ui.help` | Description box for commands |
306−| `ui.text` | Default text style, command prompts, popup text, etc. |
298+| `ui.text` | Command prompts, popup text, etc. |
307| `ui.text.focus` | The currently selected line in the picker |
299| `ui.text.focus` | The currently selected line in the picker |
308| `ui.text.inactive` | Same as `ui.text` but when the text is inactive (e.g. suggestions) |
300| `ui.text.inactive` | Same as `ui.text` but when the text is inactive (e.g. suggestions) |
309| `ui.text.info` | The key: command text in `ui.popup.info` boxes |
301| `ui.text.info` | The key: command text in `ui.popup.info` boxes |
book/src/usage.md+5−21
@@ -37,35 +37,19 @@ If a register is selected before invoking a change or delete command, the select
37- `"hc` - Store the selection in register `h` and then change it (delete and enter insert mode).
37- `"hc` - Store the selection in register `h` and then change it (delete and enter insert mode).
38- `"md` - Store the selection in register `m` and delete it.
38- `"md` - Store the selection in register `m` and delete it.
39
39
40−### Default registers
40+### Special registers
41−
42−Commands that use registers, like yank (`y`), use a default register if none is specified.
43−These registers are used as defaults:
44
41
45| Register character | Contains |
42| Register character | Contains |
46| --- | --- |
43| --- | --- |
47| `/` | Last search |
44| `/` | Last search |
48| `:` | Last executed command |
45| `:` | Last executed command |
49| `"` | Last yanked text |
46| `"` | Last yanked text |
50−| `@` | Last recorded macro |
47+| `_` | Black hole |
51
48
52−### Special registers
49+The system clipboard is not directly supported by a special register. Instead, special commands and keybindings are provided. Refer to the
50+[key map](keymap.md#space-mode) for more details.
53
51
54−Some registers have special behavior when read from and written to.
52+The black hole register is a no-op register, meaning that no data will be read or written to it.
55−
56−| Register character | When read | When written |
57−| --- | --- | --- |
58−| `_` | No values are returned | All values are discarded |
59−| `#` | Selection indices (first selection is `1`, second is `2`, etc.) | This register is not writable |
60−| `.` | Contents of the current selections | This register is not writable |
61−| `%` | Name of the current file | This register is not writable |
62−| `+` | Reads from the system clipboard | Joins and yanks to the system clipboard |
63−| `*` | Reads from the primary clipboard | Joins and yanks to the primary clipboard |
64−
65−When yanking multiple selections to the clipboard registers, the selections
66−are joined with newlines. Pasting from these registers will paste multiple
67−selections if the clipboard was last yanked to by the Helix session. Otherwise
68−the clipboard contents are pasted as one selection.
69
53
70## Surround
54## Surround
71
55
book/theme/book.jsnew file+660
@@ -0,0 +1,660 @@
1+"use strict";
2+
3+// Fix back button cache problem
4+window.onunload = function () { };
5+
6+// Global variable, shared between modules
7+function playground_text(playground) {
8+ let code_block = playground.querySelector("code");
9+
10+ if (window.ace && code_block.classList.contains("editable")) {
11+ let editor = window.ace.edit(code_block);
12+ return editor.getValue();
13+ } else {
14+ return code_block.textContent;
15+ }
16+}
17+
18+(function codeSnippets() {
19+ function fetch_with_timeout(url, options, timeout = 6000) {
20+ return Promise.race([
21+ fetch(url, options),
22+ new Promise((_, reject) => setTimeout(() => reject(new Error('timeout')), timeout))
23+ ]);
24+ }
25+
26+ var playgrounds = Array.from(document.querySelectorAll(".playground"));
27+ if (playgrounds.length > 0) {
28+ fetch_with_timeout("https://play.rust-lang.org/meta/crates", {
29+ headers: {
30+ 'Content-Type': "application/json",
31+ },
32+ method: 'POST',
33+ mode: 'cors',
34+ })
35+ .then(response => response.json())
36+ .then(response => {
37+ // get list of crates available in the rust playground
38+ let playground_crates = response.crates.map(item => item["id"]);
39+ playgrounds.forEach(block => handle_crate_list_update(block, playground_crates));
40+ });
41+ }
42+
43+ function handle_crate_list_update(playground_block, playground_crates) {
44+ // update the play buttons after receiving the response
45+ update_play_button(playground_block, playground_crates);
46+
47+ // and install on change listener to dynamically update ACE editors
48+ if (window.ace) {
49+ let code_block = playground_block.querySelector("code");
50+ if (code_block.classList.contains("editable")) {
51+ let editor = window.ace.edit(code_block);
52+ editor.addEventListener("change", function (e) {
53+ update_play_button(playground_block, playground_crates);
54+ });
55+ // add Ctrl-Enter command to execute rust code
56+ editor.commands.addCommand({
57+ name: "run",
58+ bindKey: {
59+ win: "Ctrl-Enter",
60+ mac: "Ctrl-Enter"
61+ },
62+ exec: _editor => run_rust_code(playground_block)
63+ });
64+ }
65+ }
66+ }
67+
68+ // updates the visibility of play button based on `no_run` class and
69+ // used crates vs ones available on http://play.rust-lang.org
70+ function update_play_button(pre_block, playground_crates) {
71+ var play_button = pre_block.querySelector(".play-button");
72+
73+ // skip if code is `no_run`
74+ if (pre_block.querySelector('code').classList.contains("no_run")) {
75+ play_button.classList.add("hidden");
76+ return;
77+ }
78+
79+ // get list of `extern crate`'s from snippet
80+ var txt = playground_text(pre_block);
81+ var re = /extern\s+crate\s+([a-zA-Z_0-9]+)\s*;/g;
82+ var snippet_crates = [];
83+ var item;
84+ while (item = re.exec(txt)) {
85+ snippet_crates.push(item[1]);
86+ }
87+
88+ // check if all used crates are available on play.rust-lang.org
89+ var all_available = snippet_crates.every(function (elem) {
90+ return playground_crates.indexOf(elem) > -1;
91+ });
92+
93+ if (all_available) {
94+ play_button.classList.remove("hidden");
95+ } else {
96+ play_button.classList.add("hidden");
97+ }
98+ }
99+
100+ function run_rust_code(code_block) {
101+ var result_block = code_block.querySelector(".result");
102+ if (!result_block) {
103+ result_block = document.createElement('code');
104+ result_block.className = 'result hljs language-bash';
105+
106+ code_block.append(result_block);
107+ }
108+
109+ let text = playground_text(code_block);
110+ let classes = code_block.querySelector('code').classList;
111+ let has_2018 = classes.contains("edition2018");
112+ let edition = has_2018 ? "2018" : "2015";
113+
114+ var params = {
115+ version: "stable",
116+ optimize: "0",
117+ code: text,
118+ edition: edition
119+ };
120+
121+ if (text.indexOf("#![feature") !== -1) {
122+ params.version = "nightly";
123+ }
124+
125+ result_block.innerText = "Running...";
126+
127+ fetch_with_timeout("https://play.rust-lang.org/evaluate.json", {
128+ headers: {
129+ 'Content-Type': "application/json",
130+ },
131+ method: 'POST',
132+ mode: 'cors',
133+ body: JSON.stringify(params)
134+ })
135+ .then(response => response.json())
136+ .then(response => result_block.innerText = response.result)
137+ .catch(error => result_block.innerText = "Playground Communication: " + error.message);
138+ }
139+
140+ // Syntax highlighting Configuration
141+ hljs.configure({
142+ tabReplace: ' ', // 4 spaces
143+ languages: [], // Languages used for auto-detection
144+ });
145+
146+ let code_nodes = Array
147+ .from(document.querySelectorAll('code'))
148+ // Don't highlight `inline code` blocks in headers.
149+ .filter(function (node) {return !node.parentElement.classList.contains("header"); });
150+
151+ if (window.ace) {
152+ // language-rust class needs to be removed for editable
153+ // blocks or highlightjs will capture events
154+ Array
155+ .from(document.querySelectorAll('code.editable'))
156+ .forEach(function (block) { block.classList.remove('language-rust'); });
157+
158+ Array
159+ .from(document.querySelectorAll('code:not(.editable)'))
160+ .forEach(function (block) { hljs.highlightBlock(block); });
161+ } else {
162+ code_nodes.forEach(function (block) { hljs.highlightBlock(block); });
163+ }
164+
165+ // Adding the hljs class gives code blocks the color css
166+ // even if highlighting doesn't apply
167+ code_nodes.forEach(function (block) { block.classList.add('hljs'); });
168+
169+ Array.from(document.querySelectorAll("code.language-rust")).forEach(function (block) {
170+
171+ var lines = Array.from(block.querySelectorAll('.boring'));
172+ // If no lines were hidden, return
173+ if (!lines.length) { return; }
174+ block.classList.add("hide-boring");
175+
176+ var buttons = document.createElement('div');
177+ buttons.className = 'buttons';
178+ buttons.innerHTML = "<button class=\"fa fa-eye\" title=\"Show hidden lines\" aria-label=\"Show hidden lines\"></button>";
179+
180+ // add expand button
181+ var pre_block = block.parentNode;
182+ pre_block.insertBefore(buttons, pre_block.firstChild);
183+
184+ pre_block.querySelector('.buttons').addEventListener('click', function (e) {
185+ if (e.target.classList.contains('fa-eye')) {
186+ e.target.classList.remove('fa-eye');
187+ e.target.classList.add('fa-eye-slash');
188+ e.target.title = 'Hide lines';
189+ e.target.setAttribute('aria-label', e.target.title);
190+
191+ block.classList.remove('hide-boring');
192+ } else if (e.target.classList.contains('fa-eye-slash')) {
193+ e.target.classList.remove('fa-eye-slash');
194+ e.target.classList.add('fa-eye');
195+ e.target.title = 'Show hidden lines';
196+ e.target.setAttribute('aria-label', e.target.title);
197+
198+ block.classList.add('hide-boring');
199+ }
200+ });
201+ });
202+
203+ if (window.playground_copyable) {
204+ Array.from(document.querySelectorAll('pre code')).forEach(function (block) {
205+ var pre_block = block.parentNode;
206+ if (!pre_block.classList.contains('playground')) {
207+ var buttons = pre_block.querySelector(".buttons");
208+ if (!buttons) {
209+ buttons = document.createElement('div');
210+ buttons.className = 'buttons';
211+ pre_block.insertBefore(buttons, pre_block.firstChild);
212+ }
213+
214+ var clipButton = document.createElement('button');
215+ clipButton.className = 'fa fa-copy clip-button';
216+ clipButton.title = 'Copy to clipboard';
217+ clipButton.setAttribute('aria-label', clipButton.title);
218+ clipButton.innerHTML = '<i class=\"tooltiptext\"></i>';
219+
220+ buttons.insertBefore(clipButton, buttons.firstChild);
221+ }
222+ });
223+ }
224+
225+ // Process playground code blocks
226+ Array.from(document.querySelectorAll(".playground")).forEach(function (pre_block) {
227+ // Add play button
228+ var buttons = pre_block.querySelector(".buttons");
229+ if (!buttons) {
230+ buttons = document.createElement('div');
231+ buttons.className = 'buttons';
232+ pre_block.insertBefore(buttons, pre_block.firstChild);
233+ }
234+
235+ var runCodeButton = document.createElement('button');
236+ runCodeButton.className = 'fa fa-play play-button';
237+ runCodeButton.hidden = true;
238+ runCodeButton.title = 'Run this code';
239+ runCodeButton.setAttribute('aria-label', runCodeButton.title);
240+
241+ buttons.insertBefore(runCodeButton, buttons.firstChild);
242+ runCodeButton.addEventListener('click', function (e) {
243+ run_rust_code(pre_block);
244+ });
245+
246+ if (window.playground_copyable) {
247+ var copyCodeClipboardButton = document.createElement('button');
248+ copyCodeClipboardButton.className = 'fa fa-copy clip-button';
249+ copyCodeClipboardButton.innerHTML = '<i class="tooltiptext"></i>';
250+ copyCodeClipboardButton.title = 'Copy to clipboard';
251+ copyCodeClipboardButton.setAttribute('aria-label', copyCodeClipboardButton.title);
252+
253+ buttons.insertBefore(copyCodeClipboardButton, buttons.firstChild);
254+ }
255+
256+ let code_block = pre_block.querySelector("code");
257+ if (window.ace && code_block.classList.contains("editable")) {
258+ var undoChangesButton = document.createElement('button');
259+ undoChangesButton.className = 'fa fa-history reset-button';
260+ undoChangesButton.title = 'Undo changes';
261+ undoChangesButton.setAttribute('aria-label', undoChangesButton.title);
262+
263+ buttons.insertBefore(undoChangesButton, buttons.firstChild);
264+
265+ undoChangesButton.addEventListener('click', function () {
266+ let editor = window.ace.edit(code_block);
267+ editor.setValue(editor.originalCode);
268+ editor.clearSelection();
269+ });
270+ }
271+ });
272+})();
273+
274+(function themes() {
275+ var html = document.querySelector('html');
276+ var themeToggleButton = document.getElementById('theme-toggle');
277+ var themePopup = document.getElementById('theme-list');
278+ var themeColorMetaTag = document.querySelector('meta[name="theme-color"]');
279+ var stylesheets = {
280+ ayuHighlight: document.querySelector("[href$='ayu-highlight.css']"),
281+ tomorrowNight: document.querySelector("[href$='tomorrow-night.css']"),
282+ highlight: document.querySelector("[href$='highlight.css']"),
283+ };
284+
285+ function showThemes() {
286+ themePopup.style.display = 'block';
287+ themeToggleButton.setAttribute('aria-expanded', true);
288+ themePopup.querySelector("button#" + get_theme()).focus();
289+ }
290+
291+ function hideThemes() {
292+ themePopup.style.display = 'none';
293+ themeToggleButton.setAttribute('aria-expanded', false);
294+ themeToggleButton.focus();
295+ }
296+
297+ function get_theme() {
298+ var theme;
299+ try { theme = localStorage.getItem('mdbook-theme'); } catch (e) { }
300+ if (theme === null || theme === undefined) {
301+ return default_theme;
302+ } else {
303+ return theme;
304+ }
305+ }
306+
307+ function set_theme(theme, store = true) {
308+ let ace_theme;
309+
310+ if (theme == 'coal' || theme == 'navy') {
311+ stylesheets.ayuHighlight.disabled = true;
312+ stylesheets.tomorrowNight.disabled = false;
313+ stylesheets.highlight.disabled = true;
314+
315+ ace_theme = "ace/theme/tomorrow_night";
316+ } else if (theme == 'ayu') {
317+ stylesheets.ayuHighlight.disabled = false;
318+ stylesheets.tomorrowNight.disabled = true;
319+ stylesheets.highlight.disabled = true;
320+ ace_theme = "ace/theme/tomorrow_night";
321+ } else {
322+ stylesheets.ayuHighlight.disabled = true;
323+ stylesheets.tomorrowNight.disabled = true;
324+ stylesheets.highlight.disabled = false;
325+ ace_theme = "ace/theme/dawn";
326+ }
327+
328+ setTimeout(function () {
329+ themeColorMetaTag.content = getComputedStyle(document.body).backgroundColor;
330+ }, 1);
331+
332+ if (window.ace && window.editors) {
333+ window.editors.forEach(function (editor) {
334+ editor.setTheme(ace_theme);
335+ });
336+ }
337+
338+ var previousTheme = get_theme();
339+
340+ if (store) {
341+ try { localStorage.setItem('mdbook-theme', theme); } catch (e) { }
342+ }
343+
344+ html.classList.remove(previousTheme);
345+ html.classList.add(theme);
346+ }
347+
348+ // Set theme
349+ var theme = get_theme();
350+
351+ set_theme(theme, false);
352+
353+ themeToggleButton.addEventListener('click', function () {
354+ if (themePopup.style.display === 'block') {
355+ hideThemes();
356+ } else {
357+ showThemes();
358+ }
359+ });
360+
361+ themePopup.addEventListener('click', function (e) {
362+ var theme = e.target.id || e.target.parentElement.id;
363+ set_theme(theme);
364+ });
365+
366+ themePopup.addEventListener('focusout', function(e) {
367+ // e.relatedTarget is null in Safari and Firefox on macOS (see workaround below)
368+ if (!!e.relatedTarget && !themeToggleButton.contains(e.relatedTarget) && !themePopup.contains(e.relatedTarget)) {
369+ hideThemes();
370+ }
371+ });
372+
373+ // Should not be needed, but it works around an issue on macOS & iOS: https://github.com/rust-lang/mdBook/issues/628
374+ document.addEventListener('click', function(e) {
375+ if (themePopup.style.display === 'block' && !themeToggleButton.contains(e.target) && !themePopup.contains(e.target)) {
376+ hideThemes();
377+ }
378+ });
379+
380+ document.addEventListener('keydown', function (e) {
381+ if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) { return; }
382+ if (!themePopup.contains(e.target)) { return; }
383+
384+ switch (e.key) {
385+ case 'Escape':
386+ e.preventDefault();
387+ hideThemes();
388+ break;
389+ case 'ArrowUp':
390+ e.preventDefault();
391+ var li = document.activeElement.parentElement;
392+ if (li && li.previousElementSibling) {
393+ li.previousElementSibling.querySelector('button').focus();
394+ }
395+ break;
396+ case 'ArrowDown':
397+ e.preventDefault();
398+ var li = document.activeElement.parentElement;
399+ if (li && li.nextElementSibling) {
400+ li.nextElementSibling.querySelector('button').focus();
401+ }
402+ break;
403+ case 'Home':
404+ e.preventDefault();
405+ themePopup.querySelector('li:first-child button').focus();
406+ break;
407+ case 'End':
408+ e.preventDefault();
409+ themePopup.querySelector('li:last-child button').focus();
410+ break;
411+ }
412+ });
413+})();
414+
415+(function sidebar() {
416+ var html = document.querySelector("html");
417+ var sidebar = document.getElementById("sidebar");
418+ var sidebarLinks = document.querySelectorAll('#sidebar a');
419+ var sidebarToggleButton = document.getElementById("sidebar-toggle");
420+ var sidebarResizeHandle = document.getElementById("sidebar-resize-handle");
421+ var firstContact = null;
422+
423+ function showSidebar() {
424+ html.classList.remove('sidebar-hidden')
425+ html.classList.add('sidebar-visible');
426+ Array.from(sidebarLinks).forEach(function (link) {
427+ link.setAttribute('tabIndex', 0);
428+ });
429+ sidebarToggleButton.setAttribute('aria-expanded', true);
430+ sidebar.setAttribute('aria-hidden', false);
431+ try { localStorage.setItem('mdbook-sidebar', 'visible'); } catch (e) { }
432+ }
433+
434+
435+ var sidebarAnchorToggles = document.querySelectorAll('#sidebar a.toggle');
436+
437+ function toggleSection(ev) {
438+ ev.currentTarget.parentElement.classList.toggle('expanded');
439+ }
440+
441+ Array.from(sidebarAnchorToggles).forEach(function (el) {
442+ el.addEventListener('click', toggleSection);
443+ });
444+
445+ function hideSidebar() {
446+ html.classList.remove('sidebar-visible')
447+ html.classList.add('sidebar-hidden');
448+ Array.from(sidebarLinks).forEach(function (link) {
449+ link.setAttribute('tabIndex', -1);
450+ });
451+ sidebarToggleButton.setAttribute('aria-expanded', false);
452+ sidebar.setAttribute('aria-hidden', true);
453+ try { localStorage.setItem('mdbook-sidebar', 'hidden'); } catch (e) { }
454+ }
455+
456+ // Toggle sidebar
457+ sidebarToggleButton.addEventListener('click', function sidebarToggle() {
458+ if (html.classList.contains("sidebar-hidden")) {
459+ var current_width = parseInt(
460+ document.documentElement.style.getPropertyValue('--sidebar-width'), 10);
461+ if (current_width < 150) {
462+ document.documentElement.style.setProperty('--sidebar-width', '150px');
463+ }
464+ showSidebar();
465+ } else if (html.classList.contains("sidebar-visible")) {
466+ hideSidebar();
467+ } else {
468+ if (getComputedStyle(sidebar)['transform'] === 'none') {
469+ hideSidebar();
470+ } else {
471+ showSidebar();
472+ }
473+ }
474+ });
475+
476+ sidebarResizeHandle.addEventListener('mousedown', initResize, false);
477+
478+ function initResize(e) {
479+ window.addEventListener('mousemove', resize, false);
480+ window.addEventListener('mouseup', stopResize, false);
481+ html.classList.add('sidebar-resizing');
482+ }
483+ function resize(e) {
484+ var pos = (e.clientX - sidebar.offsetLeft);
485+ if (pos < 20) {
486+ hideSidebar();
487+ } else {
488+ if (html.classList.contains("sidebar-hidden")) {
489+ showSidebar();
490+ }
491+ pos = Math.min(pos, window.innerWidth - 100);
492+ document.documentElement.style.setProperty('--sidebar-width', pos + 'px');
493+ }
494+ }
495+ //on mouseup remove windows functions mousemove & mouseup
496+ function stopResize(e) {
497+ html.classList.remove('sidebar-resizing');
498+ window.removeEventListener('mousemove', resize, false);
499+ window.removeEventListener('mouseup', stopResize, false);
500+ }
501+
502+ document.addEventListener('touchstart', function (e) {
503+ firstContact = {
504+ x: e.touches[0].clientX,
505+ time: Date.now()
506+ };
507+ }, { passive: true });
508+
509+ document.addEventListener('touchmove', function (e) {
510+ if (!firstContact)
511+ return;
512+
513+ var curX = e.touches[0].clientX;
514+ var xDiff = curX - firstContact.x,
515+ tDiff = Date.now() - firstContact.time;
516+
517+ if (tDiff < 250 && Math.abs(xDiff) >= 150) {
518+ if (xDiff >= 0 && firstContact.x < Math.min(document.body.clientWidth * 0.25, 300))
519+ showSidebar();
520+ else if (xDiff < 0 && curX < 300)
521+ hideSidebar();
522+
523+ firstContact = null;
524+ }
525+ }, { passive: true });
526+
527+ // Scroll sidebar to current active section
528+ var activeSection = document.getElementById("sidebar").querySelector(".active");
529+ if (activeSection) {
530+ // https://developer.mozilla.org/en-US/docs/Web/API/Element/scrollIntoView
531+ activeSection.scrollIntoView({ block: 'center' });
532+ }
533+})();
534+
535+(function chapterNavigation() {
536+ document.addEventListener('keydown', function (e) {
537+ if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) { return; }
538+ if (window.search && window.search.hasFocus()) { return; }
539+
540+ switch (e.key) {
541+ case 'ArrowRight':
542+ e.preventDefault();
543+ var nextButton = document.querySelector('.nav-chapters.next');
544+ if (nextButton) {
545+ window.location.href = nextButton.href;
546+ }
547+ break;
548+ case 'ArrowLeft':
549+ e.preventDefault();
550+ var previousButton = document.querySelector('.nav-chapters.previous');
551+ if (previousButton) {
552+ window.location.href = previousButton.href;
553+ }
554+ break;
555+ }
556+ });
557+})();
558+
559+(function clipboard() {
560+ var clipButtons = document.querySelectorAll('.clip-button');
561+
562+ function hideTooltip(elem) {
563+ elem.firstChild.innerText = "";
564+ elem.className = 'fa fa-copy clip-button';
565+ }
566+
567+ function showTooltip(elem, msg) {
568+ elem.firstChild.innerText = msg;
569+ elem.className = 'fa fa-copy tooltipped';
570+ }
571+
572+ var clipboardSnippets = new ClipboardJS('.clip-button', {
573+ text: function (trigger) {
574+ hideTooltip(trigger);
575+ let playground = trigger.closest("pre");
576+ return playground_text(playground);
577+ }
578+ });
579+
580+ Array.from(clipButtons).forEach(function (clipButton) {
581+ clipButton.addEventListener('mouseout', function (e) {
582+ hideTooltip(e.currentTarget);
583+ });
584+ });
585+
586+ clipboardSnippets.on('success', function (e) {
587+ e.clearSelection();
588+ showTooltip(e.trigger, "Copied!");
589+ });
590+
591+ clipboardSnippets.on('error', function (e) {
592+ showTooltip(e.trigger, "Clipboard error!");
593+ });
594+})();
595+
596+(function scrollToTop () {
597+ var menuTitle = document.querySelector('.menu-title');
598+
599+ menuTitle.addEventListener('click', function () {
600+ document.scrollingElement.scrollTo({ top: 0, behavior: 'smooth' });
601+ });
602+})();
603+
604+(function controlMenu() {
605+ var menu = document.getElementById('menu-bar');
606+
607+ (function controlPosition() {
608+ var scrollTop = document.scrollingElement.scrollTop;
609+ var prevScrollTop = scrollTop;
610+ var minMenuY = -menu.clientHeight - 50;
611+ // When the script loads, the page can be at any scroll (e.g. if you reforesh it).
612+ menu.style.top = scrollTop + 'px';
613+ // Same as parseInt(menu.style.top.slice(0, -2), but faster
614+ var topCache = menu.style.top.slice(0, -2);
615+ menu.classList.remove('sticky');
616+ var stickyCache = false; // Same as menu.classList.contains('sticky'), but faster
617+ document.addEventListener('scroll', function () {
618+ scrollTop = Math.max(document.scrollingElement.scrollTop, 0);
619+ // `null` means that it doesn't need to be updated
620+ var nextSticky = null;
621+ var nextTop = null;
622+ var scrollDown = scrollTop > prevScrollTop;
623+ var menuPosAbsoluteY = topCache - scrollTop;
624+ if (scrollDown) {
625+ nextSticky = false;
626+ if (menuPosAbsoluteY > 0) {
627+ nextTop = prevScrollTop;
628+ }
629+ } else {
630+ if (menuPosAbsoluteY > 0) {
631+ nextSticky = true;
632+ } else if (menuPosAbsoluteY < minMenuY) {
633+ nextTop = prevScrollTop + minMenuY;
634+ }
635+ }
636+ if (nextSticky === true && stickyCache === false) {
637+ menu.classList.add('sticky');
638+ stickyCache = true;
639+ } else if (nextSticky === false && stickyCache === true) {
640+ menu.classList.remove('sticky');
641+ stickyCache = false;
642+ }
643+ if (nextTop !== null) {
644+ menu.style.top = nextTop + 'px';
645+ topCache = nextTop;
646+ }
647+ prevScrollTop = scrollTop;
648+ }, { passive: true });
649+ })();
650+ (function controlBorder() {
651+ menu.classList.remove('bordered');
652+ document.addEventListener('scroll', function () {
653+ if (menu.offsetTop === 0) {
654+ menu.classList.remove('bordered');
655+ } else {
656+ menu.classList.add('bordered');
657+ }
658+ }, { passive: true });
659+ })();
660+})();
book/theme/css/chrome.cssnew file+499
@@ -0,0 +1,499 @@
1+/* CSS for UI elements (a.k.a. chrome) */
2+
3+@import 'variables.css';
4+
5+::-webkit-scrollbar {
6+ background: var(--bg);
7+}
8+::-webkit-scrollbar-thumb {
9+ background: var(--scrollbar);
10+}
11+html {
12+ scrollbar-color: var(--scrollbar) var(--bg);
13+}
14+#searchresults a,
15+.content a:link,
16+a:visited,
17+a > .hljs {
18+ color: var(--links);
19+}
20+.content a:hover {
21+ text-decoration: underline;
22+}
23+
24+/* Menu Bar */
25+
26+#menu-bar,
27+#menu-bar-hover-placeholder {
28+ z-index: 101;
29+ margin: auto calc(0px - var(--page-padding));
30+}
31+#menu-bar {
32+ position: relative;
33+ display: flex;
34+ flex-wrap: wrap;
35+ background-color: var(--bg);
36+ border-bottom-color: var(--bg);
37+ border-bottom-width: 1px;
38+ border-bottom-style: solid;
39+}
40+#menu-bar.sticky,
41+.js #menu-bar-hover-placeholder:hover + #menu-bar,
42+.js #menu-bar:hover,
43+.js.sidebar-visible #menu-bar {
44+ position: -webkit-sticky;
45+ position: sticky;
46+ top: 0 !important;
47+}
48+#menu-bar-hover-placeholder {
49+ position: sticky;
50+ position: -webkit-sticky;
51+ top: 0;
52+ height: var(--menu-bar-height);
53+}
54+#menu-bar.bordered {
55+ border-bottom-color: var(--table-border-color);
56+}
57+#menu-bar i, #menu-bar .icon-button {
58+ position: relative;
59+ padding: 0 8px;
60+ z-index: 10;
61+ line-height: var(--menu-bar-height);
62+ cursor: pointer;
63+ transition: color 0.5s;
64+}
65+@media only screen and (max-width: 420px) {
66+ #menu-bar i, #menu-bar .icon-button {
67+ padding: 0 5px;
68+ }
69+}
70+
71+.icon-button {
72+ border: none;
73+ background: none;
74+ padding: 0;
75+ color: inherit;
76+}
77+.icon-button i {
78+ margin: 0;
79+}
80+
81+.right-buttons {
82+ margin: 0 15px;
83+}
84+.right-buttons a {
85+ text-decoration: none;
86+}
87+
88+.left-buttons {
89+ display: flex;
90+ margin: 0 5px;
91+}
92+.no-js .left-buttons {
93+ display: none;
94+}
95+
96+.menu-title {
97+ display: inline-block;
98+ font-weight: 200;
99+ font-size: 2.4rem;
100+ line-height: var(--menu-bar-height);
101+ text-align: center;
102+ margin: 0;
103+ flex: 1;
104+ white-space: nowrap;
105+ overflow: hidden;
106+ text-overflow: ellipsis;
107+}
108+.js .menu-title {
109+ cursor: pointer;
110+}
111+
112+.menu-bar,
113+.menu-bar:visited,
114+.nav-chapters,
115+.nav-chapters:visited,
116+.mobile-nav-chapters,
117+.mobile-nav-chapters:visited,
118+.menu-bar .icon-button,
119+.menu-bar a i {
120+ color: var(--icons);
121+}
122+
123+.menu-bar i:hover,
124+.menu-bar .icon-button:hover,
125+.nav-chapters:hover,
126+.mobile-nav-chapters i:hover {
127+ color: var(--icons-hover);
128+}
129+
130+/* Nav Icons */
131+
132+.nav-chapters {
133+ font-size: 2.5em;
134+ text-align: center;
135+ text-decoration: none;
136+
137+ position: fixed;
138+ top: 0;
139+ bottom: 0;
140+ margin: 0;
141+ max-width: 150px;
142+ min-width: 90px;
143+
144+ display: flex;
145+ justify-content: center;
146+ align-content: center;
147+ flex-direction: column;
148+
149+ transition: color 0.5s, background-color 0.5s;
150+}
151+
152+.nav-chapters:hover {
153+ text-decoration: none;
154+ background-color: var(--theme-hover);
155+ transition: background-color 0.15s, color 0.15s;
156+}
157+
158+.nav-wrapper {
159+ margin-top: 50px;
160+ display: none;
161+}
162+
163+.mobile-nav-chapters {
164+ font-size: 2.5em;
165+ text-align: center;
166+ text-decoration: none;
167+ width: 90px;
168+ border-radius: 5px;
169+ background-color: var(--sidebar-bg);
170+}
171+
172+.previous {
173+ float: left;
174+}
175+
176+.next {
177+ float: right;
178+ right: var(--page-padding);
179+}
180+
181+@media only screen and (max-width: 1080px) {
182+ .nav-wide-wrapper { display: none; }
183+ .nav-wrapper { display: block; }
184+}
185+
186+@media only screen and (max-width: 1380px) {
187+ .sidebar-visible .nav-wide-wrapper { display: none; }
188+ .sidebar-visible .nav-wrapper { display: block; }
189+}
190+
191+/* Inline code */
192+
193+:not(pre) > .hljs {
194+ display: inline;
195+ padding: 0.1em 0.3em;
196+ border-radius: 3px;
197+}
198+
199+:not(pre):not(a):not(td):not(p) > .hljs {
200+ color: var(--inline-code-color);
201+ overflow-x: initial;
202+}
203+
204+a:hover > .hljs {
205+ text-decoration: underline;
206+}
207+
208+pre {
209+ position: relative;
210+}
211+pre > .buttons {
212+ position: absolute;
213+ z-index: 100;
214+ right: 5px;
215+ top: 5px;
216+
217+ color: var(--sidebar-fg);
218+ cursor: pointer;
219+}
220+pre > .buttons :hover {
221+ color: var(--sidebar-active);
222+}
223+pre > .buttons i {
224+ margin-left: 8px;
225+}
226+pre > .buttons button {
227+ color: inherit;
228+ background: transparent;
229+ border: none;
230+ cursor: inherit;
231+}
232+pre > .result {
233+ margin-top: 10px;
234+}
235+
236+/* Search */
237+
238+#searchresults a {
239+ text-decoration: none;
240+}
241+
242+mark {
243+ border-radius: 2px;
244+ padding: 0 3px 1px 3px;
245+ margin: 0 -3px -1px -3px;
246+ background-color: var(--search-mark-bg);
247+ transition: background-color 300ms linear;
248+ cursor: pointer;
249+}
250+
251+mark.fade-out {
252+ background-color: rgba(0,0,0,0) !important;
253+ cursor: auto;
254+}
255+
256+.searchbar-outer {
257+ margin-left: auto;
258+ margin-right: auto;
259+ max-width: var(--content-max-width);
260+}
261+
262+#searchbar {
263+ width: 100%;
264+ margin: 5px auto 0px auto;
265+ padding: 10px 16px;
266+ transition: box-shadow 300ms ease-in-out;
267+ border: 1px solid var(--searchbar-border-color);
268+ border-radius: 3px;
269+ background-color: var(--searchbar-bg);
270+ color: var(--searchbar-fg);
271+}
272+#searchbar:focus,
273+#searchbar.active {
274+ box-shadow: 0 0 3px var(--searchbar-shadow-color);
275+}
276+
277+.searchresults-header {
278+ font-weight: bold;
279+ font-size: 1em;
280+ padding: 18px 0 0 5px;
281+ color: var(--searchresults-header-fg);
282+}
283+
284+.searchresults-outer {
285+ margin-left: auto;
286+ margin-right: auto;
287+ max-width: var(--content-max-width);
288+ border-bottom: 1px dashed var(--searchresults-border-color);
289+}
290+
291+ul#searchresults {
292+ list-style: none;
293+ padding-left: 20px;
294+}
295+ul#searchresults li {
296+ margin: 10px 0px;
297+ padding: 2px;
298+ border-radius: 2px;
299+}
300+ul#searchresults li.focus {
301+ background-color: var(--searchresults-li-bg);
302+}
303+ul#searchresults span.teaser {
304+ display: block;
305+ clear: both;
306+ margin: 5px 0 0 20px;
307+ font-size: 0.8em;
308+}
309+ul#searchresults span.teaser em {
310+ font-weight: bold;
311+ font-style: normal;
312+}
313+
314+/* Sidebar */
315+
316+.sidebar {
317+ position: fixed;
318+ left: 0;
319+ top: 0;
320+ bottom: 0;
321+ width: var(--sidebar-width);
322+ font-size: 0.875em;
323+ box-sizing: border-box;
324+ -webkit-overflow-scrolling: touch;
325+ overscroll-behavior-y: contain;
326+ background-color: var(--sidebar-bg);
327+ color: var(--sidebar-fg);
328+}
329+.sidebar-resizing {
330+ -moz-user-select: none;
331+ -webkit-user-select: none;
332+ -ms-user-select: none;
333+ user-select: none;
334+}
335+.js:not(.sidebar-resizing) .sidebar {
336+ transition: transform 0.3s; /* Animation: slide away */
337+}
338+.sidebar code {
339+ line-height: 2em;
340+}
341+.sidebar .sidebar-scrollbox {
342+ overflow-y: auto;
343+ position: absolute;
344+ top: 0;
345+ bottom: 0;
346+ left: 0;
347+ right: 0;
348+}
349+.sidebar .sidebar-resize-handle {
350+ position: absolute;
351+ cursor: col-resize;
352+ width: 0;
353+ right: 0;
354+ top: 0;
355+ bottom: 0;
356+}
357+.js .sidebar .sidebar-resize-handle {
358+ cursor: col-resize;
359+ width: 5px;
360+}
361+.sidebar-hidden .sidebar {
362+ transform: translateX(calc(0px - var(--sidebar-width)));
363+}
364+.sidebar::-webkit-scrollbar {
365+ background: var(--sidebar-bg);
366+}
367+.sidebar::-webkit-scrollbar-thumb {
368+ background: var(--scrollbar);
369+}
370+
371+.sidebar-visible .page-wrapper {
372+ transform: translateX(var(--sidebar-width));
373+}
374+@media only screen and (min-width: 620px) {
375+ .sidebar-visible .page-wrapper {
376+ transform: none;
377+ margin-left: var(--sidebar-width);
378+ }
379+}
380+
381+.chapter {
382+ list-style: none outside none;
383+ padding-left: 0;
384+ margin: .25rem 0;
385+}
386+
387+.chapter ol {
388+ width: 100%;
389+}
390+
391+.chapter li {
392+ display: flex;
393+ color: var(--sidebar-non-existent);
394+}
395+.chapter li a {
396+ display: block;
397+ text-decoration: none;
398+ color: var(--sidebar-fg);
399+}
400+
401+.chapter li a:hover {
402+ color: var(--sidebar-active);
403+}
404+
405+.chapter li a.active {
406+ color: var(--sidebar-active);
407+}
408+
409+.chapter li > a.toggle {
410+ cursor: pointer;
411+ display: block;
412+ margin-left: auto;
413+ padding: 0 10px;
414+ user-select: none;
415+ opacity: 0.68;
416+}
417+
418+.chapter li > a.toggle div {
419+ transition: transform 0.5s;
420+}
421+
422+/* collapse the section */
423+.chapter li:not(.expanded) + li > ol {
424+ display: none;
425+}
426+
427+.chapter li.chapter-item {
428+ padding: 1rem 1.5rem;
429+}
430+
431+.chapter .section li.chapter-item {
432+ padding: .5rem .5rem 0 .5rem;
433+}
434+
435+.chapter li.expanded > a.toggle div {
436+ transform: rotate(90deg);
437+}
438+
439+.spacer {
440+ width: 100%;
441+ height: 3px;
442+ margin: 5px 0px;
443+}
444+.chapter .spacer {
445+ background-color: var(--sidebar-spacer);
446+}
447+
448+@media (-moz-touch-enabled: 1), (pointer: coarse) {
449+ .chapter li a { padding: 5px 0; }
450+ .spacer { margin: 10px 0; }
451+}
452+
453+.section {
454+ list-style: none outside none;
455+ padding-left: 2rem;
456+ line-height: 1.9em;
457+}
458+
459+/* Theme Menu Popup */
460+
461+.theme-popup {
462+ position: absolute;
463+ left: 10px;
464+ top: var(--menu-bar-height);
465+ z-index: 1000;
466+ border-radius: 4px;
467+ font-size: 0.7em;
468+ color: var(--fg);
469+ background: var(--theme-popup-bg);
470+ border: 1px solid var(--theme-popup-border);
471+ margin: 0;
472+ padding: 0;
473+ list-style: none;
474+ display: none;
475+}
476+.theme-popup .default {
477+ color: var(--icons);
478+}
479+.theme-popup .theme {
480+ width: 100%;
481+ border: 0;
482+ margin: 0;
483+ padding: 2px 10px;
484+ line-height: 25px;
485+ white-space: nowrap;
486+ text-align: left;
487+ cursor: pointer;
488+ color: inherit;
489+ background: inherit;
490+ font-size: inherit;
491+}
492+.theme-popup .theme:hover {
493+ background-color: var(--theme-hover);
494+}
495+.theme-popup .theme:hover:first-child,
496+.theme-popup .theme:hover:last-child {
497+ border-top-left-radius: inherit;
498+ border-top-right-radius: inherit;
499+}
book/theme/css/general.cssnew file+233
@@ -0,0 +1,233 @@
1+/* Base styles and content styles */
2+
3+@import 'variables.css';
4+
5+:root {
6+ /* Browser default font-size is 16px, this way 1 rem = 10px */
7+ font-size: 62.5%;
8+}
9+
10+/* TODO: replace with self hosted fonts */
11+
12+html {
13+ font-family: "Inter", sans-serif;
14+ color: var(--fg);
15+ background-color: var(--bg);
16+ text-size-adjust: none;
17+}
18+
19+/* @supports (font-variation-settings: normal) { */
20+/* html { font-family: 'Inter var', sans-serif; } */
21+/* } */
22+
23+body {
24+ margin: 0;
25+ font-size: 1.6rem;
26+ overflow-x: hidden;
27+}
28+
29+code {
30+ font-family: "Source Code Pro", Consolas, "Ubuntu Mono", Menlo, "DejaVu Sans Mono", monospace, monospace !important;
31+ font-size: 0.875em; /* please adjust the ace font size accordingly in editor.js */
32+}
33+
34+/* Don't change font size in headers. */
35+h1 code, h2 code, h3 code, h4 code, h5 code, h6 code {
36+ font-size: unset;
37+}
38+
39+.left { float: left; }
40+.right { float: right; }
41+.boring { opacity: 0.6; }
42+.hide-boring .boring { display: none; }
43+.hidden { display: none !important; }
44+
45+h2, h3 { margin-top: 2.5em; }
46+h4, h5 { margin-top: 2em; }
47+
48+.header + .header h3,
49+.header + .header h4,
50+.header + .header h5 {
51+ margin-top: 1em;
52+}
53+
54+h1:target::before,
55+h2:target::before,
56+h3:target::before,
57+h4:target::before,
58+h5:target::before,
59+h6:target::before {
60+ display: inline-block;
61+ content: "»";
62+ margin-left: -30px;
63+ width: 30px;
64+}
65+
66+/* This is broken on Safari as of version 14, but is fixed
67+ in Safari Technology Preview 117 which I think will be Safari 14.2.
68+ https://bugs.webkit.org/show_bug.cgi?id=218076
69+*/
70+:target {
71+ scroll-margin-top: calc(var(--menu-bar-height) + 0.5em);
72+}
73+
74+.page {
75+ outline: 0;
76+ padding: 0 var(--page-padding);
77+ margin-top: calc(0px - var(--menu-bar-height)); /* Compensate for the #menu-bar-hover-placeholder */
78+}
79+.page-wrapper {
80+ box-sizing: border-box;
81+}
82+.js:not(.sidebar-resizing) .page-wrapper {
83+ transition: margin-left 0.3s ease, transform 0.3s ease; /* Animation: slide away */
84+}
85+
86+.content {
87+ overflow-y: auto;
88+ padding: 0 15px;
89+ padding-bottom: 50px;
90+}
91+.content main {
92+ margin-left: auto;
93+ margin-right: auto;
94+ max-width: var(--content-max-width);
95+}
96+
97+
98+/* 2 1.75 1.5 1.25 1 .875 */
99+
100+.content h1 { font-size: 2em }
101+.content h2 { font-size: 1.75em }
102+.content h3 { font-size: 1.5em }
103+.content h4 { font-size: 1.25em }
104+.content h5 { font-size: 1em }
105+.content h6 { font-size: .875em }
106+
107+.content h1, .content h2, .content h3, .content h4 {
108+ font-weight: 500;
109+ margin-top: 1.275em;
110+ margin-bottom: .875em;
111+}
112+.content p, .content ol, .content ul, .content table {
113+ margin-top: 0;
114+ margin-bottom: .875em;
115+}
116+
117+.content ul li {
118+margin-bottom: .25rem;
119+}
120+.content ul {
121+ list-style-type: square;
122+}
123+.content ul ul, .content ol ul {
124+ margin-bottom: .5rem;
125+}
126+.content li p {
127+ margin-bottom: .5em;
128+}
129+
130+.content p { line-height: 1.45em; }
131+.content ol { line-height: 1.45em; }
132+.content ul { line-height: 1.45em; }
133+.content a { text-decoration: none; }
134+.content a:hover { text-decoration: underline; }
135+.content img { max-width: 100%; }
136+.content .header:link,
137+.content .header:visited {
138+ color: var(--fg);
139+ color: var(--heading-fg);
140+}
141+.content .header:link,
142+.content .header:visited:hover {
143+ text-decoration: none;
144+}
145+
146+table {
147+ margin: 0 auto;
148+ border-collapse: collapse;
149+ width: 100%;
150+}
151+table td {
152+ padding: .75rem;
153+ width: auto;
154+}
155+table thead {
156+ background: var(--table-header-bg);
157+}
158+table thead td {
159+ font-weight: 700;
160+ border: none;
161+}
162+table thead th {
163+ padding: .75rem;
164+ text-align: left;
165+ font-weight: 500;
166+ line-height: 1.5;
167+ width: auto;
168+}
169+table thead tr {
170+ border-bottom: 2px var(--table-border-color) solid;
171+}
172+table tbody tr {
173+ border-bottom: 1px var(--table-border-line) solid;
174+}
175+/* Alternate background colors for rows */
176+table tbody tr:nth-child(2n) {
177+ /* background: var(--table-alternate-bg); */
178+}
179+
180+
181+blockquote {
182+ margin: 1.5rem 0;
183+ padding: 1rem 1.5rem;
184+ color: var(--fg);
185+ opacity: .9;
186+ background-color: var(--quote-bg);
187+ border-left: 4px solid var(--quote-border);
188+}
189+blockquote *:last-child {
190+ margin-bottom: 0;
191+}
192+
193+
194+:not(.footnote-definition) + .footnote-definition,
195+.footnote-definition + :not(.footnote-definition) {
196+ margin-top: 2em;
197+}
198+.footnote-definition {
199+ font-size: 0.9em;
200+ margin: 0.5em 0;
201+}
202+.footnote-definition p {
203+ display: inline;
204+}
205+
206+.tooltiptext {
207+ position: absolute;
208+ visibility: hidden;
209+ color: #fff;
210+ background-color: #333;
211+ transform: translateX(-50%); /* Center by moving tooltip 50% of its width left */
212+ left: -8px; /* Half of the width of the icon */
213+ top: -35px;
214+ font-size: 0.8em;
215+ text-align: center;
216+ border-radius: 6px;
217+ padding: 5px 8px;
218+ margin: 5px;
219+ z-index: 1000;
220+}
221+.tooltipped .tooltiptext {
222+ visibility: visible;
223+}
224+
225+.chapter li.part-title {
226+ color: var(--sidebar-fg);
227+ margin: 5px 0px;
228+ font-weight: bold;
229+}
230+
231+.result-no-output {
232+ font-style: italic;
233+}
book/theme/css/print.cssnew file+54
@@ -0,0 +1,54 @@
1+
2+#sidebar,
3+#menu-bar,
4+.nav-chapters,
5+.mobile-nav-chapters {
6+ display: none;
7+}
8+
9+#page-wrapper.page-wrapper {
10+ transform: none;
11+ margin-left: 0px;
12+ overflow-y: initial;
13+}
14+
15+#content {
16+ max-width: none;
17+ margin: 0;
18+ padding: 0;
19+}
20+
21+.page {
22+ overflow-y: initial;
23+}
24+
25+code {
26+ background-color: #666666;
27+ border-radius: 5px;
28+
29+ /* Force background to be printed in Chrome */
30+ -webkit-print-color-adjust: exact;
31+}
32+
33+pre > .buttons {
34+ z-index: 2;
35+}
36+
37+a, a:visited, a:active, a:hover {
38+ color: #4183c4;
39+ text-decoration: none;
40+}
41+
42+h1, h2, h3, h4, h5, h6 {
43+ page-break-inside: avoid;
44+ page-break-after: avoid;
45+}
46+
47+pre, code {
48+ page-break-inside: avoid;
49+ white-space: pre-wrap;
50+}
51+
52+.fa {
53+ display: none !important;
54+}
book/theme/css/variables.cssnew file+411
@@ -0,0 +1,411 @@
1+
2+/* Globals */
3+
4+:root {
5+ --sidebar-width: 300px;
6+ --page-padding: 15px;
7+ --content-max-width: 750px;
8+ --menu-bar-height: 50px;
9+}
10+
11+/* Themes */
12+
13+.ayu {
14+ --bg: hsl(210, 25%, 8%);
15+ --fg: #c5c5c5;
16+
17+ --sidebar-bg: #14191f;
18+ --sidebar-fg: #c8c9db;
19+ --sidebar-non-existent: #5c6773;
20+ --sidebar-active: #ffb454;
21+ --sidebar-spacer: #2d334f;
22+
23+ --scrollbar: var(--sidebar-fg);
24+
25+ --icons: #737480;
26+ --icons-hover: #b7b9cc;
27+
28+ --links: #0096cf;
29+
30+ --inline-code-color: #ffb454;
31+
32+ --theme-popup-bg: #14191f;
33+ --theme-popup-border: #5c6773;
34+ --theme-hover: #191f26;
35+
36+ --quote-bg: hsl(226, 15%, 17%);
37+ --quote-border: hsl(226, 15%, 22%);
38+
39+ --table-border-color: hsl(210, 25%, 13%);
40+ --table-header-bg: hsl(210, 25%, 28%);
41+ --table-alternate-bg: hsl(210, 25%, 11%);
42+
43+ --searchbar-border-color: #848484;
44+ --searchbar-bg: #424242;
45+ --searchbar-fg: #fff;
46+ --searchbar-shadow-color: #d4c89f;
47+ --searchresults-header-fg: #666;
48+ --searchresults-border-color: #888;
49+ --searchresults-li-bg: #252932;
50+ --search-mark-bg: #e3b171;
51+ --hljs-background: #191f26;
52+ --hljs-color: #e6e1cf;
53+ --hljs-quote: #5c6773;
54+ --hljs-variable: #ff7733;
55+ --hljs-type: #ffee99;
56+ --hljs-title: #b8cc52;
57+ --hljs-symbol: #ffb454;
58+ --hljs-selector-tag: #ff7733;
59+ --hljs-selector-tag: #36a3d9;
60+ --hljs-selector-tag: #00568d;
61+ --hljs-selector-tag: #91b362;
62+ --hljs-selector-tag: #d96c75;
63+}
64+
65+.coal {
66+ --bg: hsl(200, 7%, 8%);
67+ --fg: #98a3ad;
68+
69+ --sidebar-bg: #292c2f;
70+ --sidebar-fg: #a1adb8;
71+ --sidebar-non-existent: #505254;
72+ --sidebar-active: #3473ad;
73+ --sidebar-spacer: #393939;
74+
75+ --scrollbar: var(--sidebar-fg);
76+
77+ --icons: #43484d;
78+ --icons-hover: #b3c0cc;
79+
80+ --links: #2b79a2;
81+
82+ --inline-code-color: #c5c8c6;
83+
84+ --theme-popup-bg: #141617;
85+ --theme-popup-border: #43484d;
86+ --theme-hover: #1f2124;
87+
88+ --quote-bg: hsl(234, 21%, 18%);
89+ --quote-border: hsl(234, 21%, 23%);
90+
91+ --table-border-color: hsl(200, 7%, 13%);
92+ --table-header-bg: hsl(200, 7%, 28%);
93+ --table-alternate-bg: hsl(200, 7%, 11%);
94+
95+ --searchbar-border-color: #aaa;
96+ --searchbar-bg: #b7b7b7;
97+ --searchbar-fg: #000;
98+ --searchbar-shadow-color: #aaa;
99+ --searchresults-header-fg: #666;
100+ --searchresults-border-color: #98a3ad;
101+ --searchresults-li-bg: #2b2b2f;
102+ --search-mark-bg: #355c7d;
103+ --hljs-background: #969896;
104+ --hljs-color: #cc6666;
105+ --hljs-quote: #de935f;
106+ --hljs-variable: #f0c674;
107+ --hljs-type: #b5bd68;
108+ --hljs-title: #8abeb7;
109+ --hljs-symbol: #81a2be;
110+ --hljs-selector-tag: #b294bb;
111+ --hljs-selector-tag: #1d1f21;
112+ --hljs-selector-tag: #c5c8c6;
113+ --hljs-selector-tag: #718c00;
114+ --hljs-selector-tag: #c82829;
115+}
116+
117+.light {
118+ --bg: hsl(0, 0%, 100%);
119+ --fg: hsl(0, 0%, 0%);
120+
121+ --sidebar-bg: #fafafa;
122+ --sidebar-fg: hsl(0, 0%, 0%);
123+ --sidebar-non-existent: #aaaaaa;
124+ --sidebar-active: #1f1fff;
125+ --sidebar-spacer: #f4f4f4;
126+
127+ --scrollbar: #8F8F8F;
128+
129+ --icons: #747474;
130+ --icons-hover: #000000;
131+
132+ --links: #20609f;
133+
134+ --inline-code-color: #301900;
135+
136+ --theme-popup-bg: #fafafa;
137+ --theme-popup-border: #cccccc;
138+ --theme-hover: #e6e6e6;
139+
140+ --quote-bg: hsl(197, 37%, 96%);
141+ --quote-border: hsl(197, 37%, 91%);
142+
143+ --table-border-color: hsl(0, 0%, 95%);
144+ --table-header-bg: hsl(0, 0%, 80%);
145+ --table-alternate-bg: hsl(0, 0%, 97%);
146+
147+ --searchbar-border-color: #aaa;
148+ --searchbar-bg: #fafafa;
149+ --searchbar-fg: #000;
150+ --searchbar-shadow-color: #aaa;
151+ --searchresults-header-fg: #666;
152+ --searchresults-border-color: #888;
153+ --searchresults-li-bg: #e4f2fe;
154+ --search-mark-bg: #a2cff5;
155+ --hljs-background: #f6f7f6;
156+ --hljs-color: #000;
157+ --hljs-quote: #575757;
158+ --hljs-variable: #d70025;
159+ --hljs-type: #b21e00;
160+ --hljs-title: #0030f2;
161+ --hljs-symbol: #008200;
162+ --hljs-selector-tag: #9d00ec;
163+}
164+
165+.navy {
166+ --bg: hsl(226, 23%, 11%);
167+ --fg: #bcbdd0;
168+
169+ --sidebar-bg: #282d3f;
170+ --sidebar-fg: #c8c9db;
171+ --sidebar-non-existent: #505274;
172+ --sidebar-active: #2b79a2;
173+ --sidebar-spacer: #2d334f;
174+
175+ --scrollbar: var(--sidebar-fg);
176+
177+ --icons: #737480;
178+ --icons-hover: #b7b9cc;
179+
180+ --links: #2b79a2;
181+
182+ --inline-code-color: #c5c8c6;
183+
184+ --theme-popup-bg: #161923;
185+ --theme-popup-border: #737480;
186+ --theme-hover: #282e40;
187+
188+ --quote-bg: hsl(226, 15%, 17%);
189+ --quote-border: hsl(226, 15%, 22%);
190+
191+ --table-border-color: hsl(226, 23%, 16%);
192+ --table-header-bg: hsl(226, 23%, 31%);
193+ --table-alternate-bg: hsl(226, 23%, 14%);
194+
195+ --searchbar-border-color: #aaa;
196+ --searchbar-bg: #aeaec6;
197+ --searchbar-fg: #000;
198+ --searchbar-shadow-color: #aaa;
199+ --searchresults-header-fg: #5f5f71;
200+ --searchresults-border-color: #5c5c68;
201+ --searchresults-li-bg: #242430;
202+ --search-mark-bg: #a2cff5;
203+
204+ --hljs-background: #969896;
205+ --hljs-color: #cc6666;
206+ --hljs-quote: #de935f;
207+ --hljs-variable: #f0c674;
208+ --hljs-type: #b5bd68;
209+ --hljs-title: #8abeb7;
210+ --hljs-symbol: #81a2be;
211+ --hljs-selector-tag: #b294bb;
212+ --hljs-selector-tag: #1d1f21;
213+ --hljs-selector-tag: #c5c8c6;
214+ --hljs-selector-tag: #718c00;
215+ --hljs-selector-tag: #c82829;
216+}
217+
218+.rust {
219+ --bg: hsl(60, 9%, 87%);
220+ --fg: #262625;
221+
222+ --sidebar-bg: #3b2e2a;
223+ --sidebar-fg: #c8c9db;
224+ --sidebar-non-existent: #505254;
225+ --sidebar-active: #e69f67;
226+ --sidebar-spacer: #45373a;
227+
228+ --scrollbar: var(--sidebar-fg);
229+
230+ --icons: #737480;
231+ --icons-hover: #262625;
232+
233+ --links: #2b79a2;
234+
235+ --inline-code-color: #6e6b5e;
236+
237+ --theme-popup-bg: #e1e1db;
238+ --theme-popup-border: #b38f6b;
239+ --theme-hover: #99908a;
240+
241+ --quote-bg: hsl(60, 5%, 75%);
242+ --quote-border: hsl(60, 5%, 70%);
243+
244+ --table-border-color: hsl(60, 9%, 82%);
245+ --table-header-bg: #b3a497;
246+ --table-alternate-bg: hsl(60, 9%, 84%);
247+
248+ --searchbar-border-color: #aaa;
249+ --searchbar-bg: #fafafa;
250+ --searchbar-fg: #000;
251+ --searchbar-shadow-color: #aaa;
252+ --searchresults-header-fg: #666;
253+ --searchresults-border-color: #888;
254+ --searchresults-li-bg: #dec2a2;
255+ --search-mark-bg: #e69f67;
256+ --hljs-background: #f6f7f6;
257+ --hljs-color: #000;
258+ --hljs-quote: #575757;
259+ --hljs-variable: #d70025;
260+ --hljs-type: #b21e00;
261+ --hljs-title: #0030f2;
262+ --hljs-symbol: #008200;
263+ --hljs-selector-tag: #9d00ec;
264+}
265+
266+@media (prefers-color-scheme: dark) {
267+ .light.no-js {
268+ --bg: hsl(200, 7%, 8%);
269+ --fg: #98a3ad;
270+
271+ --sidebar-bg: #292c2f;
272+ --sidebar-fg: #a1adb8;
273+ --sidebar-non-existent: #505254;
274+ --sidebar-active: #3473ad;
275+ --sidebar-spacer: #393939;
276+
277+ --scrollbar: var(--sidebar-fg);
278+
279+ --icons: #43484d;
280+ --icons-hover: #b3c0cc;
281+
282+ --links: #2b79a2;
283+
284+ --inline-code-color: #c5c8c6;
285+
286+ --theme-popup-bg: #141617;
287+ --theme-popup-border: #43484d;
288+ --theme-hover: #1f2124;
289+
290+ --quote-bg: hsl(234, 21%, 18%);
291+ --quote-border: hsl(234, 21%, 23%);
292+
293+ --table-border-color: hsl(200, 7%, 13%);
294+ --table-header-bg: hsl(200, 7%, 28%);
295+ --table-alternate-bg: hsl(200, 7%, 11%);
296+
297+ --searchbar-border-color: #aaa;
298+ --searchbar-bg: #b7b7b7;
299+ --searchbar-fg: #000;
300+ --searchbar-shadow-color: #aaa;
301+ --searchresults-header-fg: #666;
302+ --searchresults-border-color: #98a3ad;
303+ --searchresults-li-bg: #2b2b2f;
304+ --search-mark-bg: #355c7d;
305+ }
306+}
307+
308+.colibri {
309+ --bg: #3b224c;
310+ --fg: #bcbdd0;
311+ --heading-fg: #fff;
312+
313+ --sidebar-bg: #281733;
314+ --sidebar-fg: #c8c9db;
315+ --sidebar-non-existent: #505274;
316+ --sidebar-active: #a4a0e8;
317+ --sidebar-spacer: #2d334f;
318+
319+ --scrollbar: var(--sidebar-fg);
320+
321+ --icons: #737480;
322+ --icons-hover: #b7b9cc;
323+
324+ /* --links: #a4a0e8; */
325+ --links: #ECCDBA;
326+
327+ --inline-code-color: hsl(48.7, 7.8%, 70%);
328+
329+ --theme-popup-bg: #161923;
330+ --theme-popup-border: #737480;
331+ --theme-hover: rgba(0,0,0, .2);
332+
333+ --quote-bg: #281733;
334+ --quote-border: hsl(226, 15%, 22%);
335+
336+ --table-border-color: hsl(226, 23%, 76%);
337+ --table-header-bg: hsla(226, 23%, 31%, 0);
338+ --table-alternate-bg: hsl(226, 23%, 14%);
339+ --table-border-line: hsla(201deg, 20%, 92%, 0.2);
340+
341+ --searchbar-border-color: #aaa;
342+ --searchbar-bg: #aeaec6;
343+ --searchbar-fg: #000;
344+ --searchbar-shadow-color: #aaa;
345+ --searchresults-header-fg: #5f5f71;
346+ --searchresults-border-color: #5c5c68;
347+ --searchresults-li-bg: #242430;
348+ --search-mark-bg: #acff5;
349+ --hljs-background: #2f1e2e;
350+ --hljs-color: #a39e9b;
351+ --hljs-quote: #8d8687;
352+ --hljs-variable: #ef6155;
353+ --hljs-type: #f99b15;
354+ --hljs-title: #fec418;
355+ --hljs-symbol: #48b685;
356+ --hljs-selector-tag: #815ba4;
357+}
358+
359+.colibri {
360+/*
361+ --bg: #ffffff;
362+ --fg: #452859;
363+ --fg: #5a5977;
364+ --heading-fg: #281733;
365+
366+ --sidebar-bg: #281733;
367+ --sidebar-fg: #c8c9db;
368+ --sidebar-non-existent: #505274;
369+ --sidebar-active: #a4a0e8;
370+ --sidebar-spacer: #2d334f;
371+
372+ --scrollbar: var(--sidebar-fg);
373+
374+ --icons: #737480;
375+ --icons-hover: #b7b9cc;
376+
377+ --links: #6F44F0;
378+
379+ --inline-code-color: #a39e9b;
380+
381+ --theme-popup-bg: #161923;
382+ --theme-popup-border: #737480;
383+ --theme-hover: rgba(0,0,0, .2);
384+
385+ --quote-bg: rgba(0, 0, 0, 0);
386+ --quote-border: hsl(226, 15%, 75%);
387+
388+ --table-border-color: #5a5977;
389+ --table-border-color: hsl(201deg 10% 67%);
390+ --table-header-bg: hsl(0, 0%, 100%);
391+ --table-alternate-bg: hsl(0, 0%, 97%);
392+ --table-border-line: hsl(201deg, 20%, 92%);
393+
394+ --searchbar-border-color: #aaa;
395+ --searchbar-bg: #aeaec6;
396+ --searchbar-fg: #000;
397+ --searchbar-shadow-color: #aaa;
398+ --searchresults-header-fg: #5f5f71;
399+ --searchresults-border-color: #5c5c68;
400+ --searchresults-li-bg: #242430;
401+ --search-mark-bg: #a2cff5;
402+ --hljs-background: #TODO;
403+ --hljs-color: #TODO;
404+ --hljs-quote: #TODO;
405+ --hljs-variable: #TODO;
406+ --hljs-type: #TODO;
407+ --hljs-title: #TODO;
408+ --hljs-symbol: #TODO;
409+ --hljs-selector-tag: #TODO;
410+*/
411+}
book/theme/highlight.cssnew file+56
@@ -0,0 +1,56 @@
1+pre code.hljs {
2+ display:block;
3+ overflow-x:auto;
4+ padding:1em
5+}
6+code.hljs {
7+ padding:3px 5px
8+}
9+.hljs {
10+ background: var(--hljs-background);
11+ color: var(--hljs-color);
12+}
13+.hljs-comment,
14+.hljs-quote {
15+ color: var(--hljs-quote)
16+}
17+.hljs-link,
18+.hljs-meta,
19+.hljs-name,
20+.hljs-regexp,
21+.hljs-selector-class,
22+.hljs-selector-id,
23+.hljs-tag,
24+.hljs-template-variable,
25+.hljs-variable {
26+ color: var(--hljs-variable)
27+}
28+.hljs-built_in,
29+.hljs-deletion,
30+.hljs-literal,
31+.hljs-number,
32+.hljs-params,
33+.hljs-type {
34+ color: var(--hljs-type)
35+}
36+.hljs-attribute,
37+.hljs-section,
38+.hljs-title {
39+ color: var(--hljs-title)
40+}
41+.hljs-addition,
42+.hljs-bullet,
43+.hljs-string,
44+.hljs-symbol {
45+ color: var(--hljs-symbol)
46+}
47+.hljs-keyword,
48+.hljs-selector-tag {
49+ color: var(--hljs-selector-tag)
50+}
51+.hljs-emphasis {
52+ font-style:italic
53+}
54+.hljs-strong {
55+ font-weight:700
56+}
book/theme/highlight.jsnew file+6
@@ -0,0 +1,6 @@
1+/*
2+ Highlight.js 10.1.1 (93fd0d73)
3+ License: BSD-3-Clause
4+ Copyright (c) 2006-2020, Ivan Sagalaev
5+*/
6+var hljs=function(){"use strict";function e(n){Object.freeze(n);var t="function"==typeof n;return Object.getOwnPropertyNames(n).forEach((function(r){!Object.hasOwnProperty.call(n,r)||null===n[r]||"object"!=typeof n[r]&&"function"!=typeof n[r]||t&&("caller"===r||"callee"===r||"arguments"===r)||Object.isFrozen(n[r])||e(n[r])})),n}class n{constructor(e){void 0===e.data&&(e.data={}),this.data=e.data}ignoreMatch(){this.ignore=!0}}function t(e){return e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#x27;")}function r(e,...n){var t={};for(const n in e)t[n]=e[n];return n.forEach((function(e){for(const n in e)t[n]=e[n]})),t}function a(e){return e.nodeName.toLowerCase()}var i=Object.freeze({__proto__:null,escapeHTML:t,inherit:r,nodeStream:function(e){var n=[];return function e(t,r){for(var i=t.firstChild;i;i=i.nextSibling)3===i.nodeType?r+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:r,node:i}),r=e(i,r),a(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:r,node:i}));return r}(e,0),n},mergeStreams:function(e,n,r){var i=0,s="",o=[];function l(){return e.length&&n.length?e[0].offset!==n[0].offset?e[0].offset<n[0].offset?e:n:"start"===n[0].event?e:n:e.length?e:n}function c(e){s+="<"+a(e)+[].map.call(e.attributes,(function(e){return" "+e.nodeName+'="'+t(e.value)+'"'})).join("")+">"}function u(e){s+="</"+a(e)+">"}function d(e){("start"===e.event?c:u)(e.node)}for(;e.length||n.length;){var g=l();if(s+=t(r.substring(i,g[0].offset)),i=g[0].offset,g===e){o.reverse().forEach(u);do{d(g.splice(0,1)[0]),g=l()}while(g===e&&g.length&&g[0].offset===i);o.reverse().forEach(c)}else"start"===g[0].event?o.push(g[0].node):o.pop(),d(g.splice(0,1)[0])}return s+t(r.substr(i))}});const s="</span>",o=e=>!!e.kind;class l{constructor(e,n){this.buffer="",this.classPrefix=n.classPrefix,e.walk(this)}addText(e){this.buffer+=t(e)}openNode(e){if(!o(e))return;let n=e.kind;e.sublanguage||(n=`${this.classPrefix}${n}`),this.span(n)}closeNode(e){o(e)&&(this.buffer+=s)}value(){return this.buffer}span(e){this.buffer+=`<span class="${e}">`}}class c{constructor(){this.rootNode={children:[]},this.stack=[this.rootNode]}get top(){return this.stack[this.stack.length-1]}get root(){return this.rootNode}add(e){this.top.children.push(e)}openNode(e){const n={kind:e,children:[]};this.add(n),this.stack.push(n)}closeNode(){if(this.stack.length>1)return this.stack.pop()}closeAllNodes(){for(;this.closeNode(););}toJSON(){return JSON.stringify(this.rootNode,null,4)}walk(e){return this.constructor._walk(e,this.rootNode)}static _walk(e,n){return"string"==typeof n?e.addText(n):n.children&&(e.openNode(n),n.children.forEach(n=>this._walk(e,n)),e.closeNode(n)),e}static _collapse(e){"string"!=typeof e&&e.children&&(e.children.every(e=>"string"==typeof e)?e.children=[e.children.join("")]:e.children.forEach(e=>{c._collapse(e)}))}}class u extends c{constructor(e){super(),this.options=e}addKeyword(e,n){""!==e&&(this.openNode(n),this.addText(e),this.closeNode())}addText(e){""!==e&&this.add(e)}addSublanguage(e,n){const t=e.root;t.kind=n,t.sublanguage=!0,this.add(t)}toHTML(){return new l(this,this.options).value()}finalize(){return!0}}function d(e){return e?"string"==typeof e?e:e.source:null}const g="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",h={begin:"\\\\[\\s\\S]",relevance:0},f={className:"string",begin:"'",end:"'",illegal:"\\n",contains:[h]},p={className:"string",begin:'"',end:'"',illegal:"\\n",contains:[h]},b={begin:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/},m=function(e,n,t={}){var a=r({className:"comment",begin:e,end:n,contains:[]},t);return a.contains.push(b),a.contains.push({className:"doctag",begin:"(?:TODO|FIXME|NOTE|BUG|OPTIMIZE|HACK|XXX):",relevance:0}),a},v=m("//","$"),x=m("/\\*","\\*/"),E=m("#","$");var _=Object.freeze({__proto__:null,IDENT_RE:"[a-zA-Z]\\w*",UNDERSCORE_IDENT_RE:"[a-zA-Z_]\\w*",NUMBER_RE:"\\b\\d+(\\.\\d+)?",C_NUMBER_RE:g,BINARY_NUMBER_RE:"\\b(0b[01]+)",RE_STARTERS_RE:"!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",SHEBANG:(e={})=>{const n=/^#![ ]*\//;return e.binary&&(e.begin=function(...e){return e.map(e=>d(e)).join("")}(n,/.*\b/,e.binary,/\b.*/)),r({className:"meta",begin:n,end:/$/,relevance:0,"on:begin":(e,n)=>{0!==e.index&&n.ignoreMatch()}},e)},BACKSLASH_ESCAPE:h,APOS_STRING_MODE:f,QUOTE_STRING_MODE:p,PHRASAL_WORDS_MODE:b,COMMENT:m,C_LINE_COMMENT_MODE:v,C_BLOCK_COMMENT_MODE:x,HASH_COMMENT_MODE:E,NUMBER_MODE:{className:"number",begin:"\\b\\d+(\\.\\d+)?",relevance:0},C_NUMBER_MODE:{className:"number",begin:g,relevance:0},BINARY_NUMBER_MODE:{className:"number",begin:"\\b(0b[01]+)",relevance:0},CSS_NUMBER_MODE:{className:"number",begin:"\\b\\d+(\\.\\d+)?(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",relevance:0},REGEXP_MODE:{begin:/(?=\/[^/\n]*\/)/,contains:[{className:"regexp",begin:/\//,end:/\/[gimuy]*/,illegal:/\n/,contains:[h,{begin:/\[/,end:/\]/,relevance:0,contains:[h]}]}]},TITLE_MODE:{className:"title",begin:"[a-zA-Z]\\w*",relevance:0},UNDERSCORE_TITLE_MODE:{className:"title",begin:"[a-zA-Z_]\\w*",relevance:0},METHOD_GUARD:{begin:"\\.\\s*[a-zA-Z_]\\w*",relevance:0},END_SAME_AS_BEGIN:function(e){return Object.assign(e,{"on:begin":(e,n)=>{n.data._beginMatch=e[1]},"on:end":(e,n)=>{n.data._beginMatch!==e[1]&&n.ignoreMatch()}})}}),N="of and for in not or if then".split(" ");function w(e,n){return n?+n:function(e){return N.includes(e.toLowerCase())}(e)?0:1}const R=t,y=r,{nodeStream:k,mergeStreams:O}=i,M=Symbol("nomatch");return function(t){var a=[],i={},s={},o=[],l=!0,c=/(^(<[^>]+>|\t|)+|\n)/gm,g="Could not find the language '{}', did you forget to load/include a language module?";const h={disableAutodetect:!0,name:"Plain text",contains:[]};var f={noHighlightRe:/^(no-?highlight)$/i,languageDetectRe:/\blang(?:uage)?-([\w-]+)\b/i,classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:null,__emitter:u};function p(e){return f.noHighlightRe.test(e)}function b(e,n,t,r){var a={code:n,language:e};S("before:highlight",a);var i=a.result?a.result:m(a.language,a.code,t,r);return i.code=a.code,S("after:highlight",i),i}function m(e,t,a,s){var o=t;function c(e,n){var t=E.case_insensitive?n[0].toLowerCase():n[0];return Object.prototype.hasOwnProperty.call(e.keywords,t)&&e.keywords[t]}function u(){null!=y.subLanguage?function(){if(""!==A){var e=null;if("string"==typeof y.subLanguage){if(!i[y.subLanguage])return void O.addText(A);e=m(y.subLanguage,A,!0,k[y.subLanguage]),k[y.subLanguage]=e.top}else e=v(A,y.subLanguage.length?y.subLanguage:null);y.relevance>0&&(I+=e.relevance),O.addSublanguage(e.emitter,e.language)}}():function(){if(!y.keywords)return void O.addText(A);let e=0;y.keywordPatternRe.lastIndex=0;let n=y.keywordPatternRe.exec(A),t="";for(;n;){t+=A.substring(e,n.index);const r=c(y,n);if(r){const[e,a]=r;O.addText(t),t="",I+=a,O.addKeyword(n[0],e)}else t+=n[0];e=y.keywordPatternRe.lastIndex,n=y.keywordPatternRe.exec(A)}t+=A.substr(e),O.addText(t)}(),A=""}function h(e){return e.className&&O.openNode(e.className),y=Object.create(e,{parent:{value:y}})}function p(e){return 0===y.matcher.regexIndex?(A+=e[0],1):(L=!0,0)}var b={};function x(t,r){var i=r&&r[0];if(A+=t,null==i)return u(),0;if("begin"===b.type&&"end"===r.type&&b.index===r.index&&""===i){if(A+=o.slice(r.index,r.index+1),!l){const n=Error("0 width match regex");throw n.languageName=e,n.badRule=b.rule,n}return 1}if(b=r,"begin"===r.type)return function(e){var t=e[0],r=e.rule;const a=new n(r),i=[r.__beforeBegin,r["on:begin"]];for(const n of i)if(n&&(n(e,a),a.ignore))return p(t);return r&&r.endSameAsBegin&&(r.endRe=RegExp(t.replace(/[-/\\^$*+?.()|[\]{}]/g,"\\$&"),"m")),r.skip?A+=t:(r.excludeBegin&&(A+=t),u(),r.returnBegin||r.excludeBegin||(A=t)),h(r),r.returnBegin?0:t.length}(r);if("illegal"===r.type&&!a){const e=Error('Illegal lexeme "'+i+'" for mode "'+(y.className||"<unnamed>")+'"');throw e.mode=y,e}if("end"===r.type){var s=function(e){var t=e[0],r=o.substr(e.index),a=function e(t,r,a){let i=function(e,n){var t=e&&e.exec(n);return t&&0===t.index}(t.endRe,a);if(i){if(t["on:end"]){const e=new n(t);t["on:end"](r,e),e.ignore&&(i=!1)}if(i){for(;t.endsParent&&t.parent;)t=t.parent;return t}}if(t.endsWithParent)return e(t.parent,r,a)}(y,e,r);if(!a)return M;var i=y;i.skip?A+=t:(i.returnEnd||i.excludeEnd||(A+=t),u(),i.excludeEnd&&(A=t));do{y.className&&O.closeNode(),y.skip||y.subLanguage||(I+=y.relevance),y=y.parent}while(y!==a.parent);return a.starts&&(a.endSameAsBegin&&(a.starts.endRe=a.endRe),h(a.starts)),i.returnEnd?0:t.length}(r);if(s!==M)return s}if("illegal"===r.type&&""===i)return 1;if(B>1e5&&B>3*r.index)throw Error("potential infinite loop, way more iterations than matches");return A+=i,i.length}var E=T(e);if(!E)throw console.error(g.replace("{}",e)),Error('Unknown language: "'+e+'"');var _=function(e){function n(n,t){return RegExp(d(n),"m"+(e.case_insensitive?"i":"")+(t?"g":""))}class t{constructor(){this.matchIndexes={},this.regexes=[],this.matchAt=1,this.position=0}addRule(e,n){n.position=this.position++,this.matchIndexes[this.matchAt]=n,this.regexes.push([n,e]),this.matchAt+=function(e){return RegExp(e.toString()+"|").exec("").length-1}(e)+1}compile(){0===this.regexes.length&&(this.exec=()=>null);const e=this.regexes.map(e=>e[1]);this.matcherRe=n(function(e,n="|"){for(var t=/\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./,r=0,a="",i=0;i<e.length;i++){var s=r+=1,o=d(e[i]);for(i>0&&(a+=n),a+="(";o.length>0;){var l=t.exec(o);if(null==l){a+=o;break}a+=o.substring(0,l.index),o=o.substring(l.index+l[0].length),"\\"===l[0][0]&&l[1]?a+="\\"+(+l[1]+s):(a+=l[0],"("===l[0]&&r++)}a+=")"}return a}(e),!0),this.lastIndex=0}exec(e){this.matcherRe.lastIndex=this.lastIndex;const n=this.matcherRe.exec(e);if(!n)return null;const t=n.findIndex((e,n)=>n>0&&void 0!==e),r=this.matchIndexes[t];return n.splice(0,t),Object.assign(n,r)}}class a{constructor(){this.rules=[],this.multiRegexes=[],this.count=0,this.lastIndex=0,this.regexIndex=0}getMatcher(e){if(this.multiRegexes[e])return this.multiRegexes[e];const n=new t;return this.rules.slice(e).forEach(([e,t])=>n.addRule(e,t)),n.compile(),this.multiRegexes[e]=n,n}considerAll(){this.regexIndex=0}addRule(e,n){this.rules.push([e,n]),"begin"===n.type&&this.count++}exec(e){const n=this.getMatcher(this.regexIndex);n.lastIndex=this.lastIndex;const t=n.exec(e);return t&&(this.regexIndex+=t.position+1,this.regexIndex===this.count&&(this.regexIndex=0)),t}}function i(e,n){const t=e.input[e.index-1],r=e.input[e.index+e[0].length];"."!==t&&"."!==r||n.ignoreMatch()}if(e.contains&&e.contains.includes("self"))throw Error("ERR: contains `self` is not supported at the top-level of a language. See documentation.");return function t(s,o){const l=s;if(s.compiled)return l;s.compiled=!0,s.__beforeBegin=null,s.keywords=s.keywords||s.beginKeywords;let c=null;if("object"==typeof s.keywords&&(c=s.keywords.$pattern,delete s.keywords.$pattern),s.keywords&&(s.keywords=function(e,n){var t={};return"string"==typeof e?r("keyword",e):Object.keys(e).forEach((function(n){r(n,e[n])})),t;function r(e,r){n&&(r=r.toLowerCase()),r.split(" ").forEach((function(n){var r=n.split("|");t[r[0]]=[e,w(r[0],r[1])]}))}}(s.keywords,e.case_insensitive)),s.lexemes&&c)throw Error("ERR: Prefer `keywords.$pattern` to `mode.lexemes`, BOTH are not allowed. (see mode reference) ");return l.keywordPatternRe=n(s.lexemes||c||/\w+/,!0),o&&(s.beginKeywords&&(s.begin="\\b("+s.beginKeywords.split(" ").join("|")+")(?=\\b|\\s)",s.__beforeBegin=i),s.begin||(s.begin=/\B|\b/),l.beginRe=n(s.begin),s.endSameAsBegin&&(s.end=s.begin),s.end||s.endsWithParent||(s.end=/\B|\b/),s.end&&(l.endRe=n(s.end)),l.terminator_end=d(s.end)||"",s.endsWithParent&&o.terminator_end&&(l.terminator_end+=(s.end?"|":"")+o.terminator_end)),s.illegal&&(l.illegalRe=n(s.illegal)),void 0===s.relevance&&(s.relevance=1),s.contains||(s.contains=[]),s.contains=[].concat(...s.contains.map((function(e){return function(e){return e.variants&&!e.cached_variants&&(e.cached_variants=e.variants.map((function(n){return r(e,{variants:null},n)}))),e.cached_variants?e.cached_variants:function e(n){return!!n&&(n.endsWithParent||e(n.starts))}(e)?r(e,{starts:e.starts?r(e.starts):null}):Object.isFrozen(e)?r(e):e}("self"===e?s:e)}))),s.contains.forEach((function(e){t(e,l)})),s.starts&&t(s.starts,o),l.matcher=function(e){const n=new a;return e.contains.forEach(e=>n.addRule(e.begin,{rule:e,type:"begin"})),e.terminator_end&&n.addRule(e.terminator_end,{type:"end"}),e.illegal&&n.addRule(e.illegal,{type:"illegal"}),n}(l),l}(e)}(E),N="",y=s||_,k={},O=new f.__emitter(f);!function(){for(var e=[],n=y;n!==E;n=n.parent)n.className&&e.unshift(n.className);e.forEach(e=>O.openNode(e))}();var A="",I=0,S=0,B=0,L=!1;try{for(y.matcher.considerAll();;){B++,L?L=!1:(y.matcher.lastIndex=S,y.matcher.considerAll());const e=y.matcher.exec(o);if(!e)break;const n=x(o.substring(S,e.index),e);S=e.index+n}return x(o.substr(S)),O.closeAllNodes(),O.finalize(),N=O.toHTML(),{relevance:I,value:N,language:e,illegal:!1,emitter:O,top:y}}catch(n){if(n.message&&n.message.includes("Illegal"))return{illegal:!0,illegalBy:{msg:n.message,context:o.slice(S-100,S+100),mode:n.mode},sofar:N,relevance:0,value:R(o),emitter:O};if(l)return{illegal:!1,relevance:0,value:R(o),emitter:O,language:e,top:y,errorRaised:n};throw n}}function v(e,n){n=n||f.languages||Object.keys(i);var t=function(e){const n={relevance:0,emitter:new f.__emitter(f),value:R(e),illegal:!1,top:h};return n.emitter.addText(e),n}(e),r=t;return n.filter(T).filter(I).forEach((function(n){var a=m(n,e,!1);a.language=n,a.relevance>r.relevance&&(r=a),a.relevance>t.relevance&&(r=t,t=a)})),r.language&&(t.second_best=r),t}function x(e){return f.tabReplace||f.useBR?e.replace(c,e=>"\n"===e?f.useBR?"<br>":e:f.tabReplace?e.replace(/\t/g,f.tabReplace):e):e}function E(e){let n=null;const t=function(e){var n=e.className+" ";n+=e.parentNode?e.parentNode.className:"";const t=f.languageDetectRe.exec(n);if(t){var r=T(t[1]);return r||(console.warn(g.replace("{}",t[1])),console.warn("Falling back to no-highlight mode for this block.",e)),r?t[1]:"no-highlight"}return n.split(/\s+/).find(e=>p(e)||T(e))}(e);if(p(t))return;S("before:highlightBlock",{block:e,language:t}),f.useBR?(n=document.createElement("div")).innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ /]*>/g,"\n"):n=e;const r=n.textContent,a=t?b(t,r,!0):v(r),i=k(n);if(i.length){const e=document.createElement("div");e.innerHTML=a.value,a.value=O(i,k(e),r)}a.value=x(a.value),S("after:highlightBlock",{block:e,result:a}),e.innerHTML=a.value,e.className=function(e,n,t){var r=n?s[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),e.includes(r)||a.push(r),a.join(" ").trim()}(e.className,t,a.language),e.result={language:a.language,re:a.relevance,relavance:a.relevance},a.second_best&&(e.second_best={language:a.second_best.language,re:a.second_best.relevance,relavance:a.second_best.relevance})}const N=()=>{if(!N.called){N.called=!0;var e=document.querySelectorAll("pre code");a.forEach.call(e,E)}};function T(e){return e=(e||"").toLowerCase(),i[e]||i[s[e]]}function A(e,{languageName:n}){"string"==typeof e&&(e=[e]),e.forEach(e=>{s[e]=n})}function I(e){var n=T(e);return n&&!n.disableAutodetect}function S(e,n){var t=e;o.forEach((function(e){e[t]&&e[t](n)}))}Object.assign(t,{highlight:b,highlightAuto:v,fixMarkup:x,highlightBlock:E,configure:function(e){f=y(f,e)},initHighlighting:N,initHighlightingOnLoad:function(){window.addEventListener("DOMContentLoaded",N,!1)},registerLanguage:function(e,n){var r=null;try{r=n(t)}catch(n){if(console.error("Language definition for '{}' could not be registered.".replace("{}",e)),!l)throw n;console.error(n),r=h}r.name||(r.name=e),i[e]=r,r.rawDefinition=n.bind(null,t),r.aliases&&A(r.aliases,{languageName:e})},listLanguages:function(){return Object.keys(i)},getLanguage:T,registerAliases:A,requireLanguage:function(e){var n=T(e);if(n)return n;throw Error("The '{}' language is required, but not loaded.".replace("{}",e))},autoDetection:I,inherit:y,addPlugin:function(e){o.push(e)}}),t.debugMode=function(){l=!1},t.safeMode=function(){l=!0},t.versionString="10.1.1";for(const n in _)"object"==typeof _[n]&&e(_[n]);return Object.assign(t,_),t}({})}();"object"==typeof exports&&"undefined"!=typeof module&&(module.exports=hljs);hljs.registerLanguage("php",function(){"use strict";return function(e){var r={begin:"\\$+[a-zA-Z_-ÿ][a-zA-Z0-9_-ÿ]*"},t={className:"meta",variants:[{begin:/<\?php/,relevance:10},{begin:/<\?[=]?/},{begin:/\?>/}]},a={className:"string",contains:[e.BACKSLASH_ESCAPE,t],variants:[{begin:'b"',end:'"'},{begin:"b'",end:"'"},e.inherit(e.APOS_STRING_MODE,{illegal:null}),e.inherit(e.QUOTE_STRING_MODE,{illegal:null})]},n={variants:[e.BINARY_NUMBER_MODE,e.C_NUMBER_MODE]},i={keyword:"__CLASS__ __DIR__ __FILE__ __FUNCTION__ __LINE__ __METHOD__ __NAMESPACE__ __TRAIT__ die echo exit include include_once print require require_once array abstract and as binary bool boolean break callable case catch class clone const continue declare default do double else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval extends final finally float for foreach from global goto if implements instanceof insteadof int integer interface isset iterable list new object or private protected public real return string switch throw trait try unset use var void while xor yield",literal:"false null true",built_in:"Error|0 AppendIterator ArgumentCountError ArithmeticError ArrayIterator ArrayObject AssertionError BadFunctionCallException BadMethodCallException CachingIterator CallbackFilterIterator CompileError Countable DirectoryIterator DivisionByZeroError DomainException EmptyIterator ErrorException Exception FilesystemIterator FilterIterator GlobIterator InfiniteIterator InvalidArgumentException IteratorIterator LengthException LimitIterator LogicException MultipleIterator NoRewindIterator OutOfBoundsException OutOfRangeException OuterIterator OverflowException ParentIterator ParseError RangeException RecursiveArrayIterator RecursiveCachingIterator RecursiveCallbackFilterIterator RecursiveDirectoryIterator RecursiveFilterIterator RecursiveIterator RecursiveIteratorIterator RecursiveRegexIterator RecursiveTreeIterator RegexIterator RuntimeException SeekableIterator SplDoublyLinkedList SplFileInfo SplFileObject SplFixedArray SplHeap SplMaxHeap SplMinHeap SplObjectStorage SplObserver SplObserver SplPriorityQueue SplQueue SplStack SplSubject SplSubject SplTempFileObject TypeError UnderflowException UnexpectedValueException ArrayAccess Closure Generator Iterator IteratorAggregate Serializable Throwable Traversable WeakReference Directory __PHP_Incomplete_Class parent php_user_filter self static stdClass"};return{aliases:["php","php3","php4","php5","php6","php7"],case_insensitive:!0,keywords:i,contains:[e.HASH_COMMENT_MODE,e.COMMENT("//","$",{contains:[t]}),e.COMMENT("/\\*","\\*/",{contains:[{className:"doctag",begin:"@[A-Za-z]+"}]}),e.COMMENT("__halt_compiler.+?;",!1,{endsWithParent:!0,keywords:"__halt_compiler"}),{className:"string",begin:/<<<['"]?\w+['"]?$/,end:/^\w+;?$/,contains:[e.BACKSLASH_ESCAPE,{className:"subst",variants:[{begin:/\$\w+/},{begin:/\{\$/,end:/\}/}]}]},t,{className:"keyword",begin:/\$this\b/},r,{begin:/(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/},{className:"function",beginKeywords:"fn function",end:/[;{]/,excludeEnd:!0,illegal:"[$%\\[]",contains:[e.UNDERSCORE_TITLE_MODE,{className:"params",begin:"\\(",end:"\\)",excludeBegin:!0,excludeEnd:!0,keywords:i,contains:["self",r,e.C_BLOCK_COMMENT_MODE,a,n]}]},{className:"class",beginKeywords:"class interface",end:"{",excludeEnd:!0,illegal:/[:\(\$"]/,contains:[{beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"namespace",end:";",illegal:/[\.']/,contains:[e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"use",end:";",contains:[e.UNDERSCORE_TITLE_MODE]},{begin:"=>"},a,n]}}}());hljs.registerLanguage("nginx",function(){"use strict";return function(e){var n={className:"variable",variants:[{begin:/\$\d+/},{begin:/\$\{/,end:/}/},{begin:"[\\$\\@]"+e.UNDERSCORE_IDENT_RE}]},a={endsWithParent:!0,keywords:{$pattern:"[a-z/_]+",literal:"on off yes no true false none blocked debug info notice warn error crit select break last permanent redirect kqueue rtsig epoll poll /dev/poll"},relevance:0,illegal:"=>",contains:[e.HASH_COMMENT_MODE,{className:"string",contains:[e.BACKSLASH_ESCAPE,n],variants:[{begin:/"/,end:/"/},{begin:/'/,end:/'/}]},{begin:"([a-z]+):/",end:"\\s",endsWithParent:!0,excludeEnd:!0,contains:[n]},{className:"regexp",contains:[e.BACKSLASH_ESCAPE,n],variants:[{begin:"\\s\\^",end:"\\s|{|;",returnEnd:!0},{begin:"~\\*?\\s+",end:"\\s|{|;",returnEnd:!0},{begin:"\\*(\\.[a-z\\-]+)+"},{begin:"([a-z\\-]+\\.)+\\*"}]},{className:"number",begin:"\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?\\b"},{className:"number",begin:"\\b\\d+[kKmMgGdshdwy]*\\b",relevance:0},n]};return{name:"Nginx config",aliases:["nginxconf"],contains:[e.HASH_COMMENT_MODE,{begin:e.UNDERSCORE_IDENT_RE+"\\s+{",returnBegin:!0,end:"{",contains:[{className:"section",begin:e.UNDERSCORE_IDENT_RE}],relevance:0},{begin:e.UNDERSCORE_IDENT_RE+"\\s",end:";|{",returnBegin:!0,contains:[{className:"attribute",begin:e.UNDERSCORE_IDENT_RE,starts:a}],relevance:0}],illegal:"[^\\s\\}]"}}}());hljs.registerLanguage("csharp",function(){"use strict";return function(e){var n={keyword:"abstract as base bool break byte case catch char checked const continue decimal default delegate do double enum event explicit extern finally fixed float for foreach goto if implicit in int interface internal is lock long object operator out override params private protected public readonly ref sbyte sealed short sizeof stackalloc static string struct switch this try typeof uint ulong unchecked unsafe ushort using virtual void volatile while add alias ascending async await by descending dynamic equals from get global group into join let nameof on orderby partial remove select set value var when where yield",literal:"null false true"},i=e.inherit(e.TITLE_MODE,{begin:"[a-zA-Z](\\.?\\w)*"}),a={className:"number",variants:[{begin:"\\b(0b[01']+)"},{begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"},{begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"}],relevance:0},s={className:"string",begin:'@"',end:'"',contains:[{begin:'""'}]},t=e.inherit(s,{illegal:/\n/}),l={className:"subst",begin:"{",end:"}",keywords:n},r=e.inherit(l,{illegal:/\n/}),c={className:"string",begin:/\$"/,end:'"',illegal:/\n/,contains:[{begin:"{{"},{begin:"}}"},e.BACKSLASH_ESCAPE,r]},o={className:"string",begin:/\$@"/,end:'"',contains:[{begin:"{{"},{begin:"}}"},{begin:'""'},l]},g=e.inherit(o,{illegal:/\n/,contains:[{begin:"{{"},{begin:"}}"},{begin:'""'},r]});l.contains=[o,c,s,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,a,e.C_BLOCK_COMMENT_MODE],r.contains=[g,c,t,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,a,e.inherit(e.C_BLOCK_COMMENT_MODE,{illegal:/\n/})];var d={variants:[o,c,s,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},E={begin:"<",end:">",contains:[{beginKeywords:"in out"},i]},_=e.IDENT_RE+"(<"+e.IDENT_RE+"(\\s*,\\s*"+e.IDENT_RE+")*>)?(\\[\\])?",b={begin:"@"+e.IDENT_RE,relevance:0};return{name:"C#",aliases:["cs","c#"],keywords:n,illegal:/::/,contains:[e.COMMENT("///","$",{returnBegin:!0,contains:[{className:"doctag",variants:[{begin:"///",relevance:0},{begin:"\x3c!--|--\x3e"},{begin:"</?",end:">"}]}]}),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"meta",begin:"#",end:"$",keywords:{"meta-keyword":"if else elif endif define undef warning error line region endregion pragma checksum"}},d,a,{beginKeywords:"class interface",end:/[{;=]/,illegal:/[^\s:,]/,contains:[{beginKeywords:"where class"},i,E,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{beginKeywords:"namespace",end:/[{;=]/,illegal:/[^\s:]/,contains:[i,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{className:"meta",begin:"^\\s*\\[",excludeBegin:!0,end:"\\]",excludeEnd:!0,contains:[{className:"meta-string",begin:/"/,end:/"/}]},{beginKeywords:"new return throw await else",relevance:0},{className:"function",begin:"("+_+"\\s+)+"+e.IDENT_RE+"\\s*(\\<.+\\>)?\\s*\\(",returnBegin:!0,end:/\s*[{;=]/,excludeEnd:!0,keywords:n,contains:[{begin:e.IDENT_RE+"\\s*(\\<.+\\>)?\\s*\\(",returnBegin:!0,contains:[e.TITLE_MODE,E],relevance:0},{className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:n,relevance:0,contains:[d,a,e.C_BLOCK_COMMENT_MODE]},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},b]}}}());hljs.registerLanguage("perl",function(){"use strict";return function(e){var n={$pattern:/[\w.]+/,keyword:"getpwent getservent quotemeta msgrcv scalar kill dbmclose undef lc ma syswrite tr send umask sysopen shmwrite vec qx utime local oct semctl localtime readpipe do return format read sprintf dbmopen pop getpgrp not getpwnam rewinddir qq fileno qw endprotoent wait sethostent bless s|0 opendir continue each sleep endgrent shutdown dump chomp connect getsockname die socketpair close flock exists index shmget sub for endpwent redo lstat msgctl setpgrp abs exit select print ref gethostbyaddr unshift fcntl syscall goto getnetbyaddr join gmtime symlink semget splice x|0 getpeername recv log setsockopt cos last reverse gethostbyname getgrnam study formline endhostent times chop length gethostent getnetent pack getprotoent getservbyname rand mkdir pos chmod y|0 substr endnetent printf next open msgsnd readdir use unlink getsockopt getpriority rindex wantarray hex system getservbyport endservent int chr untie rmdir prototype tell listen fork shmread ucfirst setprotoent else sysseek link getgrgid shmctl waitpid unpack getnetbyname reset chdir grep split require caller lcfirst until warn while values shift telldir getpwuid my getprotobynumber delete and sort uc defined srand accept package seekdir getprotobyname semop our rename seek if q|0 chroot sysread setpwent no crypt getc chown sqrt write setnetent setpriority foreach tie sin msgget map stat getlogin unless elsif truncate exec keys glob tied closedir ioctl socket readlink eval xor readline binmode setservent eof ord bind alarm pipe atan2 getgrent exp time push setgrent gt lt or ne m|0 break given say state when"},t={className:"subst",begin:"[$@]\\{",end:"\\}",keywords:n},s={begin:"->{",end:"}"},r={variants:[{begin:/\$\d/},{begin:/[\$%@](\^\w\b|#\w+(::\w+)*|{\w+}|\w+(::\w*)*)/},{begin:/[\$%@][^\s\w{]/,relevance:0}]},i=[e.BACKSLASH_ESCAPE,t,r],a=[r,e.HASH_COMMENT_MODE,e.COMMENT("^\\=\\w","\\=cut",{endsWithParent:!0}),s,{className:"string",contains:i,variants:[{begin:"q[qwxr]?\\s*\\(",end:"\\)",relevance:5},{begin:"q[qwxr]?\\s*\\[",end:"\\]",relevance:5},{begin:"q[qwxr]?\\s*\\{",end:"\\}",relevance:5},{begin:"q[qwxr]?\\s*\\|",end:"\\|",relevance:5},{begin:"q[qwxr]?\\s*\\<",end:"\\>",relevance:5},{begin:"qw\\s+q",end:"q",relevance:5},{begin:"'",end:"'",contains:[e.BACKSLASH_ESCAPE]},{begin:'"',end:'"'},{begin:"`",end:"`",contains:[e.BACKSLASH_ESCAPE]},{begin:"{\\w+}",contains:[],relevance:0},{begin:"-?\\w+\\s*\\=\\>",contains:[],relevance:0}]},{className:"number",begin:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},{begin:"(\\/\\/|"+e.RE_STARTERS_RE+"|\\b(split|return|print|reverse|grep)\\b)\\s*",keywords:"split return print reverse grep",relevance:0,contains:[e.HASH_COMMENT_MODE,{className:"regexp",begin:"(s|tr|y)/(\\\\.|[^/])*/(\\\\.|[^/])*/[a-z]*",relevance:10},{className:"regexp",begin:"(m|qr)?/",end:"/[a-z]*",contains:[e.BACKSLASH_ESCAPE],relevance:0}]},{className:"function",beginKeywords:"sub",end:"(\\s*\\(.*?\\))?[;{]",excludeEnd:!0,relevance:5,contains:[e.TITLE_MODE]},{begin:"-\\w\\b",relevance:0},{begin:"^__DATA__$",end:"^__END__$",subLanguage:"mojolicious",contains:[{begin:"^@@.*",end:"$",className:"comment"}]}];return t.contains=a,s.contains=a,{name:"Perl",aliases:["pl","pm"],keywords:n,contains:a}}}());hljs.registerLanguage("swift",function(){"use strict";return function(e){var i={keyword:"#available #colorLiteral #column #else #elseif #endif #file #fileLiteral #function #if #imageLiteral #line #selector #sourceLocation _ __COLUMN__ __FILE__ __FUNCTION__ __LINE__ Any as as! as? associatedtype associativity break case catch class continue convenience default defer deinit didSet do dynamic dynamicType else enum extension fallthrough false fileprivate final for func get guard if import in indirect infix init inout internal is lazy left let mutating nil none nonmutating open operator optional override postfix precedence prefix private protocol Protocol public repeat required rethrows return right self Self set static struct subscript super switch throw throws true try try! try? Type typealias unowned var weak where while willSet",literal:"true false nil",built_in:"abs advance alignof alignofValue anyGenerator assert assertionFailure bridgeFromObjectiveC bridgeFromObjectiveCUnconditional bridgeToObjectiveC bridgeToObjectiveCUnconditional c compactMap contains count countElements countLeadingZeros debugPrint debugPrintln distance dropFirst dropLast dump encodeBitsAsWords enumerate equal fatalError filter find getBridgedObjectiveCType getVaList indices insertionSort isBridgedToObjectiveC isBridgedVerbatimToObjectiveC isUniquelyReferenced isUniquelyReferencedNonObjC join lazy lexicographicalCompare map max maxElement min minElement numericCast overlaps partition posix precondition preconditionFailure print println quickSort readLine reduce reflect reinterpretCast reverse roundUpToAlignment sizeof sizeofValue sort split startsWith stride strideof strideofValue swap toString transcode underestimateCount unsafeAddressOf unsafeBitCast unsafeDowncast unsafeUnwrap unsafeReflect withExtendedLifetime withObjectAtPlusZero withUnsafePointer withUnsafePointerToObject withUnsafeMutablePointer withUnsafeMutablePointers withUnsafePointer withUnsafePointers withVaList zip"},n=e.COMMENT("/\\*","\\*/",{contains:["self"]}),t={className:"subst",begin:/\\\(/,end:"\\)",keywords:i,contains:[]},a={className:"string",contains:[e.BACKSLASH_ESCAPE,t],variants:[{begin:/"""/,end:/"""/},{begin:/"/,end:/"/}]},r={className:"number",begin:"\\b([\\d_]+(\\.[\\deE_]+)?|0x[a-fA-F0-9_]+(\\.[a-fA-F0-9p_]+)?|0b[01_]+|0o[0-7_]+)\\b",relevance:0};return t.contains=[r],{name:"Swift",keywords:i,contains:[a,e.C_LINE_COMMENT_MODE,n,{className:"type",begin:"\\b[A-Z][\\wÀ-ʸ']*[!?]"},{className:"type",begin:"\\b[A-Z][\\wÀ-ʸ']*",relevance:0},r,{className:"function",beginKeywords:"func",end:"{",excludeEnd:!0,contains:[e.inherit(e.TITLE_MODE,{begin:/[A-Za-z$_][0-9A-Za-z$_]*/}),{begin:/</,end:/>/},{className:"params",begin:/\(/,end:/\)/,endsParent:!0,keywords:i,contains:["self",r,a,e.C_BLOCK_COMMENT_MODE,{begin:":"}],illegal:/["']/}],illegal:/\[|%/},{className:"class",beginKeywords:"struct protocol class extension enum",keywords:i,end:"\\{",excludeEnd:!0,contains:[e.inherit(e.TITLE_MODE,{begin:/[A-Za-z$_][\u00C0-\u02B80-9A-Za-z$_]*/})]},{className:"meta",begin:"(@discardableResult|@warn_unused_result|@exported|@lazy|@noescape|@NSCopying|@NSManaged|@objc|@objcMembers|@convention|@required|@noreturn|@IBAction|@IBDesignable|@IBInspectable|@IBOutlet|@infix|@prefix|@postfix|@autoclosure|@testable|@available|@nonobjc|@NSApplicationMain|@UIApplicationMain|@dynamicMemberLookup|@propertyWrapper)\\b"},{beginKeywords:"import",end:/$/,contains:[e.C_LINE_COMMENT_MODE,n]}]}}}());hljs.registerLanguage("makefile",function(){"use strict";return function(e){var i={className:"variable",variants:[{begin:"\\$\\("+e.UNDERSCORE_IDENT_RE+"\\)",contains:[e.BACKSLASH_ESCAPE]},{begin:/\$[@%<?\^\+\*]/}]},n={className:"string",begin:/"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,i]},a={className:"variable",begin:/\$\([\w-]+\s/,end:/\)/,keywords:{built_in:"subst patsubst strip findstring filter filter-out sort word wordlist firstword lastword dir notdir suffix basename addsuffix addprefix join wildcard realpath abspath error warning shell origin flavor foreach if or and call eval file value"},contains:[i]},r={begin:"^"+e.UNDERSCORE_IDENT_RE+"\\s*(?=[:+?]?=)"},s={className:"section",begin:/^[^\s]+:/,end:/$/,contains:[i]};return{name:"Makefile",aliases:["mk","mak"],keywords:{$pattern:/[\w-]+/,keyword:"define endef undefine ifdef ifndef ifeq ifneq else endif include -include sinclude override export unexport private vpath"},contains:[e.HASH_COMMENT_MODE,i,n,a,r,{className:"meta",begin:/^\.PHONY:/,end:/$/,keywords:{$pattern:/[\.\w]+/,"meta-keyword":".PHONY"}},s]}}}());hljs.registerLanguage("css",function(){"use strict";return function(e){var n={begin:/(?:[A-Z\_\.\-]+|--[a-zA-Z0-9_-]+)\s*:/,returnBegin:!0,end:";",endsWithParent:!0,contains:[{className:"attribute",begin:/\S/,end:":",excludeEnd:!0,starts:{endsWithParent:!0,excludeEnd:!0,contains:[{begin:/[\w-]+\(/,returnBegin:!0,contains:[{className:"built_in",begin:/[\w-]+/},{begin:/\(/,end:/\)/,contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.CSS_NUMBER_MODE]}]},e.CSS_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,e.C_BLOCK_COMMENT_MODE,{className:"number",begin:"#[0-9A-Fa-f]+"},{className:"meta",begin:"!important"}]}}]};return{name:"CSS",case_insensitive:!0,illegal:/[=\/|'\$]/,contains:[e.C_BLOCK_COMMENT_MODE,{className:"selector-id",begin:/#[A-Za-z0-9_-]+/},{className:"selector-class",begin:/\.[A-Za-z0-9_-]+/},{className:"selector-attr",begin:/\[/,end:/\]/,illegal:"$",contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},{className:"selector-pseudo",begin:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{begin:"@(page|font-face)",lexemes:"@[a-z-]+",keywords:"@page @font-face"},{begin:"@",end:"[{;]",illegal:/:/,returnBegin:!0,contains:[{className:"keyword",begin:/@\-?\w[\w]*(\-\w+)*/},{begin:/\s/,endsWithParent:!0,excludeEnd:!0,relevance:0,keywords:"and or not only",contains:[{begin:/[a-z-]+:/,className:"attribute"},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.CSS_NUMBER_MODE]}]},{className:"selector-tag",begin:"[a-zA-Z-][a-zA-Z0-9_-]*",relevance:0},{begin:"{",end:"}",illegal:/\S/,contains:[e.C_BLOCK_COMMENT_MODE,n]}]}}}());hljs.registerLanguage("xml",function(){"use strict";return function(e){var n={className:"symbol",begin:"&[a-z]+;|&#[0-9]+;|&#x[a-f0-9]+;"},a={begin:"\\s",contains:[{className:"meta-keyword",begin:"#?[a-z_][a-z1-9_-]+",illegal:"\\n"}]},s=e.inherit(a,{begin:"\\(",end:"\\)"}),t=e.inherit(e.APOS_STRING_MODE,{className:"meta-string"}),i=e.inherit(e.QUOTE_STRING_MODE,{className:"meta-string"}),c={endsWithParent:!0,illegal:/</,relevance:0,contains:[{className:"attr",begin:"[A-Za-z0-9\\._:-]+",relevance:0},{begin:/=\s*/,relevance:0,contains:[{className:"string",endsParent:!0,variants:[{begin:/"/,end:/"/,contains:[n]},{begin:/'/,end:/'/,contains:[n]},{begin:/[^\s"'=<>`]+/}]}]}]};return{name:"HTML, XML",aliases:["html","xhtml","rss","atom","xjb","xsd","xsl","plist","wsf","svg"],case_insensitive:!0,contains:[{className:"meta",begin:"<![a-z]",end:">",relevance:10,contains:[a,i,t,s,{begin:"\\[",end:"\\]",contains:[{className:"meta",begin:"<![a-z]",end:">",contains:[a,s,i,t]}]}]},e.COMMENT("\x3c!--","--\x3e",{relevance:10}),{begin:"<\\!\\[CDATA\\[",end:"\\]\\]>",relevance:10},n,{className:"meta",begin:/<\?xml/,end:/\?>/,relevance:10},{className:"tag",begin:"<style(?=\\s|>)",end:">",keywords:{name:"style"},contains:[c],starts:{end:"</style>",returnEnd:!0,subLanguage:["css","xml"]}},{className:"tag",begin:"<script(?=\\s|>)",end:">",keywords:{name:"script"},contains:[c],starts:{end:"<\/script>",returnEnd:!0,subLanguage:["javascript","handlebars","xml"]}},{className:"tag",begin:"</?",end:"/?>",contains:[{className:"name",begin:/[^\/><\s]+/,relevance:0},c]}]}}}());hljs.registerLanguage("bash",function(){"use strict";return function(e){const s={};Object.assign(s,{className:"variable",variants:[{begin:/\$[\w\d#@][\w\d_]*/},{begin:/\$\{/,end:/\}/,contains:[{begin:/:-/,contains:[s]}]}]});const t={className:"subst",begin:/\$\(/,end:/\)/,contains:[e.BACKSLASH_ESCAPE]},n={className:"string",begin:/"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,s,t]};t.contains.push(n);const a={begin:/\$\(\(/,end:/\)\)/,contains:[{begin:/\d+#[0-9a-f]+/,className:"number"},e.NUMBER_MODE,s]},i=e.SHEBANG({binary:"(fish|bash|zsh|sh|csh|ksh|tcsh|dash|scsh)",relevance:10}),c={className:"function",begin:/\w[\w\d_]*\s*\(\s*\)\s*\{/,returnBegin:!0,contains:[e.inherit(e.TITLE_MODE,{begin:/\w[\w\d_]*/})],relevance:0};return{name:"Bash",aliases:["sh","zsh"],keywords:{$pattern:/\b-?[a-z\._]+\b/,keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},contains:[i,e.SHEBANG(),c,a,e.HASH_COMMENT_MODE,n,{className:"",begin:/\\"/},{className:"string",begin:/'/,end:/'/},s]}}}());hljs.registerLanguage("c-like",function(){"use strict";return function(e){function t(e){return"(?:"+e+")?"}var n="(decltype\\(auto\\)|"+t("[a-zA-Z_]\\w*::")+"[a-zA-Z_]\\w*"+t("<.*?>")+")",r={className:"keyword",begin:"\\b[a-z\\d_]*_t\\b"},a={className:"string",variants:[{begin:'(u8?|U|L)?"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},{begin:"(u8?|U|L)?'(\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)|.)",end:"'",illegal:"."},e.END_SAME_AS_BEGIN({begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},i={className:"number",variants:[{begin:"\\b(0b[01']+)"},{begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"},{begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"}],relevance:0},s={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{"meta-keyword":"if else elif endif define undef warning error line pragma _Pragma ifdef ifndef include"},contains:[{begin:/\\\n/,relevance:0},e.inherit(a,{className:"meta-string"}),{className:"meta-string",begin:/<.*?>/,end:/$/,illegal:"\\n"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},o={className:"title",begin:t("[a-zA-Z_]\\w*::")+e.IDENT_RE,relevance:0},c=t("[a-zA-Z_]\\w*::")+e.IDENT_RE+"\\s*\\(",l={keyword:"int float while private char char8_t char16_t char32_t catch import module export virtual operator sizeof dynamic_cast|10 typedef const_cast|10 const for static_cast|10 union namespace unsigned long volatile static protected bool template mutable if public friend do goto auto void enum else break extern using asm case typeid wchar_t short reinterpret_cast|10 default double register explicit signed typename try this switch continue inline delete alignas alignof constexpr consteval constinit decltype concept co_await co_return co_yield requires noexcept static_assert thread_local restrict final override atomic_bool atomic_char atomic_schar atomic_uchar atomic_short atomic_ushort atomic_int atomic_uint atomic_long atomic_ulong atomic_llong atomic_ullong new throw return and and_eq bitand bitor compl not not_eq or or_eq xor xor_eq",built_in:"std string wstring cin cout cerr clog stdin stdout stderr stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set pair bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap priority_queue make_pair array shared_ptr abort terminate abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf future isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc realloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf endl initializer_list unique_ptr _Bool complex _Complex imaginary _Imaginary",literal:"true false nullptr NULL"},d=[r,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,i,a],_={variants:[{begin:/=/,end:/;/},{begin:/\(/,end:/\)/},{beginKeywords:"new throw return else",end:/;/}],keywords:l,contains:d.concat([{begin:/\(/,end:/\)/,keywords:l,contains:d.concat(["self"]),relevance:0}]),relevance:0},u={className:"function",begin:"("+n+"[\\*&\\s]+)+"+c,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,keywords:l,illegal:/[^\w\s\*&:<>]/,contains:[{begin:"decltype\\(auto\\)",keywords:l,relevance:0},{begin:c,returnBegin:!0,contains:[o],relevance:0},{className:"params",begin:/\(/,end:/\)/,keywords:l,relevance:0,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,i,r,{begin:/\(/,end:/\)/,keywords:l,relevance:0,contains:["self",e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,i,r]}]},r,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,s]};return{aliases:["c","cc","h","c++","h++","hpp","hh","hxx","cxx"],keywords:l,disableAutodetect:!0,illegal:"</",contains:[].concat(_,u,d,[s,{begin:"\\b(deque|list|queue|priority_queue|pair|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array)\\s*<",end:">",keywords:l,contains:["self",r]},{begin:e.IDENT_RE+"::",keywords:l},{className:"class",beginKeywords:"class struct",end:/[{;:]/,contains:[{begin:/</,end:/>/,contains:["self"]},e.TITLE_MODE]}]),exports:{preprocessor:s,strings:a,keywords:l}}}}());hljs.registerLanguage("coffeescript",function(){"use strict";const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],a=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["arguments","this","super","console","window","document","localStorage","module","global"],["Intl","DataView","Number","Math","Date","String","RegExp","Object","Function","Boolean","Error","Symbol","Set","Map","WeakSet","WeakMap","Proxy","Reflect","JSON","Promise","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Float32Array","Array","Uint8Array","Uint8ClampedArray","ArrayBuffer"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"]);return function(r){var t={keyword:e.concat(["then","unless","until","loop","by","when","and","or","is","isnt","not"]).filter((e=>n=>!e.includes(n))(["var","const","let","function","static"])).join(" "),literal:n.concat(["yes","no","on","off"]).join(" "),built_in:a.concat(["npm","print"]).join(" ")},i="[A-Za-z$_][0-9A-Za-z$_]*",s={className:"subst",begin:/#\{/,end:/}/,keywords:t},o=[r.BINARY_NUMBER_MODE,r.inherit(r.C_NUMBER_MODE,{starts:{end:"(\\s*/)?",relevance:0}}),{className:"string",variants:[{begin:/'''/,end:/'''/,contains:[r.BACKSLASH_ESCAPE]},{begin:/'/,end:/'/,contains:[r.BACKSLASH_ESCAPE]},{begin:/"""/,end:/"""/,contains:[r.BACKSLASH_ESCAPE,s]},{begin:/"/,end:/"/,contains:[r.BACKSLASH_ESCAPE,s]}]},{className:"regexp",variants:[{begin:"///",end:"///",contains:[s,r.HASH_COMMENT_MODE]},{begin:"//[gim]{0,3}(?=\\W)",relevance:0},{begin:/\/(?![ *]).*?(?![\\]).\/[gim]{0,3}(?=\W)/}]},{begin:"@"+i},{subLanguage:"javascript",excludeBegin:!0,excludeEnd:!0,variants:[{begin:"```",end:"```"},{begin:"`",end:"`"}]}];s.contains=o;var c=r.inherit(r.TITLE_MODE,{begin:i}),l={className:"params",begin:"\\([^\\(]",returnBegin:!0,contains:[{begin:/\(/,end:/\)/,keywords:t,contains:["self"].concat(o)}]};return{name:"CoffeeScript",aliases:["coffee","cson","iced"],keywords:t,illegal:/\/\*/,contains:o.concat([r.COMMENT("###","###"),r.HASH_COMMENT_MODE,{className:"function",begin:"^\\s*"+i+"\\s*=\\s*(\\(.*\\))?\\s*\\B[-=]>",end:"[-=]>",returnBegin:!0,contains:[c,l]},{begin:/[:\(,=]\s*/,relevance:0,contains:[{className:"function",begin:"(\\(.*\\))?\\s*\\B[-=]>",end:"[-=]>",returnBegin:!0,contains:[l]}]},{className:"class",beginKeywords:"class",end:"$",illegal:/[:="\[\]]/,contains:[{beginKeywords:"extends",endsWithParent:!0,illegal:/[:="\[\]]/,contains:[c]},c]},{begin:i+":",end:":",returnBegin:!0,returnEnd:!0,relevance:0}])}}}());hljs.registerLanguage("ruby",function(){"use strict";return function(e){var n="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",a={keyword:"and then defined module in return redo if BEGIN retry end for self when next until do begin unless END rescue else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor",literal:"true false nil"},s={className:"doctag",begin:"@[A-Za-z]+"},i={begin:"#<",end:">"},r=[e.COMMENT("#","$",{contains:[s]}),e.COMMENT("^\\=begin","^\\=end",{contains:[s],relevance:10}),e.COMMENT("^__END__","\\n$")],c={className:"subst",begin:"#\\{",end:"}",keywords:a},t={className:"string",contains:[e.BACKSLASH_ESCAPE,c],variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/`/,end:/`/},{begin:"%[qQwWx]?\\(",end:"\\)"},{begin:"%[qQwWx]?\\[",end:"\\]"},{begin:"%[qQwWx]?{",end:"}"},{begin:"%[qQwWx]?<",end:">"},{begin:"%[qQwWx]?/",end:"/"},{begin:"%[qQwWx]?%",end:"%"},{begin:"%[qQwWx]?-",end:"-"},{begin:"%[qQwWx]?\\|",end:"\\|"},{begin:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/},{begin:/<<[-~]?'?(\w+)(?:.|\n)*?\n\s*\1\b/,returnBegin:!0,contains:[{begin:/<<[-~]?'?/},e.END_SAME_AS_BEGIN({begin:/(\w+)/,end:/(\w+)/,contains:[e.BACKSLASH_ESCAPE,c]})]}]},b={className:"params",begin:"\\(",end:"\\)",endsParent:!0,keywords:a},d=[t,i,{className:"class",beginKeywords:"class module",end:"$|;",illegal:/=/,contains:[e.inherit(e.TITLE_MODE,{begin:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{begin:"<\\s*",contains:[{begin:"("+e.IDENT_RE+"::)?"+e.IDENT_RE}]}].concat(r)},{className:"function",beginKeywords:"def",end:"$|;",contains:[e.inherit(e.TITLE_MODE,{begin:n}),b].concat(r)},{begin:e.IDENT_RE+"::"},{className:"symbol",begin:e.UNDERSCORE_IDENT_RE+"(\\!|\\?)?:",relevance:0},{className:"symbol",begin:":(?!\\s)",contains:[t,{begin:n}],relevance:0},{className:"number",begin:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},{begin:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{className:"params",begin:/\|/,end:/\|/,keywords:a},{begin:"("+e.RE_STARTERS_RE+"|unless)\\s*",keywords:"unless",contains:[i,{className:"regexp",contains:[e.BACKSLASH_ESCAPE,c],illegal:/\n/,variants:[{begin:"/",end:"/[a-z]*"},{begin:"%r{",end:"}[a-z]*"},{begin:"%r\\(",end:"\\)[a-z]*"},{begin:"%r!",end:"![a-z]*"},{begin:"%r\\[",end:"\\][a-z]*"}]}].concat(r),relevance:0}].concat(r);c.contains=d,b.contains=d;var g=[{begin:/^\s*=>/,starts:{end:"$",contains:d}},{className:"meta",begin:"^([>?]>|[\\w#]+\\(\\w+\\):\\d+:\\d+>|(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>)",starts:{end:"$",contains:d}}];return{name:"Ruby",aliases:["rb","gemspec","podspec","thor","irb"],keywords:a,illegal:/\/\*/,contains:r.concat(g).concat(d)}}}());hljs.registerLanguage("yaml",function(){"use strict";return function(e){var n="true false yes no null",a="[\\w#;/?:@&=+$,.~*\\'()[\\]]+",s={className:"string",relevance:0,variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/\S+/}],contains:[e.BACKSLASH_ESCAPE,{className:"template-variable",variants:[{begin:"{{",end:"}}"},{begin:"%{",end:"}"}]}]},i=e.inherit(s,{variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/[^\s,{}[\]]+/}]}),l={end:",",endsWithParent:!0,excludeEnd:!0,contains:[],keywords:n,relevance:0},t={begin:"{",end:"}",contains:[l],illegal:"\\n",relevance:0},g={begin:"\\[",end:"\\]",contains:[l],illegal:"\\n",relevance:0},b=[{className:"attr",variants:[{begin:"\\w[\\w :\\/.-]*:(?=[ \t]|$)"},{begin:'"\\w[\\w :\\/.-]*":(?=[ \t]|$)'},{begin:"'\\w[\\w :\\/.-]*':(?=[ \t]|$)"}]},{className:"meta",begin:"^---s*$",relevance:10},{className:"string",begin:"[\\|>]([0-9]?[+-])?[ ]*\\n( *)[\\S ]+\\n(\\2[\\S ]+\\n?)*"},{begin:"<%[%=-]?",end:"[%-]?%>",subLanguage:"ruby",excludeBegin:!0,excludeEnd:!0,relevance:0},{className:"type",begin:"!\\w+!"+a},{className:"type",begin:"!<"+a+">"},{className:"type",begin:"!"+a},{className:"type",begin:"!!"+a},{className:"meta",begin:"&"+e.UNDERSCORE_IDENT_RE+"$"},{className:"meta",begin:"\\*"+e.UNDERSCORE_IDENT_RE+"$"},{className:"bullet",begin:"\\-(?=[ ]|$)",relevance:0},e.HASH_COMMENT_MODE,{beginKeywords:n,keywords:{literal:n}},{className:"number",begin:"\\b[0-9]{4}(-[0-9][0-9]){0,2}([Tt \\t][0-9][0-9]?(:[0-9][0-9]){2})?(\\.[0-9]*)?([ \\t])*(Z|[-+][0-9][0-9]?(:[0-9][0-9])?)?\\b"},{className:"number",begin:e.C_NUMBER_RE+"\\b"},t,g,s],c=[...b];return c.pop(),c.push(i),l.contains=c,{name:"YAML",case_insensitive:!0,aliases:["yml","YAML"],contains:b}}}());hljs.registerLanguage("d",function(){"use strict";return function(e){var a={$pattern:e.UNDERSCORE_IDENT_RE,keyword:"abstract alias align asm assert auto body break byte case cast catch class const continue debug default delete deprecated do else enum export extern final finally for foreach foreach_reverse|10 goto if immutable import in inout int interface invariant is lazy macro mixin module new nothrow out override package pragma private protected public pure ref return scope shared static struct super switch synchronized template this throw try typedef typeid typeof union unittest version void volatile while with __FILE__ __LINE__ __gshared|10 __thread __traits __DATE__ __EOF__ __TIME__ __TIMESTAMP__ __VENDOR__ __VERSION__",built_in:"bool cdouble cent cfloat char creal dchar delegate double dstring float function idouble ifloat ireal long real short string ubyte ucent uint ulong ushort wchar wstring",literal:"false null true"},d="((0|[1-9][\\d_]*)|0[bB][01_]+|0[xX]([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*))",n="\\\\(['\"\\?\\\\abfnrtv]|u[\\dA-Fa-f]{4}|[0-7]{1,3}|x[\\dA-Fa-f]{2}|U[\\dA-Fa-f]{8})|&[a-zA-Z\\d]{2,};",t={className:"number",begin:"\\b"+d+"(L|u|U|Lu|LU|uL|UL)?",relevance:0},_={className:"number",begin:"\\b(((0[xX](([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)\\.([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)|\\.?([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*))[pP][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d))|((0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)(\\.\\d*|([eE][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)))|\\d+\\.(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)|\\.(0|[1-9][\\d_]*)([eE][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d))?))([fF]|L|i|[fF]i|Li)?|"+d+"(i|[fF]i|Li))",relevance:0},r={className:"string",begin:"'("+n+"|.)",end:"'",illegal:"."},i={className:"string",begin:'"',contains:[{begin:n,relevance:0}],end:'"[cwd]?'},s=e.COMMENT("\\/\\+","\\+\\/",{contains:["self"],relevance:10});return{name:"D",keywords:a,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,s,{className:"string",begin:'x"[\\da-fA-F\\s\\n\\r]*"[cwd]?',relevance:10},i,{className:"string",begin:'[rq]"',end:'"[cwd]?',relevance:5},{className:"string",begin:"`",end:"`[cwd]?"},{className:"string",begin:'q"\\{',end:'\\}"'},_,t,r,{className:"meta",begin:"^#!",end:"$",relevance:5},{className:"meta",begin:"#(line)",end:"$",relevance:5},{className:"keyword",begin:"@[a-zA-Z_][a-zA-Z_\\d]*"}]}}}());hljs.registerLanguage("properties",function(){"use strict";return function(e){var n="[ \\t\\f]*",t="("+n+"[:=]"+n+"|[ \\t\\f]+)",a="([^\\\\:= \\t\\f\\n]|\\\\.)+",s={end:t,relevance:0,starts:{className:"string",end:/$/,relevance:0,contains:[{begin:"\\\\\\n"}]}};return{name:".properties",case_insensitive:!0,illegal:/\S/,contains:[e.COMMENT("^\\s*[!#]","$"),{begin:"([^\\\\\\W:= \\t\\f\\n]|\\\\.)+"+t,returnBegin:!0,contains:[{className:"attr",begin:"([^\\\\\\W:= \\t\\f\\n]|\\\\.)+",endsParent:!0,relevance:0}],starts:s},{begin:a+t,returnBegin:!0,relevance:0,contains:[{className:"meta",begin:a,endsParent:!0,relevance:0}],starts:s},{className:"attr",relevance:0,begin:a+n+"$"}]}}}());hljs.registerLanguage("http",function(){"use strict";return function(e){var n="HTTP/[0-9\\.]+";return{name:"HTTP",aliases:["https"],illegal:"\\S",contains:[{begin:"^"+n,end:"$",contains:[{className:"number",begin:"\\b\\d{3}\\b"}]},{begin:"^[A-Z]+ (.*?) "+n+"$",returnBegin:!0,end:"$",contains:[{className:"string",begin:" ",end:" ",excludeBegin:!0,excludeEnd:!0},{begin:n},{className:"keyword",begin:"[A-Z]+"}]},{className:"attribute",begin:"^\\w",end:": ",excludeEnd:!0,illegal:"\\n|\\s|=",starts:{end:"$",relevance:0}},{begin:"\\n\\n",starts:{subLanguage:[],endsWithParent:!0}}]}}}());hljs.registerLanguage("haskell",function(){"use strict";return function(e){var n={variants:[e.COMMENT("--","$"),e.COMMENT("{-","-}",{contains:["self"]})]},i={className:"meta",begin:"{-#",end:"#-}"},a={className:"meta",begin:"^#",end:"$"},s={className:"type",begin:"\\b[A-Z][\\w']*",relevance:0},l={begin:"\\(",end:"\\)",illegal:'"',contains:[i,a,{className:"type",begin:"\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?"},e.inherit(e.TITLE_MODE,{begin:"[_a-z][\\w']*"}),n]};return{name:"Haskell",aliases:["hs"],keywords:"let in if then else case of where do module import hiding qualified type data newtype deriving class instance as default infix infixl infixr foreign export ccall stdcall cplusplus jvm dotnet safe unsafe family forall mdo proc rec",contains:[{beginKeywords:"module",end:"where",keywords:"module where",contains:[l,n],illegal:"\\W\\.|;"},{begin:"\\bimport\\b",end:"$",keywords:"import qualified as hiding",contains:[l,n],illegal:"\\W\\.|;"},{className:"class",begin:"^(\\s*)?(class|instance)\\b",end:"where",keywords:"class family instance where",contains:[s,l,n]},{className:"class",begin:"\\b(data|(new)?type)\\b",end:"$",keywords:"data family type newtype deriving",contains:[i,s,l,{begin:"{",end:"}",contains:l.contains},n]},{beginKeywords:"default",end:"$",contains:[s,l,n]},{beginKeywords:"infix infixl infixr",end:"$",contains:[e.C_NUMBER_MODE,n]},{begin:"\\bforeign\\b",end:"$",keywords:"foreign import export ccall stdcall cplusplus jvm dotnet safe unsafe",contains:[s,e.QUOTE_STRING_MODE,n]},{className:"meta",begin:"#!\\/usr\\/bin\\/env runhaskell",end:"$"},i,a,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,s,e.inherit(e.TITLE_MODE,{begin:"^[_a-z][\\w']*"}),n,{begin:"->|<-"}]}}}());hljs.registerLanguage("handlebars",function(){"use strict";function e(...e){return e.map(e=>(function(e){return e?"string"==typeof e?e:e.source:null})(e)).join("")}return function(n){const a={"builtin-name":"action bindattr collection component concat debugger each each-in get hash if in input link-to loc log lookup mut outlet partial query-params render template textarea unbound unless view with yield"},t=/\[.*?\]/,s=/[^\s!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]+/,i=e("(",/'.*?'/,"|",/".*?"/,"|",t,"|",s,"|",/\.|\//,")+"),r=e("(",t,"|",s,")(?==)"),l={begin:i,lexemes:/[\w.\/]+/},c=n.inherit(l,{keywords:{literal:"true false undefined null"}}),o={begin:/\(/,end:/\)/},m={className:"attr",begin:r,relevance:0,starts:{begin:/=/,end:/=/,starts:{contains:[n.NUMBER_MODE,n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,c,o]}}},d={contains:[n.NUMBER_MODE,n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,{begin:/as\s+\|/,keywords:{keyword:"as"},end:/\|/,contains:[{begin:/\w+/}]},m,c,o],returnEnd:!0},g=n.inherit(l,{className:"name",keywords:a,starts:n.inherit(d,{end:/\)/})});o.contains=[g];const u=n.inherit(l,{keywords:a,className:"name",starts:n.inherit(d,{end:/}}/})}),b=n.inherit(l,{keywords:a,className:"name"}),h=n.inherit(l,{className:"name",keywords:a,starts:n.inherit(d,{end:/}}/})});return{name:"Handlebars",aliases:["hbs","html.hbs","html.handlebars","htmlbars"],case_insensitive:!0,subLanguage:"xml",contains:[{begin:/\\\{\{/,skip:!0},{begin:/\\\\(?=\{\{)/,skip:!0},n.COMMENT(/\{\{!--/,/--\}\}/),n.COMMENT(/\{\{!/,/\}\}/),{className:"template-tag",begin:/\{\{\{\{(?!\/)/,end:/\}\}\}\}/,contains:[u],starts:{end:/\{\{\{\{\//,returnEnd:!0,subLanguage:"xml"}},{className:"template-tag",begin:/\{\{\{\{\//,end:/\}\}\}\}/,contains:[b]},{className:"template-tag",begin:/\{\{#/,end:/\}\}/,contains:[u]},{className:"template-tag",begin:/\{\{(?=else\}\})/,end:/\}\}/,keywords:"else"},{className:"template-tag",begin:/\{\{\//,end:/\}\}/,contains:[b]},{className:"template-variable",begin:/\{\{\{/,end:/\}\}\}/,contains:[h]},{className:"template-variable",begin:/\{\{/,end:/\}\}/,contains:[h]}]}}}());hljs.registerLanguage("rust",function(){"use strict";return function(e){var n="([ui](8|16|32|64|128|size)|f(32|64))?",t="drop i8 i16 i32 i64 i128 isize u8 u16 u32 u64 u128 usize f32 f64 str char bool Box Option Result String Vec Copy Send Sized Sync Drop Fn FnMut FnOnce ToOwned Clone Debug PartialEq PartialOrd Eq Ord AsRef AsMut Into From Default Iterator Extend IntoIterator DoubleEndedIterator ExactSizeIterator SliceConcatExt ToString assert! assert_eq! bitflags! bytes! cfg! col! concat! concat_idents! debug_assert! debug_assert_eq! env! panic! file! format! format_args! include_bin! include_str! line! local_data_key! module_path! option_env! print! println! select! stringify! try! unimplemented! unreachable! vec! write! writeln! macro_rules! assert_ne! debug_assert_ne!";return{name:"Rust",aliases:["rs"],keywords:{$pattern:e.IDENT_RE+"!?",keyword:"abstract as async await become box break const continue crate do dyn else enum extern false final fn for if impl in let loop macro match mod move mut override priv pub ref return self Self static struct super trait true try type typeof unsafe unsized use virtual where while yield",literal:"true false Some None Ok Err",built_in:t},illegal:"</",contains:[e.C_LINE_COMMENT_MODE,e.COMMENT("/\\*","\\*/",{contains:["self"]}),e.inherit(e.QUOTE_STRING_MODE,{begin:/b?"/,illegal:null}),{className:"string",variants:[{begin:/r(#*)"(.|\n)*?"\1(?!#)/},{begin:/b?'\\?(x\w{2}|u\w{4}|U\w{8}|.)'/}]},{className:"symbol",begin:/'[a-zA-Z_][a-zA-Z0-9_]*/},{className:"number",variants:[{begin:"\\b0b([01_]+)"+n},{begin:"\\b0o([0-7_]+)"+n},{begin:"\\b0x([A-Fa-f0-9_]+)"+n},{begin:"\\b(\\d[\\d_]*(\\.[0-9_]+)?([eE][+-]?[0-9_]+)?)"+n}],relevance:0},{className:"function",beginKeywords:"fn",end:"(\\(|<)",excludeEnd:!0,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"meta",begin:"#\\!?\\[",end:"\\]",contains:[{className:"meta-string",begin:/"/,end:/"/}]},{className:"class",beginKeywords:"type",end:";",contains:[e.inherit(e.UNDERSCORE_TITLE_MODE,{endsParent:!0})],illegal:"\\S"},{className:"class",beginKeywords:"trait enum struct union",end:"{",contains:[e.inherit(e.UNDERSCORE_TITLE_MODE,{endsParent:!0})],illegal:"[\\w\\d]"},{begin:e.IDENT_RE+"::",keywords:{built_in:t}},{begin:"->"}]}}}());hljs.registerLanguage("cpp",function(){"use strict";return function(e){var t=e.getLanguage("c-like").rawDefinition();return t.disableAutodetect=!1,t.name="C++",t.aliases=["cc","c++","h++","hpp","hh","hxx","cxx"],t}}());hljs.registerLanguage("ini",function(){"use strict";function e(e){return e?"string"==typeof e?e:e.source:null}function n(...n){return n.map(n=>e(n)).join("")}return function(a){var s={className:"number",relevance:0,variants:[{begin:/([\+\-]+)?[\d]+_[\d_]+/},{begin:a.NUMBER_RE}]},i=a.COMMENT();i.variants=[{begin:/;/,end:/$/},{begin:/#/,end:/$/}];var t={className:"variable",variants:[{begin:/\$[\w\d"][\w\d_]*/},{begin:/\$\{(.*?)}/}]},r={className:"literal",begin:/\bon|off|true|false|yes|no\b/},l={className:"string",contains:[a.BACKSLASH_ESCAPE],variants:[{begin:"'''",end:"'''",relevance:10},{begin:'"""',end:'"""',relevance:10},{begin:'"',end:'"'},{begin:"'",end:"'"}]},c={begin:/\[/,end:/\]/,contains:[i,r,t,l,s,"self"],relevance:0},g="("+[/[A-Za-z0-9_-]+/,/"(\\"|[^"])*"/,/'[^']*'/].map(n=>e(n)).join("|")+")";return{name:"TOML, also INI",aliases:["toml"],case_insensitive:!0,illegal:/\S/,contains:[i,{className:"section",begin:/\[+/,end:/\]+/},{begin:n(g,"(\\s*\\.\\s*",g,")*",n("(?=",/\s*=\s*[^#\s]/,")")),className:"attr",starts:{end:/$/,contains:[i,c,r,t,l,s]}}]}}}());hljs.registerLanguage("objectivec",function(){"use strict";return function(e){var n=/[a-zA-Z@][a-zA-Z0-9_]*/,_={$pattern:n,keyword:"@interface @class @protocol @implementation"};return{name:"Objective-C",aliases:["mm","objc","obj-c"],keywords:{$pattern:n,keyword:"int float while char export sizeof typedef const struct for union unsigned long volatile static bool mutable if do return goto void enum else break extern asm case short default double register explicit signed typename this switch continue wchar_t inline readonly assign readwrite self @synchronized id typeof nonatomic super unichar IBOutlet IBAction strong weak copy in out inout bycopy byref oneway __strong __weak __block __autoreleasing @private @protected @public @try @property @end @throw @catch @finally @autoreleasepool @synthesize @dynamic @selector @optional @required @encode @package @import @defs @compatibility_alias __bridge __bridge_transfer __bridge_retained __bridge_retain __covariant __contravariant __kindof _Nonnull _Nullable _Null_unspecified __FUNCTION__ __PRETTY_FUNCTION__ __attribute__ getter setter retain unsafe_unretained nonnull nullable null_unspecified null_resettable class instancetype NS_DESIGNATED_INITIALIZER NS_UNAVAILABLE NS_REQUIRES_SUPER NS_RETURNS_INNER_POINTER NS_INLINE NS_AVAILABLE NS_DEPRECATED NS_ENUM NS_OPTIONS NS_SWIFT_UNAVAILABLE NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_END NS_REFINED_FOR_SWIFT NS_SWIFT_NAME NS_SWIFT_NOTHROW NS_DURING NS_HANDLER NS_ENDHANDLER NS_VALUERETURN NS_VOIDRETURN",literal:"false true FALSE TRUE nil YES NO NULL",built_in:"BOOL dispatch_once_t dispatch_queue_t dispatch_sync dispatch_async dispatch_once"},illegal:"</",contains:[{className:"built_in",begin:"\\b(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)\\w+"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.C_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,{className:"string",variants:[{begin:'@"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]}]},{className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{"meta-keyword":"if else elif endif define undef warning error line pragma ifdef ifndef include"},contains:[{begin:/\\\n/,relevance:0},e.inherit(e.QUOTE_STRING_MODE,{className:"meta-string"}),{className:"meta-string",begin:/<.*?>/,end:/$/,illegal:"\\n"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{className:"class",begin:"("+_.keyword.split(" ").join("|")+")\\b",end:"({|$)",excludeEnd:!0,keywords:_,contains:[e.UNDERSCORE_TITLE_MODE]},{begin:"\\."+e.UNDERSCORE_IDENT_RE,relevance:0}]}}}());hljs.registerLanguage("apache",function(){"use strict";return function(e){var n={className:"number",begin:"\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?"};return{name:"Apache config",aliases:["apacheconf"],case_insensitive:!0,contains:[e.HASH_COMMENT_MODE,{className:"section",begin:"</?",end:">",contains:[n,{className:"number",begin:":\\d{1,5}"},e.inherit(e.QUOTE_STRING_MODE,{relevance:0})]},{className:"attribute",begin:/\w+/,relevance:0,keywords:{nomarkup:"order deny allow setenv rewriterule rewriteengine rewritecond documentroot sethandler errordocument loadmodule options header listen serverroot servername"},starts:{end:/$/,relevance:0,keywords:{literal:"on off all deny allow"},contains:[{className:"meta",begin:"\\s\\[",end:"\\]$"},{className:"variable",begin:"[\\$%]\\{",end:"\\}",contains:["self",{className:"number",begin:"[\\$%]\\d+"}]},n,{className:"number",begin:"\\d+"},e.QUOTE_STRING_MODE]}}],illegal:/\S/}}}());hljs.registerLanguage("java",function(){"use strict";function e(e){return e?"string"==typeof e?e:e.source:null}function n(e){return a("(",e,")?")}function a(...n){return n.map(n=>e(n)).join("")}function s(...n){return"("+n.map(n=>e(n)).join("|")+")"}return function(e){var t="false synchronized int abstract float private char boolean var static null if const for true while long strictfp finally protected import native final void enum else break transient catch instanceof byte super volatile case assert short package default double public try this switch continue throws protected public private module requires exports do",i={className:"meta",begin:"@[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*",contains:[{begin:/\(/,end:/\)/,contains:["self"]}]},r=e=>a("[",e,"]+([",e,"_]*[",e,"]+)?"),c={className:"number",variants:[{begin:`\\b(0[bB]${r("01")})[lL]?`},{begin:`\\b(0${r("0-7")})[dDfFlL]?`},{begin:a(/\b0[xX]/,s(a(r("a-fA-F0-9"),/\./,r("a-fA-F0-9")),a(r("a-fA-F0-9"),/\.?/),a(/\./,r("a-fA-F0-9"))),/([pP][+-]?(\d+))?/,/[fFdDlL]?/)},{begin:a(/\b/,s(a(/\d*\./,r("\\d")),r("\\d")),/[eE][+-]?[\d]+[dDfF]?/)},{begin:a(/\b/,r(/\d/),n(/\.?/),n(r(/\d/)),/[dDfFlL]?/)}],relevance:0};return{name:"Java",aliases:["jsp"],keywords:t,illegal:/<\/|#/,contains:[e.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{begin:/\w+@/,relevance:0},{className:"doctag",begin:"@[A-Za-z]+"}]}),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{className:"class",beginKeywords:"class interface",end:/[{;=]/,excludeEnd:!0,keywords:"class interface",illegal:/[:"\[\]]/,contains:[{beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"new throw return else",relevance:0},{className:"function",begin:"([À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*(<[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*(\\s*,\\s*[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*)*>)?\\s+)+"+e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,end:/[{;=]/,excludeEnd:!0,keywords:t,contains:[{begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"params",begin:/\(/,end:/\)/,keywords:t,relevance:0,contains:[i,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE]},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},c,i]}}}());hljs.registerLanguage("x86asm",function(){"use strict";return function(s){return{name:"Intel x86 Assembly",case_insensitive:!0,keywords:{$pattern:"[.%]?"+s.IDENT_RE,keyword:"lock rep repe repz repne repnz xaquire xrelease bnd nobnd aaa aad aam aas adc add and arpl bb0_reset bb1_reset bound bsf bsr bswap bt btc btr bts call cbw cdq cdqe clc cld cli clts cmc cmp cmpsb cmpsd cmpsq cmpsw cmpxchg cmpxchg486 cmpxchg8b cmpxchg16b cpuid cpu_read cpu_write cqo cwd cwde daa das dec div dmint emms enter equ f2xm1 fabs fadd faddp fbld fbstp fchs fclex fcmovb fcmovbe fcmove fcmovnb fcmovnbe fcmovne fcmovnu fcmovu fcom fcomi fcomip fcomp fcompp fcos fdecstp fdisi fdiv fdivp fdivr fdivrp femms feni ffree ffreep fiadd ficom ficomp fidiv fidivr fild fimul fincstp finit fist fistp fisttp fisub fisubr fld fld1 fldcw fldenv fldl2e fldl2t fldlg2 fldln2 fldpi fldz fmul fmulp fnclex fndisi fneni fninit fnop fnsave fnstcw fnstenv fnstsw fpatan fprem fprem1 fptan frndint frstor fsave fscale fsetpm fsin fsincos fsqrt fst fstcw fstenv fstp fstsw fsub fsubp fsubr fsubrp ftst fucom fucomi fucomip fucomp fucompp fxam fxch fxtract fyl2x fyl2xp1 hlt ibts icebp idiv imul in inc incbin insb insd insw int int01 int1 int03 int3 into invd invpcid invlpg invlpga iret iretd iretq iretw jcxz jecxz jrcxz jmp jmpe lahf lar lds lea leave les lfence lfs lgdt lgs lidt lldt lmsw loadall loadall286 lodsb lodsd lodsq lodsw loop loope loopne loopnz loopz lsl lss ltr mfence monitor mov movd movq movsb movsd movsq movsw movsx movsxd movzx mul mwait neg nop not or out outsb outsd outsw packssdw packsswb packuswb paddb paddd paddsb paddsiw paddsw paddusb paddusw paddw pand pandn pause paveb pavgusb pcmpeqb pcmpeqd pcmpeqw pcmpgtb pcmpgtd pcmpgtw pdistib pf2id pfacc pfadd pfcmpeq pfcmpge pfcmpgt pfmax pfmin pfmul pfrcp pfrcpit1 pfrcpit2 pfrsqit1 pfrsqrt pfsub pfsubr pi2fd pmachriw pmaddwd pmagw pmulhriw pmulhrwa pmulhrwc pmulhw pmullw pmvgezb pmvlzb pmvnzb pmvzb pop popa popad popaw popf popfd popfq popfw por prefetch prefetchw pslld psllq psllw psrad psraw psrld psrlq psrlw psubb psubd psubsb psubsiw psubsw psubusb psubusw psubw punpckhbw punpckhdq punpckhwd punpcklbw punpckldq punpcklwd push pusha pushad pushaw pushf pushfd pushfq pushfw pxor rcl rcr rdshr rdmsr rdpmc rdtsc rdtscp ret retf retn rol ror rdm rsdc rsldt rsm rsts sahf sal salc sar sbb scasb scasd scasq scasw sfence sgdt shl shld shr shrd sidt sldt skinit smi smint smintold smsw stc std sti stosb stosd stosq stosw str sub svdc svldt svts swapgs syscall sysenter sysexit sysret test ud0 ud1 ud2b ud2 ud2a umov verr verw fwait wbinvd wrshr wrmsr xadd xbts xchg xlatb xlat xor cmove cmovz cmovne cmovnz cmova cmovnbe cmovae cmovnb cmovb cmovnae cmovbe cmovna cmovg cmovnle cmovge cmovnl cmovl cmovnge cmovle cmovng cmovc cmovnc cmovo cmovno cmovs cmovns cmovp cmovpe cmovnp cmovpo je jz jne jnz ja jnbe jae jnb jb jnae jbe jna jg jnle jge jnl jl jnge jle jng jc jnc jo jno js jns jpo jnp jpe jp sete setz setne setnz seta setnbe setae setnb setnc setb setnae setcset setbe setna setg setnle setge setnl setl setnge setle setng sets setns seto setno setpe setp setpo setnp addps addss andnps andps cmpeqps cmpeqss cmpleps cmpless cmpltps cmpltss cmpneqps cmpneqss cmpnleps cmpnless cmpnltps cmpnltss cmpordps cmpordss cmpunordps cmpunordss cmpps cmpss comiss cvtpi2ps cvtps2pi cvtsi2ss cvtss2si cvttps2pi cvttss2si divps divss ldmxcsr maxps maxss minps minss movaps movhps movlhps movlps movhlps movmskps movntps movss movups mulps mulss orps rcpps rcpss rsqrtps rsqrtss shufps sqrtps sqrtss stmxcsr subps subss ucomiss unpckhps unpcklps xorps fxrstor fxrstor64 fxsave fxsave64 xgetbv xsetbv xsave xsave64 xsaveopt xsaveopt64 xrstor xrstor64 prefetchnta prefetcht0 prefetcht1 prefetcht2 maskmovq movntq pavgb pavgw pextrw pinsrw pmaxsw pmaxub pminsw pminub pmovmskb pmulhuw psadbw pshufw pf2iw pfnacc pfpnacc pi2fw pswapd maskmovdqu clflush movntdq movnti movntpd movdqa movdqu movdq2q movq2dq paddq pmuludq pshufd pshufhw pshuflw pslldq psrldq psubq punpckhqdq punpcklqdq addpd addsd andnpd andpd cmpeqpd cmpeqsd cmplepd cmplesd cmpltpd cmpltsd cmpneqpd cmpneqsd cmpnlepd cmpnlesd cmpnltpd cmpnltsd cmpordpd cmpordsd cmpunordpd cmpunordsd cmppd comisd cvtdq2pd cvtdq2ps cvtpd2dq cvtpd2pi cvtpd2ps cvtpi2pd cvtps2dq cvtps2pd cvtsd2si cvtsd2ss cvtsi2sd cvtss2sd cvttpd2pi cvttpd2dq cvttps2dq cvttsd2si divpd divsd maxpd maxsd minpd minsd movapd movhpd movlpd movmskpd movupd mulpd mulsd orpd shufpd sqrtpd sqrtsd subpd subsd ucomisd unpckhpd unpcklpd xorpd addsubpd addsubps haddpd haddps hsubpd hsubps lddqu movddup movshdup movsldup clgi stgi vmcall vmclear vmfunc vmlaunch vmload vmmcall vmptrld vmptrst vmread vmresume vmrun vmsave vmwrite vmxoff vmxon invept invvpid pabsb pabsw pabsd palignr phaddw phaddd phaddsw phsubw phsubd phsubsw pmaddubsw pmulhrsw pshufb psignb psignw psignd extrq insertq movntsd movntss lzcnt blendpd blendps blendvpd blendvps dppd dpps extractps insertps movntdqa mpsadbw packusdw pblendvb pblendw pcmpeqq pextrb pextrd pextrq phminposuw pinsrb pinsrd pinsrq pmaxsb pmaxsd pmaxud pmaxuw pminsb pminsd pminud pminuw pmovsxbw pmovsxbd pmovsxbq pmovsxwd pmovsxwq pmovsxdq pmovzxbw pmovzxbd pmovzxbq pmovzxwd pmovzxwq pmovzxdq pmuldq pmulld ptest roundpd roundps roundsd roundss crc32 pcmpestri pcmpestrm pcmpistri pcmpistrm pcmpgtq popcnt getsec pfrcpv pfrsqrtv movbe aesenc aesenclast aesdec aesdeclast aesimc aeskeygenassist vaesenc vaesenclast vaesdec vaesdeclast vaesimc vaeskeygenassist vaddpd vaddps vaddsd vaddss vaddsubpd vaddsubps vandpd vandps vandnpd vandnps vblendpd vblendps vblendvpd vblendvps vbroadcastss vbroadcastsd vbroadcastf128 vcmpeq_ospd vcmpeqpd vcmplt_ospd vcmpltpd vcmple_ospd vcmplepd vcmpunord_qpd vcmpunordpd vcmpneq_uqpd vcmpneqpd vcmpnlt_uspd vcmpnltpd vcmpnle_uspd vcmpnlepd vcmpord_qpd vcmpordpd vcmpeq_uqpd vcmpnge_uspd vcmpngepd vcmpngt_uspd vcmpngtpd vcmpfalse_oqpd vcmpfalsepd vcmpneq_oqpd vcmpge_ospd vcmpgepd vcmpgt_ospd vcmpgtpd vcmptrue_uqpd vcmptruepd vcmplt_oqpd vcmple_oqpd vcmpunord_spd vcmpneq_uspd vcmpnlt_uqpd vcmpnle_uqpd vcmpord_spd vcmpeq_uspd vcmpnge_uqpd vcmpngt_uqpd vcmpfalse_ospd vcmpneq_ospd vcmpge_oqpd vcmpgt_oqpd vcmptrue_uspd vcmppd vcmpeq_osps vcmpeqps vcmplt_osps vcmpltps vcmple_osps vcmpleps vcmpunord_qps vcmpunordps vcmpneq_uqps vcmpneqps vcmpnlt_usps vcmpnltps vcmpnle_usps vcmpnleps vcmpord_qps vcmpordps vcmpeq_uqps vcmpnge_usps vcmpngeps vcmpngt_usps vcmpngtps vcmpfalse_oqps vcmpfalseps vcmpneq_oqps vcmpge_osps vcmpgeps vcmpgt_osps vcmpgtps vcmptrue_uqps vcmptrueps vcmplt_oqps vcmple_oqps vcmpunord_sps vcmpneq_usps vcmpnlt_uqps vcmpnle_uqps vcmpord_sps vcmpeq_usps vcmpnge_uqps vcmpngt_uqps vcmpfalse_osps vcmpneq_osps vcmpge_oqps vcmpgt_oqps vcmptrue_usps vcmpps vcmpeq_ossd vcmpeqsd vcmplt_ossd vcmpltsd vcmple_ossd vcmplesd vcmpunord_qsd vcmpunordsd vcmpneq_uqsd vcmpneqsd vcmpnlt_ussd vcmpnltsd vcmpnle_ussd vcmpnlesd vcmpord_qsd vcmpordsd vcmpeq_uqsd vcmpnge_ussd vcmpngesd vcmpngt_ussd vcmpngtsd vcmpfalse_oqsd vcmpfalsesd vcmpneq_oqsd vcmpge_ossd vcmpgesd vcmpgt_ossd vcmpgtsd vcmptrue_uqsd vcmptruesd vcmplt_oqsd vcmple_oqsd vcmpunord_ssd vcmpneq_ussd vcmpnlt_uqsd vcmpnle_uqsd vcmpord_ssd vcmpeq_ussd vcmpnge_uqsd vcmpngt_uqsd vcmpfalse_ossd vcmpneq_ossd vcmpge_oqsd vcmpgt_oqsd vcmptrue_ussd vcmpsd vcmpeq_osss vcmpeqss vcmplt_osss vcmpltss vcmple_osss vcmpless vcmpunord_qss vcmpunordss vcmpneq_uqss vcmpneqss vcmpnlt_usss vcmpnltss vcmpnle_usss vcmpnless vcmpord_qss vcmpordss vcmpeq_uqss vcmpnge_usss vcmpngess vcmpngt_usss vcmpngtss vcmpfalse_oqss vcmpfalsess vcmpneq_oqss vcmpge_osss vcmpgess vcmpgt_osss vcmpgtss vcmptrue_uqss vcmptruess vcmplt_oqss vcmple_oqss vcmpunord_sss vcmpneq_usss vcmpnlt_uqss vcmpnle_uqss vcmpord_sss vcmpeq_usss vcmpnge_uqss vcmpngt_uqss vcmpfalse_osss vcmpneq_osss vcmpge_oqss vcmpgt_oqss vcmptrue_usss vcmpss vcomisd vcomiss vcvtdq2pd vcvtdq2ps vcvtpd2dq vcvtpd2ps vcvtps2dq vcvtps2pd vcvtsd2si vcvtsd2ss vcvtsi2sd vcvtsi2ss vcvtss2sd vcvtss2si vcvttpd2dq vcvttps2dq vcvttsd2si vcvttss2si vdivpd vdivps vdivsd vdivss vdppd vdpps vextractf128 vextractps vhaddpd vhaddps vhsubpd vhsubps vinsertf128 vinsertps vlddqu vldqqu vldmxcsr vmaskmovdqu vmaskmovps vmaskmovpd vmaxpd vmaxps vmaxsd vmaxss vminpd vminps vminsd vminss vmovapd vmovaps vmovd vmovq vmovddup vmovdqa vmovqqa vmovdqu vmovqqu vmovhlps vmovhpd vmovhps vmovlhps vmovlpd vmovlps vmovmskpd vmovmskps vmovntdq vmovntqq vmovntdqa vmovntpd vmovntps vmovsd vmovshdup vmovsldup vmovss vmovupd vmovups vmpsadbw vmulpd vmulps vmulsd vmulss vorpd vorps vpabsb vpabsw vpabsd vpacksswb vpackssdw vpackuswb vpackusdw vpaddb vpaddw vpaddd vpaddq vpaddsb vpaddsw vpaddusb vpaddusw vpalignr vpand vpandn vpavgb vpavgw vpblendvb vpblendw vpcmpestri vpcmpestrm vpcmpistri vpcmpistrm vpcmpeqb vpcmpeqw vpcmpeqd vpcmpeqq vpcmpgtb vpcmpgtw vpcmpgtd vpcmpgtq vpermilpd vpermilps vperm2f128 vpextrb vpextrw vpextrd vpextrq vphaddw vphaddd vphaddsw vphminposuw vphsubw vphsubd vphsubsw vpinsrb vpinsrw vpinsrd vpinsrq vpmaddwd vpmaddubsw vpmaxsb vpmaxsw vpmaxsd vpmaxub vpmaxuw vpmaxud vpminsb vpminsw vpminsd vpminub vpminuw vpminud vpmovmskb vpmovsxbw vpmovsxbd vpmovsxbq vpmovsxwd vpmovsxwq vpmovsxdq vpmovzxbw vpmovzxbd vpmovzxbq vpmovzxwd vpmovzxwq vpmovzxdq vpmulhuw vpmulhrsw vpmulhw vpmullw vpmulld vpmuludq vpmuldq vpor vpsadbw vpshufb vpshufd vpshufhw vpshuflw vpsignb vpsignw vpsignd vpslldq vpsrldq vpsllw vpslld vpsllq vpsraw vpsrad vpsrlw vpsrld vpsrlq vptest vpsubb vpsubw vpsubd vpsubq vpsubsb vpsubsw vpsubusb vpsubusw vpunpckhbw vpunpckhwd vpunpckhdq vpunpckhqdq vpunpcklbw vpunpcklwd vpunpckldq vpunpcklqdq vpxor vrcpps vrcpss vrsqrtps vrsqrtss vroundpd vroundps vroundsd vroundss vshufpd vshufps vsqrtpd vsqrtps vsqrtsd vsqrtss vstmxcsr vsubpd vsubps vsubsd vsubss vtestps vtestpd vucomisd vucomiss vunpckhpd vunpckhps vunpcklpd vunpcklps vxorpd vxorps vzeroall vzeroupper pclmullqlqdq pclmulhqlqdq pclmullqhqdq pclmulhqhqdq pclmulqdq vpclmullqlqdq vpclmulhqlqdq vpclmullqhqdq vpclmulhqhqdq vpclmulqdq vfmadd132ps vfmadd132pd vfmadd312ps vfmadd312pd vfmadd213ps vfmadd213pd vfmadd123ps vfmadd123pd vfmadd231ps vfmadd231pd vfmadd321ps vfmadd321pd vfmaddsub132ps vfmaddsub132pd vfmaddsub312ps vfmaddsub312pd vfmaddsub213ps vfmaddsub213pd vfmaddsub123ps vfmaddsub123pd vfmaddsub231ps vfmaddsub231pd vfmaddsub321ps vfmaddsub321pd vfmsub132ps vfmsub132pd vfmsub312ps vfmsub312pd vfmsub213ps vfmsub213pd vfmsub123ps vfmsub123pd vfmsub231ps vfmsub231pd vfmsub321ps vfmsub321pd vfmsubadd132ps vfmsubadd132pd vfmsubadd312ps vfmsubadd312pd vfmsubadd213ps vfmsubadd213pd vfmsubadd123ps vfmsubadd123pd vfmsubadd231ps vfmsubadd231pd vfmsubadd321ps vfmsubadd321pd vfnmadd132ps vfnmadd132pd vfnmadd312ps vfnmadd312pd vfnmadd213ps vfnmadd213pd vfnmadd123ps vfnmadd123pd vfnmadd231ps vfnmadd231pd vfnmadd321ps vfnmadd321pd vfnmsub132ps vfnmsub132pd vfnmsub312ps vfnmsub312pd vfnmsub213ps vfnmsub213pd vfnmsub123ps vfnmsub123pd vfnmsub231ps vfnmsub231pd vfnmsub321ps vfnmsub321pd vfmadd132ss vfmadd132sd vfmadd312ss vfmadd312sd vfmadd213ss vfmadd213sd vfmadd123ss vfmadd123sd vfmadd231ss vfmadd231sd vfmadd321ss vfmadd321sd vfmsub132ss vfmsub132sd vfmsub312ss vfmsub312sd vfmsub213ss vfmsub213sd vfmsub123ss vfmsub123sd vfmsub231ss vfmsub231sd vfmsub321ss vfmsub321sd vfnmadd132ss vfnmadd132sd vfnmadd312ss vfnmadd312sd vfnmadd213ss vfnmadd213sd vfnmadd123ss vfnmadd123sd vfnmadd231ss vfnmadd231sd vfnmadd321ss vfnmadd321sd vfnmsub132ss vfnmsub132sd vfnmsub312ss vfnmsub312sd vfnmsub213ss vfnmsub213sd vfnmsub123ss vfnmsub123sd vfnmsub231ss vfnmsub231sd vfnmsub321ss vfnmsub321sd rdfsbase rdgsbase rdrand wrfsbase wrgsbase vcvtph2ps vcvtps2ph adcx adox rdseed clac stac xstore xcryptecb xcryptcbc xcryptctr xcryptcfb xcryptofb montmul xsha1 xsha256 llwpcb slwpcb lwpval lwpins vfmaddpd vfmaddps vfmaddsd vfmaddss vfmaddsubpd vfmaddsubps vfmsubaddpd vfmsubaddps vfmsubpd vfmsubps vfmsubsd vfmsubss vfnmaddpd vfnmaddps vfnmaddsd vfnmaddss vfnmsubpd vfnmsubps vfnmsubsd vfnmsubss vfrczpd vfrczps vfrczsd vfrczss vpcmov vpcomb vpcomd vpcomq vpcomub vpcomud vpcomuq vpcomuw vpcomw vphaddbd vphaddbq vphaddbw vphadddq vphaddubd vphaddubq vphaddubw vphaddudq vphadduwd vphadduwq vphaddwd vphaddwq vphsubbw vphsubdq vphsubwd vpmacsdd vpmacsdqh vpmacsdql vpmacssdd vpmacssdqh vpmacssdql vpmacsswd vpmacssww vpmacswd vpmacsww vpmadcsswd vpmadcswd vpperm vprotb vprotd vprotq vprotw vpshab vpshad vpshaq vpshaw vpshlb vpshld vpshlq vpshlw vbroadcasti128 vpblendd vpbroadcastb vpbroadcastw vpbroadcastd vpbroadcastq vpermd vpermpd vpermps vpermq vperm2i128 vextracti128 vinserti128 vpmaskmovd vpmaskmovq vpsllvd vpsllvq vpsravd vpsrlvd vpsrlvq vgatherdpd vgatherqpd vgatherdps vgatherqps vpgatherdd vpgatherqd vpgatherdq vpgatherqq xabort xbegin xend xtest andn bextr blci blcic blsi blsic blcfill blsfill blcmsk blsmsk blsr blcs bzhi mulx pdep pext rorx sarx shlx shrx tzcnt tzmsk t1mskc valignd valignq vblendmpd vblendmps vbroadcastf32x4 vbroadcastf64x4 vbroadcasti32x4 vbroadcasti64x4 vcompresspd vcompressps vcvtpd2udq vcvtps2udq vcvtsd2usi vcvtss2usi vcvttpd2udq vcvttps2udq vcvttsd2usi vcvttss2usi vcvtudq2pd vcvtudq2ps vcvtusi2sd vcvtusi2ss vexpandpd vexpandps vextractf32x4 vextractf64x4 vextracti32x4 vextracti64x4 vfixupimmpd vfixupimmps vfixupimmsd vfixupimmss vgetexppd vgetexpps vgetexpsd vgetexpss vgetmantpd vgetmantps vgetmantsd vgetmantss vinsertf32x4 vinsertf64x4 vinserti32x4 vinserti64x4 vmovdqa32 vmovdqa64 vmovdqu32 vmovdqu64 vpabsq vpandd vpandnd vpandnq vpandq vpblendmd vpblendmq vpcmpltd vpcmpled vpcmpneqd vpcmpnltd vpcmpnled vpcmpd vpcmpltq vpcmpleq vpcmpneqq vpcmpnltq vpcmpnleq vpcmpq vpcmpequd vpcmpltud vpcmpleud vpcmpnequd vpcmpnltud vpcmpnleud vpcmpud vpcmpequq vpcmpltuq vpcmpleuq vpcmpnequq vpcmpnltuq vpcmpnleuq vpcmpuq vpcompressd vpcompressq vpermi2d vpermi2pd vpermi2ps vpermi2q vpermt2d vpermt2pd vpermt2ps vpermt2q vpexpandd vpexpandq vpmaxsq vpmaxuq vpminsq vpminuq vpmovdb vpmovdw vpmovqb vpmovqd vpmovqw vpmovsdb vpmovsdw vpmovsqb vpmovsqd vpmovsqw vpmovusdb vpmovusdw vpmovusqb vpmovusqd vpmovusqw vpord vporq vprold vprolq vprolvd vprolvq vprord vprorq vprorvd vprorvq vpscatterdd vpscatterdq vpscatterqd vpscatterqq vpsraq vpsravq vpternlogd vpternlogq vptestmd vptestmq vptestnmd vptestnmq vpxord vpxorq vrcp14pd vrcp14ps vrcp14sd vrcp14ss vrndscalepd vrndscaleps vrndscalesd vrndscaless vrsqrt14pd vrsqrt14ps vrsqrt14sd vrsqrt14ss vscalefpd vscalefps vscalefsd vscalefss vscatterdpd vscatterdps vscatterqpd vscatterqps vshuff32x4 vshuff64x2 vshufi32x4 vshufi64x2 kandnw kandw kmovw knotw kortestw korw kshiftlw kshiftrw kunpckbw kxnorw kxorw vpbroadcastmb2q vpbroadcastmw2d vpconflictd vpconflictq vplzcntd vplzcntq vexp2pd vexp2ps vrcp28pd vrcp28ps vrcp28sd vrcp28ss vrsqrt28pd vrsqrt28ps vrsqrt28sd vrsqrt28ss vgatherpf0dpd vgatherpf0dps vgatherpf0qpd vgatherpf0qps vgatherpf1dpd vgatherpf1dps vgatherpf1qpd vgatherpf1qps vscatterpf0dpd vscatterpf0dps vscatterpf0qpd vscatterpf0qps vscatterpf1dpd vscatterpf1dps vscatterpf1qpd vscatterpf1qps prefetchwt1 bndmk bndcl bndcu bndcn bndmov bndldx bndstx sha1rnds4 sha1nexte sha1msg1 sha1msg2 sha256rnds2 sha256msg1 sha256msg2 hint_nop0 hint_nop1 hint_nop2 hint_nop3 hint_nop4 hint_nop5 hint_nop6 hint_nop7 hint_nop8 hint_nop9 hint_nop10 hint_nop11 hint_nop12 hint_nop13 hint_nop14 hint_nop15 hint_nop16 hint_nop17 hint_nop18 hint_nop19 hint_nop20 hint_nop21 hint_nop22 hint_nop23 hint_nop24 hint_nop25 hint_nop26 hint_nop27 hint_nop28 hint_nop29 hint_nop30 hint_nop31 hint_nop32 hint_nop33 hint_nop34 hint_nop35 hint_nop36 hint_nop37 hint_nop38 hint_nop39 hint_nop40 hint_nop41 hint_nop42 hint_nop43 hint_nop44 hint_nop45 hint_nop46 hint_nop47 hint_nop48 hint_nop49 hint_nop50 hint_nop51 hint_nop52 hint_nop53 hint_nop54 hint_nop55 hint_nop56 hint_nop57 hint_nop58 hint_nop59 hint_nop60 hint_nop61 hint_nop62 hint_nop63",built_in:"ip eip rip al ah bl bh cl ch dl dh sil dil bpl spl r8b r9b r10b r11b r12b r13b r14b r15b ax bx cx dx si di bp sp r8w r9w r10w r11w r12w r13w r14w r15w eax ebx ecx edx esi edi ebp esp eip r8d r9d r10d r11d r12d r13d r14d r15d rax rbx rcx rdx rsi rdi rbp rsp r8 r9 r10 r11 r12 r13 r14 r15 cs ds es fs gs ss st st0 st1 st2 st3 st4 st5 st6 st7 mm0 mm1 mm2 mm3 mm4 mm5 mm6 mm7 xmm0 xmm1 xmm2 xmm3 xmm4 xmm5 xmm6 xmm7 xmm8 xmm9 xmm10 xmm11 xmm12 xmm13 xmm14 xmm15 xmm16 xmm17 xmm18 xmm19 xmm20 xmm21 xmm22 xmm23 xmm24 xmm25 xmm26 xmm27 xmm28 xmm29 xmm30 xmm31 ymm0 ymm1 ymm2 ymm3 ymm4 ymm5 ymm6 ymm7 ymm8 ymm9 ymm10 ymm11 ymm12 ymm13 ymm14 ymm15 ymm16 ymm17 ymm18 ymm19 ymm20 ymm21 ymm22 ymm23 ymm24 ymm25 ymm26 ymm27 ymm28 ymm29 ymm30 ymm31 zmm0 zmm1 zmm2 zmm3 zmm4 zmm5 zmm6 zmm7 zmm8 zmm9 zmm10 zmm11 zmm12 zmm13 zmm14 zmm15 zmm16 zmm17 zmm18 zmm19 zmm20 zmm21 zmm22 zmm23 zmm24 zmm25 zmm26 zmm27 zmm28 zmm29 zmm30 zmm31 k0 k1 k2 k3 k4 k5 k6 k7 bnd0 bnd1 bnd2 bnd3 cr0 cr1 cr2 cr3 cr4 cr8 dr0 dr1 dr2 dr3 dr8 tr3 tr4 tr5 tr6 tr7 r0 r1 r2 r3 r4 r5 r6 r7 r0b r1b r2b r3b r4b r5b r6b r7b r0w r1w r2w r3w r4w r5w r6w r7w r0d r1d r2d r3d r4d r5d r6d r7d r0h r1h r2h r3h r0l r1l r2l r3l r4l r5l r6l r7l r8l r9l r10l r11l r12l r13l r14l r15l db dw dd dq dt ddq do dy dz resb resw resd resq rest resdq reso resy resz incbin equ times byte word dword qword nosplit rel abs seg wrt strict near far a32 ptr",meta:"%define %xdefine %+ %undef %defstr %deftok %assign %strcat %strlen %substr %rotate %elif %else %endif %if %ifmacro %ifctx %ifidn %ifidni %ifid %ifnum %ifstr %iftoken %ifempty %ifenv %error %warning %fatal %rep %endrep %include %push %pop %repl %pathsearch %depend %use %arg %stacksize %local %line %comment %endcomment .nolist __FILE__ __LINE__ __SECT__ __BITS__ __OUTPUT_FORMAT__ __DATE__ __TIME__ __DATE_NUM__ __TIME_NUM__ __UTC_DATE__ __UTC_TIME__ __UTC_DATE_NUM__ __UTC_TIME_NUM__ __PASS__ struc endstruc istruc at iend align alignb sectalign daz nodaz up down zero default option assume public bits use16 use32 use64 default section segment absolute extern global common cpu float __utf16__ __utf16le__ __utf16be__ __utf32__ __utf32le__ __utf32be__ __float8__ __float16__ __float32__ __float64__ __float80m__ __float80e__ __float128l__ __float128h__ __Infinity__ __QNaN__ __SNaN__ Inf NaN QNaN SNaN float8 float16 float32 float64 float80m float80e float128l float128h __FLOAT_DAZ__ __FLOAT_ROUND__ __FLOAT__"},contains:[s.COMMENT(";","$",{relevance:0}),{className:"number",variants:[{begin:"\\b(?:([0-9][0-9_]*)?\\.[0-9_]*(?:[eE][+-]?[0-9_]+)?|(0[Xx])?[0-9][0-9_]*\\.?[0-9_]*(?:[pP](?:[+-]?[0-9_]+)?)?)\\b",relevance:0},{begin:"\\$[0-9][0-9A-Fa-f]*",relevance:0},{begin:"\\b(?:[0-9A-Fa-f][0-9A-Fa-f_]*[Hh]|[0-9][0-9_]*[DdTt]?|[0-7][0-7_]*[QqOo]|[0-1][0-1_]*[BbYy])\\b"},{begin:"\\b(?:0[Xx][0-9A-Fa-f_]+|0[DdTt][0-9_]+|0[QqOo][0-7_]+|0[BbYy][0-1_]+)\\b"}]},s.QUOTE_STRING_MODE,{className:"string",variants:[{begin:"'",end:"[^\\\\]'"},{begin:"`",end:"[^\\\\]`"}],relevance:0},{className:"symbol",variants:[{begin:"^\\s*[A-Za-z._?][A-Za-z0-9_$#@~.?]*(:|\\s+label)"},{begin:"^\\s*%%[A-Za-z0-9_$#@~.?]*:"}],relevance:0},{className:"subst",begin:"%[0-9]+",relevance:0},{className:"subst",begin:"%!S+",relevance:0},{className:"meta",begin:/^\s*\.[\w_-]+/}]}}}());hljs.registerLanguage("kotlin",function(){"use strict";return function(e){var n={keyword:"abstract as val var vararg get set class object open private protected public noinline crossinline dynamic final enum if else do while for when throw try catch finally import package is in fun override companion reified inline lateinit init interface annotation data sealed internal infix operator out by constructor super tailrec where const inner suspend typealias external expect actual trait volatile transient native default",built_in:"Byte Short Char Int Long Boolean Float Double Void Unit Nothing",literal:"true false null"},a={className:"symbol",begin:e.UNDERSCORE_IDENT_RE+"@"},i={className:"subst",begin:"\\${",end:"}",contains:[e.C_NUMBER_MODE]},s={className:"variable",begin:"\\$"+e.UNDERSCORE_IDENT_RE},t={className:"string",variants:[{begin:'"""',end:'"""(?=[^"])',contains:[s,i]},{begin:"'",end:"'",illegal:/\n/,contains:[e.BACKSLASH_ESCAPE]},{begin:'"',end:'"',illegal:/\n/,contains:[e.BACKSLASH_ESCAPE,s,i]}]};i.contains.push(t);var r={className:"meta",begin:"@(?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:(?:\\s*"+e.UNDERSCORE_IDENT_RE+")?"},l={className:"meta",begin:"@"+e.UNDERSCORE_IDENT_RE,contains:[{begin:/\(/,end:/\)/,contains:[e.inherit(t,{className:"meta-string"})]}]},c=e.COMMENT("/\\*","\\*/",{contains:[e.C_BLOCK_COMMENT_MODE]}),o={variants:[{className:"type",begin:e.UNDERSCORE_IDENT_RE},{begin:/\(/,end:/\)/,contains:[]}]},d=o;return d.variants[1].contains=[o],o.variants[1].contains=[d],{name:"Kotlin",aliases:["kt"],keywords:n,contains:[e.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{className:"doctag",begin:"@[A-Za-z]+"}]}),e.C_LINE_COMMENT_MODE,c,{className:"keyword",begin:/\b(break|continue|return|this)\b/,starts:{contains:[{className:"symbol",begin:/@\w+/}]}},a,r,l,{className:"function",beginKeywords:"fun",end:"[(]|$",returnBegin:!0,excludeEnd:!0,keywords:n,illegal:/fun\s+(<.*>)?[^\s\(]+(\s+[^\s\(]+)\s*=/,relevance:5,contains:[{begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"type",begin:/</,end:/>/,keywords:"reified",relevance:0},{className:"params",begin:/\(/,end:/\)/,endsParent:!0,keywords:n,relevance:0,contains:[{begin:/:/,end:/[=,\/]/,endsWithParent:!0,contains:[o,e.C_LINE_COMMENT_MODE,c],relevance:0},e.C_LINE_COMMENT_MODE,c,r,l,t,e.C_NUMBER_MODE]},c]},{className:"class",beginKeywords:"class interface trait",end:/[:\{(]|$/,excludeEnd:!0,illegal:"extends implements",contains:[{beginKeywords:"public protected internal private constructor"},e.UNDERSCORE_TITLE_MODE,{className:"type",begin:/</,end:/>/,excludeBegin:!0,excludeEnd:!0,relevance:0},{className:"type",begin:/[,:]\s*/,end:/[<\(,]|$/,excludeBegin:!0,returnEnd:!0},r,l]},t,{className:"meta",begin:"^#!/usr/bin/env",end:"$",illegal:"\n"},{className:"number",begin:"\\b(0[bB]([01]+[01_]+[01]+|[01]+)|0[xX]([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)|(([\\d]+[\\d_]+[\\d]+|[\\d]+)(\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))?|\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))([eE][-+]?\\d+)?)[lLfF]?",relevance:0}]}}}());hljs.registerLanguage("armasm",function(){"use strict";return function(s){const e={variants:[s.COMMENT("^[ \\t]*(?=#)","$",{relevance:0,excludeBegin:!0}),s.COMMENT("[;@]","$",{relevance:0}),s.C_LINE_COMMENT_MODE,s.C_BLOCK_COMMENT_MODE]};return{name:"ARM Assembly",case_insensitive:!0,aliases:["arm"],keywords:{$pattern:"\\.?"+s.IDENT_RE,meta:".2byte .4byte .align .ascii .asciz .balign .byte .code .data .else .end .endif .endm .endr .equ .err .exitm .extern .global .hword .if .ifdef .ifndef .include .irp .long .macro .rept .req .section .set .skip .space .text .word .arm .thumb .code16 .code32 .force_thumb .thumb_func .ltorg ALIAS ALIGN ARM AREA ASSERT ATTR CN CODE CODE16 CODE32 COMMON CP DATA DCB DCD DCDU DCDO DCFD DCFDU DCI DCQ DCQU DCW DCWU DN ELIF ELSE END ENDFUNC ENDIF ENDP ENTRY EQU EXPORT EXPORTAS EXTERN FIELD FILL FUNCTION GBLA GBLL GBLS GET GLOBAL IF IMPORT INCBIN INCLUDE INFO KEEP LCLA LCLL LCLS LTORG MACRO MAP MEND MEXIT NOFP OPT PRESERVE8 PROC QN READONLY RELOC REQUIRE REQUIRE8 RLIST FN ROUT SETA SETL SETS SN SPACE SUBT THUMB THUMBX TTL WHILE WEND ",built_in:"r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 r15 pc lr sp ip sl sb fp a1 a2 a3 a4 v1 v2 v3 v4 v5 v6 v7 v8 f0 f1 f2 f3 f4 f5 f6 f7 p0 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 q0 q1 q2 q3 q4 q5 q6 q7 q8 q9 q10 q11 q12 q13 q14 q15 cpsr_c cpsr_x cpsr_s cpsr_f cpsr_cx cpsr_cxs cpsr_xs cpsr_xsf cpsr_sf cpsr_cxsf spsr_c spsr_x spsr_s spsr_f spsr_cx spsr_cxs spsr_xs spsr_xsf spsr_sf spsr_cxsf s0 s1 s2 s3 s4 s5 s6 s7 s8 s9 s10 s11 s12 s13 s14 s15 s16 s17 s18 s19 s20 s21 s22 s23 s24 s25 s26 s27 s28 s29 s30 s31 d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 d10 d11 d12 d13 d14 d15 d16 d17 d18 d19 d20 d21 d22 d23 d24 d25 d26 d27 d28 d29 d30 d31 {PC} {VAR} {TRUE} {FALSE} {OPT} {CONFIG} {ENDIAN} {CODESIZE} {CPU} {FPU} {ARCHITECTURE} {PCSTOREOFFSET} {ARMASM_VERSION} {INTER} {ROPI} {RWPI} {SWST} {NOSWST} . @"},contains:[{className:"keyword",begin:"\\b(adc|(qd?|sh?|u[qh]?)?add(8|16)?|usada?8|(q|sh?|u[qh]?)?(as|sa)x|and|adrl?|sbc|rs[bc]|asr|b[lx]?|blx|bxj|cbn?z|tb[bh]|bic|bfc|bfi|[su]bfx|bkpt|cdp2?|clz|clrex|cmp|cmn|cpsi[ed]|cps|setend|dbg|dmb|dsb|eor|isb|it[te]{0,3}|lsl|lsr|ror|rrx|ldm(([id][ab])|f[ds])?|ldr((s|ex)?[bhd])?|movt?|mvn|mra|mar|mul|[us]mull|smul[bwt][bt]|smu[as]d|smmul|smmla|mla|umlaal|smlal?([wbt][bt]|d)|mls|smlsl?[ds]|smc|svc|sev|mia([bt]{2}|ph)?|mrr?c2?|mcrr2?|mrs|msr|orr|orn|pkh(tb|bt)|rbit|rev(16|sh)?|sel|[su]sat(16)?|nop|pop|push|rfe([id][ab])?|stm([id][ab])?|str(ex)?[bhd]?|(qd?)?sub|(sh?|q|u[qh]?)?sub(8|16)|[su]xt(a?h|a?b(16)?)|srs([id][ab])?|swpb?|swi|smi|tst|teq|wfe|wfi|yield)(eq|ne|cs|cc|mi|pl|vs|vc|hi|ls|ge|lt|gt|le|al|hs|lo)?[sptrx]?(?=\\s)"},e,s.QUOTE_STRING_MODE,{className:"string",begin:"'",end:"[^\\\\]'",relevance:0},{className:"title",begin:"\\|",end:"\\|",illegal:"\\n",relevance:0},{className:"number",variants:[{begin:"[#$=]?0x[0-9a-f]+"},{begin:"[#$=]?0b[01]+"},{begin:"[#$=]\\d+"},{begin:"\\b\\d+"}],relevance:0},{className:"symbol",variants:[{begin:"^[ \\t]*[a-z_\\.\\$][a-z0-9_\\.\\$]+:"},{begin:"^[a-z_\\.\\$][a-z0-9_\\.\\$]+"},{begin:"[=#]\\w+"}],relevance:0}]}}}());hljs.registerLanguage("go",function(){"use strict";return function(e){var n={keyword:"break default func interface select case map struct chan else goto package switch const fallthrough if range type continue for import return var go defer bool byte complex64 complex128 float32 float64 int8 int16 int32 int64 string uint8 uint16 uint32 uint64 int uint uintptr rune",literal:"true false iota nil",built_in:"append cap close complex copy imag len make new panic print println real recover delete"};return{name:"Go",aliases:["golang"],keywords:n,illegal:"</",contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"string",variants:[e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,{begin:"`",end:"`"}]},{className:"number",variants:[{begin:e.C_NUMBER_RE+"[i]",relevance:1},e.C_NUMBER_MODE]},{begin:/:=/},{className:"function",beginKeywords:"func",end:"\\s*(\\{|$)",excludeEnd:!0,contains:[e.TITLE_MODE,{className:"params",begin:/\(/,end:/\)/,keywords:n,illegal:/["']/}]}]}}}());hljs.registerLanguage("diff",function(){"use strict";return function(e){return{name:"Diff",aliases:["patch"],contains:[{className:"meta",relevance:10,variants:[{begin:/^@@ +\-\d+,\d+ +\+\d+,\d+ +@@$/},{begin:/^\*\*\* +\d+,\d+ +\*\*\*\*$/},{begin:/^\-\-\- +\d+,\d+ +\-\-\-\-$/}]},{className:"comment",variants:[{begin:/Index: /,end:/$/},{begin:/={3,}/,end:/$/},{begin:/^\-{3}/,end:/$/},{begin:/^\*{3} /,end:/$/},{begin:/^\+{3}/,end:/$/},{begin:/^\*{15}$/}]},{className:"addition",begin:"^\\+",end:"$"},{className:"deletion",begin:"^\\-",end:"$"},{className:"addition",begin:"^\\!",end:"$"}]}}}());hljs.registerLanguage("python",function(){"use strict";return function(e){var n={keyword:"and elif is global as in if from raise for except finally print import pass return exec else break not with class assert yield try while continue del or def lambda async await nonlocal|10",built_in:"Ellipsis NotImplemented",literal:"False None True"},a={className:"meta",begin:/^(>>>|\.\.\.) /},i={className:"subst",begin:/\{/,end:/\}/,keywords:n,illegal:/#/},s={begin:/\{\{/,relevance:0},r={className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[{begin:/(u|b)?r?'''/,end:/'''/,contains:[e.BACKSLASH_ESCAPE,a],relevance:10},{begin:/(u|b)?r?"""/,end:/"""/,contains:[e.BACKSLASH_ESCAPE,a],relevance:10},{begin:/(fr|rf|f)'''/,end:/'''/,contains:[e.BACKSLASH_ESCAPE,a,s,i]},{begin:/(fr|rf|f)"""/,end:/"""/,contains:[e.BACKSLASH_ESCAPE,a,s,i]},{begin:/(u|r|ur)'/,end:/'/,relevance:10},{begin:/(u|r|ur)"/,end:/"/,relevance:10},{begin:/(b|br)'/,end:/'/},{begin:/(b|br)"/,end:/"/},{begin:/(fr|rf|f)'/,end:/'/,contains:[e.BACKSLASH_ESCAPE,s,i]},{begin:/(fr|rf|f)"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,s,i]},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},l={className:"number",relevance:0,variants:[{begin:e.BINARY_NUMBER_RE+"[lLjJ]?"},{begin:"\\b(0o[0-7]+)[lLjJ]?"},{begin:e.C_NUMBER_RE+"[lLjJ]?"}]},t={className:"params",variants:[{begin:/\(\s*\)/,skip:!0,className:null},{begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,contains:["self",a,l,r,e.HASH_COMMENT_MODE]}]};return i.contains=[r,l,a],{name:"Python",aliases:["py","gyp","ipython"],keywords:n,illegal:/(<\/|->|\?)|=>/,contains:[a,l,{beginKeywords:"if",relevance:0},r,e.HASH_COMMENT_MODE,{variants:[{className:"function",beginKeywords:"def"},{className:"class",beginKeywords:"class"}],end:/:/,illegal:/[${=;\n,]/,contains:[e.UNDERSCORE_TITLE_MODE,t,{begin:/->/,endsWithParent:!0,keywords:"None"}]},{className:"meta",begin:/^[\t ]*@/,end:/$/},{begin:/\b(print|exec)\(/}]}}}());hljs.registerLanguage("shell",function(){"use strict";return function(s){return{name:"Shell Session",aliases:["console"],contains:[{className:"meta",begin:"^\\s{0,3}[/\\w\\d\\[\\]()@-]*[>%$#]",starts:{end:"$",subLanguage:"bash"}}]}}}());hljs.registerLanguage("scala",function(){"use strict";return function(e){var n={className:"subst",variants:[{begin:"\\$[A-Za-z0-9_]+"},{begin:"\\${",end:"}"}]},a={className:"string",variants:[{begin:'"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},{begin:'"""',end:'"""',relevance:10},{begin:'[a-z]+"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE,n]},{className:"string",begin:'[a-z]+"""',end:'"""',contains:[n],relevance:10}]},s={className:"type",begin:"\\b[A-Z][A-Za-z0-9_]*",relevance:0},t={className:"title",begin:/[^0-9\n\t "'(),.`{}\[\]:;][^\n\t "'(),.`{}\[\]:;]+|[^0-9\n\t "'(),.`{}\[\]:;=]/,relevance:0},i={className:"class",beginKeywords:"class object trait type",end:/[:={\[\n;]/,excludeEnd:!0,contains:[{beginKeywords:"extends with",relevance:10},{begin:/\[/,end:/\]/,excludeBegin:!0,excludeEnd:!0,relevance:0,contains:[s]},{className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,relevance:0,contains:[s]},t]},l={className:"function",beginKeywords:"def",end:/[:={\[(\n;]/,excludeEnd:!0,contains:[t]};return{name:"Scala",keywords:{literal:"true false null",keyword:"type yield lazy override def with val var sealed abstract private trait object if forSome for while throw finally protected extends import final return else break new catch super class case package default try this match continue throws implicit"},contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,{className:"symbol",begin:"'\\w[\\w\\d_]*(?!')"},s,l,i,e.C_NUMBER_MODE,{className:"meta",begin:"@[A-Za-z]+"}]}}}());hljs.registerLanguage("julia",function(){"use strict";return function(e){var r="[A-Za-z_\\u00A1-\\uFFFF][A-Za-z_0-9\\u00A1-\\uFFFF]*",t={$pattern:r,keyword:"in isa where baremodule begin break catch ccall const continue do else elseif end export false finally for function global if import importall let local macro module quote return true try using while type immutable abstract bitstype typealias ",literal:"true false ARGS C_NULL DevNull ENDIAN_BOM ENV I Inf Inf16 Inf32 Inf64 InsertionSort JULIA_HOME LOAD_PATH MergeSort NaN NaN16 NaN32 NaN64 PROGRAM_FILE QuickSort RoundDown RoundFromZero RoundNearest RoundNearestTiesAway RoundNearestTiesUp RoundToZero RoundUp STDERR STDIN STDOUT VERSION catalan e|0 eu|0 eulergamma golden im nothing pi γ π φ ",built_in:"ANY AbstractArray AbstractChannel AbstractFloat AbstractMatrix AbstractRNG AbstractSerializer AbstractSet AbstractSparseArray AbstractSparseMatrix AbstractSparseVector AbstractString AbstractUnitRange AbstractVecOrMat AbstractVector Any ArgumentError Array AssertionError Associative Base64DecodePipe Base64EncodePipe Bidiagonal BigFloat BigInt BitArray BitMatrix BitVector Bool BoundsError BufferStream CachingPool CapturedException CartesianIndex CartesianRange Cchar Cdouble Cfloat Channel Char Cint Cintmax_t Clong Clonglong ClusterManager Cmd CodeInfo Colon Complex Complex128 Complex32 Complex64 CompositeException Condition ConjArray ConjMatrix ConjVector Cptrdiff_t Cshort Csize_t Cssize_t Cstring Cuchar Cuint Cuintmax_t Culong Culonglong Cushort Cwchar_t Cwstring DataType Date DateFormat DateTime DenseArray DenseMatrix DenseVecOrMat DenseVector Diagonal Dict DimensionMismatch Dims DirectIndexString Display DivideError DomainError EOFError EachLine Enum Enumerate ErrorException Exception ExponentialBackOff Expr Factorization FileMonitor Float16 Float32 Float64 Function Future GlobalRef GotoNode HTML Hermitian IO IOBuffer IOContext IOStream IPAddr IPv4 IPv6 IndexCartesian IndexLinear IndexStyle InexactError InitError Int Int128 Int16 Int32 Int64 Int8 IntSet Integer InterruptException InvalidStateException Irrational KeyError LabelNode LinSpace LineNumberNode LoadError LowerTriangular MIME Matrix MersenneTwister Method MethodError MethodTable Module NTuple NewvarNode NullException Nullable Number ObjectIdDict OrdinalRange OutOfMemoryError OverflowError Pair ParseError PartialQuickSort PermutedDimsArray Pipe PollingFileWatcher ProcessExitedException Ptr QuoteNode RandomDevice Range RangeIndex Rational RawFD ReadOnlyMemoryError Real ReentrantLock Ref Regex RegexMatch RemoteChannel RemoteException RevString RoundingMode RowVector SSAValue SegmentationFault SerializationState Set SharedArray SharedMatrix SharedVector Signed SimpleVector Slot SlotNumber SparseMatrixCSC SparseVector StackFrame StackOverflowError StackTrace StepRange StepRangeLen StridedArray StridedMatrix StridedVecOrMat StridedVector String SubArray SubString SymTridiagonal Symbol Symmetric SystemError TCPSocket Task Text TextDisplay Timer Tridiagonal Tuple Type TypeError TypeMapEntry TypeMapLevel TypeName TypeVar TypedSlot UDPSocket UInt UInt128 UInt16 UInt32 UInt64 UInt8 UndefRefError UndefVarError UnicodeError UniformScaling Union UnionAll UnitRange Unsigned UpperTriangular Val Vararg VecElement VecOrMat Vector VersionNumber Void WeakKeyDict WeakRef WorkerConfig WorkerPool "},a={keywords:t,illegal:/<\//},n={className:"subst",begin:/\$\(/,end:/\)/,keywords:t},o={className:"variable",begin:"\\$"+r},i={className:"string",contains:[e.BACKSLASH_ESCAPE,n,o],variants:[{begin:/\w*"""/,end:/"""\w*/,relevance:10},{begin:/\w*"/,end:/"\w*/}]},l={className:"string",contains:[e.BACKSLASH_ESCAPE,n,o],begin:"`",end:"`"},s={className:"meta",begin:"@"+r};return a.name="Julia",a.contains=[{className:"number",begin:/(\b0x[\d_]*(\.[\d_]*)?|0x\.\d[\d_]*)p[-+]?\d+|\b0[box][a-fA-F0-9][a-fA-F0-9_]*|(\b\d[\d_]*(\.[\d_]*)?|\.\d[\d_]*)([eEfF][-+]?\d+)?/,relevance:0},{className:"string",begin:/'(.|\\[xXuU][a-zA-Z0-9]+)'/},i,l,s,{className:"comment",variants:[{begin:"#=",end:"=#",relevance:10},{begin:"#",end:"$"}]},e.HASH_COMMENT_MODE,{className:"keyword",begin:"\\b(((abstract|primitive)\\s+)type|(mutable\\s+)?struct)\\b"},{begin:/<:/}],n.contains=a.contains,a}}());hljs.registerLanguage("php-template",function(){"use strict";return function(n){return{name:"PHP template",subLanguage:"xml",contains:[{begin:/<\?(php|=)?/,end:/\?>/,subLanguage:"php",contains:[{begin:"/\\*",end:"\\*/",skip:!0},{begin:'b"',end:'"',skip:!0},{begin:"b'",end:"'",skip:!0},n.inherit(n.APOS_STRING_MODE,{illegal:null,className:null,contains:null,skip:!0}),n.inherit(n.QUOTE_STRING_MODE,{illegal:null,className:null,contains:null,skip:!0})]}]}}}());hljs.registerLanguage("scss",function(){"use strict";return function(e){var t={className:"variable",begin:"(\\$[a-zA-Z-][a-zA-Z0-9_-]*)\\b"},i={className:"number",begin:"#[0-9A-Fa-f]+"};return e.CSS_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,e.C_BLOCK_COMMENT_MODE,{name:"SCSS",case_insensitive:!0,illegal:"[=/|']",contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"selector-id",begin:"\\#[A-Za-z0-9_-]+",relevance:0},{className:"selector-class",begin:"\\.[A-Za-z0-9_-]+",relevance:0},{className:"selector-attr",begin:"\\[",end:"\\]",illegal:"$"},{className:"selector-tag",begin:"\\b(a|abbr|acronym|address|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|command|datalist|dd|del|details|dfn|div|dl|dt|em|embed|fieldset|figcaption|figure|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|keygen|label|legend|li|link|map|mark|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|rp|rt|ruby|samp|script|section|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video)\\b",relevance:0},{className:"selector-pseudo",begin:":(visited|valid|root|right|required|read-write|read-only|out-range|optional|only-of-type|only-child|nth-of-type|nth-last-of-type|nth-last-child|nth-child|not|link|left|last-of-type|last-child|lang|invalid|indeterminate|in-range|hover|focus|first-of-type|first-line|first-letter|first-child|first|enabled|empty|disabled|default|checked|before|after|active)"},{className:"selector-pseudo",begin:"::(after|before|choices|first-letter|first-line|repeat-index|repeat-item|selection|value)"},t,{className:"attribute",begin:"\\b(src|z-index|word-wrap|word-spacing|word-break|width|widows|white-space|visibility|vertical-align|unicode-bidi|transition-timing-function|transition-property|transition-duration|transition-delay|transition|transform-style|transform-origin|transform|top|text-underline-position|text-transform|text-shadow|text-rendering|text-overflow|text-indent|text-decoration-style|text-decoration-line|text-decoration-color|text-decoration|text-align-last|text-align|tab-size|table-layout|right|resize|quotes|position|pointer-events|perspective-origin|perspective|page-break-inside|page-break-before|page-break-after|padding-top|padding-right|padding-left|padding-bottom|padding|overflow-y|overflow-x|overflow-wrap|overflow|outline-width|outline-style|outline-offset|outline-color|outline|orphans|order|opacity|object-position|object-fit|normal|none|nav-up|nav-right|nav-left|nav-index|nav-down|min-width|min-height|max-width|max-height|mask|marks|margin-top|margin-right|margin-left|margin-bottom|margin|list-style-type|list-style-position|list-style-image|list-style|line-height|letter-spacing|left|justify-content|initial|inherit|ime-mode|image-orientation|image-resolution|image-rendering|icon|hyphens|height|font-weight|font-variant-ligatures|font-variant|font-style|font-stretch|font-size-adjust|font-size|font-language-override|font-kerning|font-feature-settings|font-family|font|float|flex-wrap|flex-shrink|flex-grow|flex-flow|flex-direction|flex-basis|flex|filter|empty-cells|display|direction|cursor|counter-reset|counter-increment|content|column-width|column-span|column-rule-width|column-rule-style|column-rule-color|column-rule|column-gap|column-fill|column-count|columns|color|clip-path|clip|clear|caption-side|break-inside|break-before|break-after|box-sizing|box-shadow|box-decoration-break|bottom|border-width|border-top-width|border-top-style|border-top-right-radius|border-top-left-radius|border-top-color|border-top|border-style|border-spacing|border-right-width|border-right-style|border-right-color|border-right|border-radius|border-left-width|border-left-style|border-left-color|border-left|border-image-width|border-image-source|border-image-slice|border-image-repeat|border-image-outset|border-image|border-color|border-collapse|border-bottom-width|border-bottom-style|border-bottom-right-radius|border-bottom-left-radius|border-bottom-color|border-bottom|border|background-size|background-repeat|background-position|background-origin|background-image|background-color|background-clip|background-attachment|background-blend-mode|background|backface-visibility|auto|animation-timing-function|animation-play-state|animation-name|animation-iteration-count|animation-fill-mode|animation-duration|animation-direction|animation-delay|animation|align-self|align-items|align-content)\\b",illegal:"[^\\s]"},{begin:"\\b(whitespace|wait|w-resize|visible|vertical-text|vertical-ideographic|uppercase|upper-roman|upper-alpha|underline|transparent|top|thin|thick|text|text-top|text-bottom|tb-rl|table-header-group|table-footer-group|sw-resize|super|strict|static|square|solid|small-caps|separate|se-resize|scroll|s-resize|rtl|row-resize|ridge|right|repeat|repeat-y|repeat-x|relative|progress|pointer|overline|outside|outset|oblique|nowrap|not-allowed|normal|none|nw-resize|no-repeat|no-drop|newspaper|ne-resize|n-resize|move|middle|medium|ltr|lr-tb|lowercase|lower-roman|lower-alpha|loose|list-item|line|line-through|line-edge|lighter|left|keep-all|justify|italic|inter-word|inter-ideograph|inside|inset|inline|inline-block|inherit|inactive|ideograph-space|ideograph-parenthesis|ideograph-numeric|ideograph-alpha|horizontal|hidden|help|hand|groove|fixed|ellipsis|e-resize|double|dotted|distribute|distribute-space|distribute-letter|distribute-all-lines|disc|disabled|default|decimal|dashed|crosshair|collapse|col-resize|circle|char|center|capitalize|break-word|break-all|bottom|both|bolder|bold|block|bidi-override|below|baseline|auto|always|all-scroll|absolute|table|table-cell)\\b"},{begin:":",end:";",contains:[t,i,e.CSS_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,{className:"meta",begin:"!important"}]},{begin:"@(page|font-face)",lexemes:"@[a-z-]+",keywords:"@page @font-face"},{begin:"@",end:"[{;]",returnBegin:!0,keywords:"and or not only",contains:[{begin:"@[a-z-]+",className:"keyword"},t,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,i,e.CSS_NUMBER_MODE]}]}}}());hljs.registerLanguage("r",function(){"use strict";return function(e){var n="([a-zA-Z]|\\.[a-zA-Z.])[a-zA-Z0-9._]*";return{name:"R",contains:[e.HASH_COMMENT_MODE,{begin:n,keywords:{$pattern:n,keyword:"function if in break next repeat else for return switch while try tryCatch stop warning require library attach detach source setMethod setGeneric setGroupGeneric setClass ...",literal:"NULL NA TRUE FALSE T F Inf NaN NA_integer_|10 NA_real_|10 NA_character_|10 NA_complex_|10"},relevance:0},{className:"number",begin:"0[xX][0-9a-fA-F]+[Li]?\\b",relevance:0},{className:"number",begin:"\\d+(?:[eE][+\\-]?\\d*)?L\\b",relevance:0},{className:"number",begin:"\\d+\\.(?!\\d)(?:i\\b)?",relevance:0},{className:"number",begin:"\\d+(?:\\.\\d*)?(?:[eE][+\\-]?\\d*)?i?\\b",relevance:0},{className:"number",begin:"\\.\\d+(?:[eE][+\\-]?\\d*)?i?\\b",relevance:0},{begin:"`",end:"`",relevance:0},{className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[{begin:'"',end:'"'},{begin:"'",end:"'"}]}]}}}());hljs.registerLanguage("sql",function(){"use strict";return function(e){var t=e.COMMENT("--","$");return{name:"SQL",case_insensitive:!0,illegal:/[<>{}*]/,contains:[{beginKeywords:"begin end start commit rollback savepoint lock alter create drop rename call delete do handler insert load replace select truncate update set show pragma grant merge describe use explain help declare prepare execute deallocate release unlock purge reset change stop analyze cache flush optimize repair kill install uninstall checksum restore check backup revoke comment values with",end:/;/,endsWithParent:!0,keywords:{$pattern:/[\w\.]+/,keyword:"as abort abs absolute acc acce accep accept access accessed accessible account acos action activate add addtime admin administer advanced advise aes_decrypt aes_encrypt after agent aggregate ali alia alias all allocate allow alter always analyze ancillary and anti any anydata anydataset anyschema anytype apply archive archived archivelog are as asc ascii asin assembly assertion associate asynchronous at atan atn2 attr attri attrib attribu attribut attribute attributes audit authenticated authentication authid authors auto autoallocate autodblink autoextend automatic availability avg backup badfile basicfile before begin beginning benchmark between bfile bfile_base big bigfile bin binary_double binary_float binlog bit_and bit_count bit_length bit_or bit_xor bitmap blob_base block blocksize body both bound bucket buffer_cache buffer_pool build bulk by byte byteordermark bytes cache caching call calling cancel capacity cascade cascaded case cast catalog category ceil ceiling chain change changed char_base char_length character_length characters characterset charindex charset charsetform charsetid check checksum checksum_agg child choose chr chunk class cleanup clear client clob clob_base clone close cluster_id cluster_probability cluster_set clustering coalesce coercibility col collate collation collect colu colum column column_value columns columns_updated comment commit compact compatibility compiled complete composite_limit compound compress compute concat concat_ws concurrent confirm conn connec connect connect_by_iscycle connect_by_isleaf connect_by_root connect_time connection consider consistent constant constraint constraints constructor container content contents context contributors controlfile conv convert convert_tz corr corr_k corr_s corresponding corruption cos cost count count_big counted covar_pop covar_samp cpu_per_call cpu_per_session crc32 create creation critical cross cube cume_dist curdate current current_date current_time current_timestamp current_user cursor curtime customdatum cycle data database databases datafile datafiles datalength date_add date_cache date_format date_sub dateadd datediff datefromparts datename datepart datetime2fromparts day day_to_second dayname dayofmonth dayofweek dayofyear days db_role_change dbtimezone ddl deallocate declare decode decompose decrement decrypt deduplicate def defa defau defaul default defaults deferred defi defin define degrees delayed delegate delete delete_all delimited demand dense_rank depth dequeue des_decrypt des_encrypt des_key_file desc descr descri describ describe descriptor deterministic diagnostics difference dimension direct_load directory disable disable_all disallow disassociate discardfile disconnect diskgroup distinct distinctrow distribute distributed div do document domain dotnet double downgrade drop dumpfile duplicate duration each edition editionable editions element ellipsis else elsif elt empty enable enable_all enclosed encode encoding encrypt end end-exec endian enforced engine engines enqueue enterprise entityescaping eomonth error errors escaped evalname evaluate event eventdata events except exception exceptions exchange exclude excluding execu execut execute exempt exists exit exp expire explain explode export export_set extended extent external external_1 external_2 externally extract failed failed_login_attempts failover failure far fast feature_set feature_value fetch field fields file file_name_convert filesystem_like_logging final finish first first_value fixed flash_cache flashback floor flush following follows for forall force foreign form forma format found found_rows freelist freelists freepools fresh from from_base64 from_days ftp full function general generated get get_format get_lock getdate getutcdate global global_name globally go goto grant grants greatest group group_concat group_id grouping grouping_id groups gtid_subtract guarantee guard handler hash hashkeys having hea head headi headin heading heap help hex hierarchy high high_priority hosts hour hours http id ident_current ident_incr ident_seed identified identity idle_time if ifnull ignore iif ilike ilm immediate import in include including increment index indexes indexing indextype indicator indices inet6_aton inet6_ntoa inet_aton inet_ntoa infile initial initialized initially initrans inmemory inner innodb input insert install instance instantiable instr interface interleaved intersect into invalidate invisible is is_free_lock is_ipv4 is_ipv4_compat is_not is_not_null is_used_lock isdate isnull isolation iterate java join json json_exists keep keep_duplicates key keys kill language large last last_day last_insert_id last_value lateral lax lcase lead leading least leaves left len lenght length less level levels library like like2 like4 likec limit lines link list listagg little ln load load_file lob lobs local localtime localtimestamp locate locator lock locked log log10 log2 logfile logfiles logging logical logical_reads_per_call logoff logon logs long loop low low_priority lower lpad lrtrim ltrim main make_set makedate maketime managed management manual map mapping mask master master_pos_wait match matched materialized max maxextents maximize maxinstances maxlen maxlogfiles maxloghistory maxlogmembers maxsize maxtrans md5 measures median medium member memcompress memory merge microsecond mid migration min minextents minimum mining minus minute minutes minvalue missing mod mode model modification modify module monitoring month months mount move movement multiset mutex name name_const names nan national native natural nav nchar nclob nested never new newline next nextval no no_write_to_binlog noarchivelog noaudit nobadfile nocheck nocompress nocopy nocycle nodelay nodiscardfile noentityescaping noguarantee nokeep nologfile nomapping nomaxvalue nominimize nominvalue nomonitoring none noneditionable nonschema noorder nopr nopro noprom nopromp noprompt norely noresetlogs noreverse normal norowdependencies noschemacheck noswitch not nothing notice notnull notrim novalidate now nowait nth_value nullif nulls num numb numbe nvarchar nvarchar2 object ocicoll ocidate ocidatetime ociduration ociinterval ociloblocator ocinumber ociref ocirefcursor ocirowid ocistring ocitype oct octet_length of off offline offset oid oidindex old on online only opaque open operations operator optimal optimize option optionally or oracle oracle_date oradata ord ordaudio orddicom orddoc order ordimage ordinality ordvideo organization orlany orlvary out outer outfile outline output over overflow overriding package pad parallel parallel_enable parameters parent parse partial partition partitions pascal passing password password_grace_time password_lock_time password_reuse_max password_reuse_time password_verify_function patch path patindex pctincrease pctthreshold pctused pctversion percent percent_rank percentile_cont percentile_disc performance period period_add period_diff permanent physical pi pipe pipelined pivot pluggable plugin policy position post_transaction pow power pragma prebuilt precedes preceding precision prediction prediction_cost prediction_details prediction_probability prediction_set prepare present preserve prior priority private private_sga privileges procedural procedure procedure_analyze processlist profiles project prompt protection public publishingservername purge quarter query quick quiesce quota quotename radians raise rand range rank raw read reads readsize rebuild record records recover recovery recursive recycle redo reduced ref reference referenced references referencing refresh regexp_like register regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy reject rekey relational relative relaylog release release_lock relies_on relocate rely rem remainder rename repair repeat replace replicate replication required reset resetlogs resize resource respect restore restricted result result_cache resumable resume retention return returning returns reuse reverse revoke right rlike role roles rollback rolling rollup round row row_count rowdependencies rowid rownum rows rtrim rules safe salt sample save savepoint sb1 sb2 sb4 scan schema schemacheck scn scope scroll sdo_georaster sdo_topo_geometry search sec_to_time second seconds section securefile security seed segment select self semi sequence sequential serializable server servererror session session_user sessions_per_user set sets settings sha sha1 sha2 share shared shared_pool short show shrink shutdown si_averagecolor si_colorhistogram si_featurelist si_positionalcolor si_stillimage si_texture siblings sid sign sin size size_t sizes skip slave sleep smalldatetimefromparts smallfile snapshot some soname sort soundex source space sparse spfile split sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_small_result sql_variant_property sqlcode sqldata sqlerror sqlname sqlstate sqrt square standalone standby start starting startup statement static statistics stats_binomial_test stats_crosstab stats_ks_test stats_mode stats_mw_test stats_one_way_anova stats_t_test_ stats_t_test_indep stats_t_test_one stats_t_test_paired stats_wsr_test status std stddev stddev_pop stddev_samp stdev stop storage store stored str str_to_date straight_join strcmp strict string struct stuff style subdate subpartition subpartitions substitutable substr substring subtime subtring_index subtype success sum suspend switch switchoffset switchover sync synchronous synonym sys sys_xmlagg sysasm sysaux sysdate sysdatetimeoffset sysdba sysoper system system_user sysutcdatetime table tables tablespace tablesample tan tdo template temporary terminated tertiary_weights test than then thread through tier ties time time_format time_zone timediff timefromparts timeout timestamp timestampadd timestampdiff timezone_abbr timezone_minute timezone_region to to_base64 to_date to_days to_seconds todatetimeoffset trace tracking transaction transactional translate translation treat trigger trigger_nestlevel triggers trim truncate try_cast try_convert try_parse type ub1 ub2 ub4 ucase unarchived unbounded uncompress under undo unhex unicode uniform uninstall union unique unix_timestamp unknown unlimited unlock unnest unpivot unrecoverable unsafe unsigned until untrusted unusable unused update updated upgrade upped upper upsert url urowid usable usage use use_stored_outlines user user_data user_resources users using utc_date utc_timestamp uuid uuid_short validate validate_password_strength validation valist value values var var_samp varcharc vari varia variab variabl variable variables variance varp varraw varrawc varray verify version versions view virtual visible void wait wallet warning warnings week weekday weekofyear wellformed when whene whenev wheneve whenever where while whitespace window with within without work wrapped xdb xml xmlagg xmlattributes xmlcast xmlcolattval xmlelement xmlexists xmlforest xmlindex xmlnamespaces xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltype xor year year_to_month years yearweek",literal:"true false null unknown",built_in:"array bigint binary bit blob bool boolean char character date dec decimal float int int8 integer interval number numeric real record serial serial8 smallint text time timestamp tinyint varchar varchar2 varying void"},contains:[{className:"string",begin:"'",end:"'",contains:[{begin:"''"}]},{className:"string",begin:'"',end:'"',contains:[{begin:'""'}]},{className:"string",begin:"`",end:"`"},e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE,t,e.HASH_COMMENT_MODE]},e.C_BLOCK_COMMENT_MODE,t,e.HASH_COMMENT_MODE]}}}());hljs.registerLanguage("c",function(){"use strict";return function(e){var n=e.getLanguage("c-like").rawDefinition();return n.name="C",n.aliases=["c","h"],n}}());hljs.registerLanguage("json",function(){"use strict";return function(n){var e={literal:"true false null"},i=[n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE],t=[n.QUOTE_STRING_MODE,n.C_NUMBER_MODE],a={end:",",endsWithParent:!0,excludeEnd:!0,contains:t,keywords:e},l={begin:"{",end:"}",contains:[{className:"attr",begin:/"/,end:/"/,contains:[n.BACKSLASH_ESCAPE],illegal:"\\n"},n.inherit(a,{begin:/:/})].concat(i),illegal:"\\S"},s={begin:"\\[",end:"\\]",contains:[n.inherit(a)],illegal:"\\S"};return t.push(l,s),i.forEach((function(n){t.push(n)})),{name:"JSON",contains:t,keywords:e,illegal:"\\S"}}}());hljs.registerLanguage("python-repl",function(){"use strict";return function(n){return{aliases:["pycon"],contains:[{className:"meta",starts:{end:/ |$/,starts:{end:"$",subLanguage:"python"}},variants:[{begin:/^>>>(?=[ ]|$)/},{begin:/^\.\.\.(?=[ ]|$)/}]}]}}}());hljs.registerLanguage("markdown",function(){"use strict";return function(n){const e={begin:"<",end:">",subLanguage:"xml",relevance:0},a={begin:"\\[.+?\\][\\(\\[].*?[\\)\\]]",returnBegin:!0,contains:[{className:"string",begin:"\\[",end:"\\]",excludeBegin:!0,returnEnd:!0,relevance:0},{className:"link",begin:"\\]\\(",end:"\\)",excludeBegin:!0,excludeEnd:!0},{className:"symbol",begin:"\\]\\[",end:"\\]",excludeBegin:!0,excludeEnd:!0}],relevance:10},i={className:"strong",contains:[],variants:[{begin:/_{2}/,end:/_{2}/},{begin:/\*{2}/,end:/\*{2}/}]},s={className:"emphasis",contains:[],variants:[{begin:/\*(?!\*)/,end:/\*/},{begin:/_(?!_)/,end:/_/,relevance:0}]};i.contains.push(s),s.contains.push(i);var c=[e,a];return i.contains=i.contains.concat(c),s.contains=s.contains.concat(c),{name:"Markdown",aliases:["md","mkdown","mkd"],contains:[{className:"section",variants:[{begin:"^#{1,6}",end:"$",contains:c=c.concat(i,s)},{begin:"(?=^.+?\\n[=-]{2,}$)",contains:[{begin:"^[=-]*$"},{begin:"^",end:"\\n",contains:c}]}]},e,{className:"bullet",begin:"^[ \t]*([*+-]|(\\d+\\.))(?=\\s+)",end:"\\s+",excludeEnd:!0},i,s,{className:"quote",begin:"^>\\s+",contains:c,end:"$"},{className:"code",variants:[{begin:"(`{3,})(.|\\n)*?\\1`*[ ]*"},{begin:"(~{3,})(.|\\n)*?\\1~*[ ]*"},{begin:"```",end:"```+[ ]*$"},{begin:"~~~",end:"~~~+[ ]*$"},{begin:"`.+?`"},{begin:"(?=^( {4}|\\t))",contains:[{begin:"^( {4}|\\t)",end:"(\\n)$"}],relevance:0}]},{begin:"^[-\\*]{3,}",end:"$"},a,{begin:/^\[[^\n]+\]:/,returnBegin:!0,contains:[{className:"symbol",begin:/\[/,end:/\]/,excludeBegin:!0,excludeEnd:!0},{className:"link",begin:/:\s*/,end:/$/,excludeBegin:!0}]}]}}}());hljs.registerLanguage("javascript",function(){"use strict";const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],a=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["arguments","this","super","console","window","document","localStorage","module","global"],["Intl","DataView","Number","Math","Date","String","RegExp","Object","Function","Boolean","Error","Symbol","Set","Map","WeakSet","WeakMap","Proxy","Reflect","JSON","Promise","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Float32Array","Array","Uint8Array","Uint8ClampedArray","ArrayBuffer"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"]);function s(e){return r("(?=",e,")")}function r(...e){return e.map(e=>(function(e){return e?"string"==typeof e?e:e.source:null})(e)).join("")}return function(t){var i="[A-Za-z$_][0-9A-Za-z$_]*",c={begin:/<[A-Za-z0-9\\._:-]+/,end:/\/[A-Za-z0-9\\._:-]+>|\/>/},o={$pattern:"[A-Za-z$_][0-9A-Za-z$_]*",keyword:e.join(" "),literal:n.join(" "),built_in:a.join(" ")},l={className:"number",variants:[{begin:"\\b(0[bB][01]+)n?"},{begin:"\\b(0[oO][0-7]+)n?"},{begin:t.C_NUMBER_RE+"n?"}],relevance:0},E={className:"subst",begin:"\\$\\{",end:"\\}",keywords:o,contains:[]},d={begin:"html`",end:"",starts:{end:"`",returnEnd:!1,contains:[t.BACKSLASH_ESCAPE,E],subLanguage:"xml"}},g={begin:"css`",end:"",starts:{end:"`",returnEnd:!1,contains:[t.BACKSLASH_ESCAPE,E],subLanguage:"css"}},u={className:"string",begin:"`",end:"`",contains:[t.BACKSLASH_ESCAPE,E]};E.contains=[t.APOS_STRING_MODE,t.QUOTE_STRING_MODE,d,g,u,l,t.REGEXP_MODE];var b=E.contains.concat([{begin:/\(/,end:/\)/,contains:["self"].concat(E.contains,[t.C_BLOCK_COMMENT_MODE,t.C_LINE_COMMENT_MODE])},t.C_BLOCK_COMMENT_MODE,t.C_LINE_COMMENT_MODE]),_={className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,contains:b};return{name:"JavaScript",aliases:["js","jsx","mjs","cjs"],keywords:o,contains:[t.SHEBANG({binary:"node",relevance:5}),{className:"meta",relevance:10,begin:/^\s*['"]use (strict|asm)['"]/},t.APOS_STRING_MODE,t.QUOTE_STRING_MODE,d,g,u,t.C_LINE_COMMENT_MODE,t.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{className:"doctag",begin:"@[A-Za-z]+",contains:[{className:"type",begin:"\\{",end:"\\}",relevance:0},{className:"variable",begin:i+"(?=\\s*(-)|$)",endsParent:!0,relevance:0},{begin:/(?=[^\n])\s/,relevance:0}]}]}),t.C_BLOCK_COMMENT_MODE,l,{begin:r(/[{,\n]\s*/,s(r(/(((\/\/.*)|(\/\*(.|\n)*\*\/))\s*)*/,i+"\\s*:"))),relevance:0,contains:[{className:"attr",begin:i+s("\\s*:"),relevance:0}]},{begin:"("+t.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",keywords:"return throw case",contains:[t.C_LINE_COMMENT_MODE,t.C_BLOCK_COMMENT_MODE,t.REGEXP_MODE,{className:"function",begin:"(\\([^(]*(\\([^(]*(\\([^(]*\\))?\\))?\\)|"+t.UNDERSCORE_IDENT_RE+")\\s*=>",returnBegin:!0,end:"\\s*=>",contains:[{className:"params",variants:[{begin:t.UNDERSCORE_IDENT_RE},{className:null,begin:/\(\s*\)/,skip:!0},{begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:o,contains:b}]}]},{begin:/,/,relevance:0},{className:"",begin:/\s/,end:/\s*/,skip:!0},{variants:[{begin:"<>",end:"</>"},{begin:c.begin,end:c.end}],subLanguage:"xml",contains:[{begin:c.begin,end:c.end,skip:!0,contains:["self"]}]}],relevance:0},{className:"function",beginKeywords:"function",end:/\{/,excludeEnd:!0,contains:[t.inherit(t.TITLE_MODE,{begin:i}),_],illegal:/\[|%/},{begin:/\$[(.]/},t.METHOD_GUARD,{className:"class",beginKeywords:"class",end:/[{;=]/,excludeEnd:!0,illegal:/[:"\[\]]/,contains:[{beginKeywords:"extends"},t.UNDERSCORE_TITLE_MODE]},{beginKeywords:"constructor",end:/\{/,excludeEnd:!0},{begin:"(get|set)\\s+(?="+i+"\\()",end:/{/,keywords:"get set",contains:[t.inherit(t.TITLE_MODE,{begin:i}),{begin:/\(\)/},_]}],illegal:/#(?!!)/}}}());hljs.registerLanguage("typescript",function(){"use strict";const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],a=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["arguments","this","super","console","window","document","localStorage","module","global"],["Intl","DataView","Number","Math","Date","String","RegExp","Object","Function","Boolean","Error","Symbol","Set","Map","WeakSet","WeakMap","Proxy","Reflect","JSON","Promise","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Float32Array","Array","Uint8Array","Uint8ClampedArray","ArrayBuffer"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"]);return function(r){var t={$pattern:"[A-Za-z$_][0-9A-Za-z$_]*",keyword:e.concat(["type","namespace","typedef","interface","public","private","protected","implements","declare","abstract","readonly"]).join(" "),literal:n.join(" "),built_in:a.concat(["any","void","number","boolean","string","object","never","enum"]).join(" ")},s={className:"meta",begin:"@[A-Za-z$_][0-9A-Za-z$_]*"},i={className:"number",variants:[{begin:"\\b(0[bB][01]+)n?"},{begin:"\\b(0[oO][0-7]+)n?"},{begin:r.C_NUMBER_RE+"n?"}],relevance:0},o={className:"subst",begin:"\\$\\{",end:"\\}",keywords:t,contains:[]},c={begin:"html`",end:"",starts:{end:"`",returnEnd:!1,contains:[r.BACKSLASH_ESCAPE,o],subLanguage:"xml"}},l={begin:"css`",end:"",starts:{end:"`",returnEnd:!1,contains:[r.BACKSLASH_ESCAPE,o],subLanguage:"css"}},E={className:"string",begin:"`",end:"`",contains:[r.BACKSLASH_ESCAPE,o]};o.contains=[r.APOS_STRING_MODE,r.QUOTE_STRING_MODE,c,l,E,i,r.REGEXP_MODE];var d={begin:"\\(",end:/\)/,keywords:t,contains:["self",r.QUOTE_STRING_MODE,r.APOS_STRING_MODE,r.NUMBER_MODE]},u={className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:t,contains:[r.C_LINE_COMMENT_MODE,r.C_BLOCK_COMMENT_MODE,s,d]};return{name:"TypeScript",aliases:["ts"],keywords:t,contains:[r.SHEBANG(),{className:"meta",begin:/^\s*['"]use strict['"]/},r.APOS_STRING_MODE,r.QUOTE_STRING_MODE,c,l,E,r.C_LINE_COMMENT_MODE,r.C_BLOCK_COMMENT_MODE,i,{begin:"("+r.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",keywords:"return throw case",contains:[r.C_LINE_COMMENT_MODE,r.C_BLOCK_COMMENT_MODE,r.REGEXP_MODE,{className:"function",begin:"(\\([^(]*(\\([^(]*(\\([^(]*\\))?\\))?\\)|"+r.UNDERSCORE_IDENT_RE+")\\s*=>",returnBegin:!0,end:"\\s*=>",contains:[{className:"params",variants:[{begin:r.UNDERSCORE_IDENT_RE},{className:null,begin:/\(\s*\)/,skip:!0},{begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:t,contains:d.contains}]}]}],relevance:0},{className:"function",beginKeywords:"function",end:/[\{;]/,excludeEnd:!0,keywords:t,contains:["self",r.inherit(r.TITLE_MODE,{begin:"[A-Za-z$_][0-9A-Za-z$_]*"}),u],illegal:/%/,relevance:0},{beginKeywords:"constructor",end:/[\{;]/,excludeEnd:!0,contains:["self",u]},{begin:/module\./,keywords:{built_in:"module"},relevance:0},{beginKeywords:"module",end:/\{/,excludeEnd:!0},{beginKeywords:"interface",end:/\{/,excludeEnd:!0,keywords:"interface extends"},{begin:/\$[(.]/},{begin:"\\."+r.IDENT_RE,relevance:0},s,d]}}}());hljs.registerLanguage("plaintext",function(){"use strict";return function(t){return{name:"Plain text",aliases:["text","txt"],disableAutodetect:!0}}}());hljs.registerLanguage("less",function(){"use strict";return function(e){var n="([\\w-]+|@{[\\w-]+})",a=[],s=[],t=function(e){return{className:"string",begin:"~?"+e+".*?"+e}},r=function(e,n,a){return{className:e,begin:n,relevance:a}},i={begin:"\\(",end:"\\)",contains:s,relevance:0};s.push(e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,t("'"),t('"'),e.CSS_NUMBER_MODE,{begin:"(url|data-uri)\\(",starts:{className:"string",end:"[\\)\\n]",excludeEnd:!0}},r("number","#[0-9A-Fa-f]+\\b"),i,r("variable","@@?[\\w-]+",10),r("variable","@{[\\w-]+}"),r("built_in","~?`[^`]*?`"),{className:"attribute",begin:"[\\w-]+\\s*:",end:":",returnBegin:!0,excludeEnd:!0},{className:"meta",begin:"!important"});var c=s.concat({begin:"{",end:"}",contains:a}),l={beginKeywords:"when",endsWithParent:!0,contains:[{beginKeywords:"and not"}].concat(s)},o={begin:n+"\\s*:",returnBegin:!0,end:"[;}]",relevance:0,contains:[{className:"attribute",begin:n,end:":",excludeEnd:!0,starts:{endsWithParent:!0,illegal:"[<=$]",relevance:0,contains:s}}]},g={className:"keyword",begin:"@(import|media|charset|font-face|(-[a-z]+-)?keyframes|supports|document|namespace|page|viewport|host)\\b",starts:{end:"[;{}]",returnEnd:!0,contains:s,relevance:0}},d={className:"variable",variants:[{begin:"@[\\w-]+\\s*:",relevance:15},{begin:"@[\\w-]+"}],starts:{end:"[;}]",returnEnd:!0,contains:c}},b={variants:[{begin:"[\\.#:&\\[>]",end:"[;{}]"},{begin:n,end:"{"}],returnBegin:!0,returnEnd:!0,illegal:"[<='$\"]",relevance:0,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,l,r("keyword","all\\b"),r("variable","@{[\\w-]+}"),r("selector-tag",n+"%?",0),r("selector-id","#"+n),r("selector-class","\\."+n,0),r("selector-tag","&",0),{className:"selector-attr",begin:"\\[",end:"\\]"},{className:"selector-pseudo",begin:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{begin:"\\(",end:"\\)",contains:c},{begin:"!important"}]};return a.push(e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,g,d,o,b),{name:"Less",case_insensitive:!0,illegal:"[=>'/<($\"]",contains:a}}}());hljs.registerLanguage("lua",function(){"use strict";return function(e){var t={begin:"\\[=*\\[",end:"\\]=*\\]",contains:["self"]},a=[e.COMMENT("--(?!\\[=*\\[)","$"),e.COMMENT("--\\[=*\\[","\\]=*\\]",{contains:[t],relevance:10})];return{name:"Lua",keywords:{$pattern:e.UNDERSCORE_IDENT_RE,literal:"true false nil",keyword:"and break do else elseif end for goto if in local not or repeat return then until while",built_in:"_G _ENV _VERSION __index __newindex __mode __call __metatable __tostring __len __gc __add __sub __mul __div __mod __pow __concat __unm __eq __lt __le assert collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstring module next pairs pcall print rawequal rawget rawset require select setfenv setmetatable tonumber tostring type unpack xpcall arg self coroutine resume yield status wrap create running debug getupvalue debug sethook getmetatable gethook setmetatable setlocal traceback setfenv getinfo setupvalue getlocal getregistry getfenv io lines write close flush open output type read stderr stdin input stdout popen tmpfile math log max acos huge ldexp pi cos tanh pow deg tan cosh sinh random randomseed frexp ceil floor rad abs sqrt modf asin min mod fmod log10 atan2 exp sin atan os exit setlocale date getenv difftime remove time clock tmpname rename execute package preload loadlib loaded loaders cpath config path seeall string sub upper len gfind rep find match char dump gmatch reverse byte format gsub lower table setn insert getn foreachi maxn foreach concat sort remove"},contains:a.concat([{className:"function",beginKeywords:"function",end:"\\)",contains:[e.inherit(e.TITLE_MODE,{begin:"([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*"}),{className:"params",begin:"\\(",endsWithParent:!0,contains:a}].concat(a)},e.C_NUMBER_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{className:"string",begin:"\\[=*\\[",end:"\\]=*\\]",contains:[t],relevance:5}])}}}());
book/theme/index.hbs+51−87
@@ -1,11 +1,11 @@
1<!DOCTYPE HTML>
1<!DOCTYPE HTML>
2−<html lang="{{ language }}" class="{{ default_theme }}" dir="{{ text_direction }}">
2+<html lang="{{ language }}" class="sidebar-visible no-js {{ default_theme }}">
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 }}">
@@ -15,9 +15,10 @@
15 <!-- Custom HTML head -->
15 <!-- Custom HTML head -->
16 {{> head}}
16 {{> head}}
17
17
18+ <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
18 <meta name="description" content="{{ description }}">
19 <meta name="description" content="{{ description }}">
19 <meta name="viewport" content="width=device-width, initial-scale=1">
20 <meta name="viewport" content="width=device-width, initial-scale=1">
20− <meta name="theme-color" content="#ffffff">
21+ <meta name="theme-color" content="#ffffff" />
21
22
22 {{#if favicon_svg}}
23 {{#if favicon_svg}}
23 <link rel="icon" href="{{ path_to_root }}favicon.svg">
24 <link rel="icon" href="{{ path_to_root }}favicon.svg">
@@ -34,6 +35,8 @@
34
35
35 <!-- Fonts -->
36 <!-- Fonts -->
36 <link rel="stylesheet" href="{{ path_to_root }}FontAwesome/css/font-awesome.css">
37 <link rel="stylesheet" href="{{ path_to_root }}FontAwesome/css/font-awesome.css">
38+ <link rel="preconnect" href="https://fonts.gstatic.com">
39+ <link href="https://fonts.googleapis.com/css2?family=Inter:wght@200;400;500;700&display=swap" rel="stylesheet">
37 {{#if copy_fonts}}
40 {{#if copy_fonts}}
38 <link rel="stylesheet" href="{{ path_to_root }}fonts/fonts.css">
41 <link rel="stylesheet" href="{{ path_to_root }}fonts/fonts.css">
39 {{/if}}
42 {{/if}}
@@ -50,19 +53,18 @@
50
53
51 {{#if mathjax_support}}
54 {{#if mathjax_support}}
52 <!-- MathJax -->
55 <!-- MathJax -->
53− <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
56+ <script async type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
54 {{/if}}
57 {{/if}}
55 </head>
58 </head>
56− <body class="sidebar-visible no-js">
59+ <body>
57− <div id="body-container">
58 <!-- Provide site root to javascript -->
60 <!-- Provide site root to javascript -->
59− <script>
61+ <script type="text/javascript">
60 var path_to_root = "{{ path_to_root }}";
62 var path_to_root = "{{ path_to_root }}";
61 var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}";
63 var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}";
62 </script>
64 </script>
63
65
64 <!-- Work around some values being stored in localStorage wrapped in quotes -->
66 <!-- Work around some values being stored in localStorage wrapped in quotes -->
65− <script>
67+ <script type="text/javascript">
66 try {
68 try {
67 var theme = localStorage.getItem('mdbook-theme');
69 var theme = localStorage.getItem('mdbook-theme');
68 var sidebar = localStorage.getItem('mdbook-sidebar');
70 var sidebar = localStorage.getItem('mdbook-sidebar');
@@ -78,34 +80,27 @@
78 </script>
80 </script>
79
81
80 <!-- Set the theme before any content is loaded, prevents flash -->
82 <!-- Set the theme before any content is loaded, prevents flash -->
81− <script>
83+ <script type="text/javascript">
82 var theme;
84 var theme;
83 try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
85 try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
84 if (theme === null || theme === undefined) { theme = default_theme; }
86 if (theme === null || theme === undefined) { theme = default_theme; }
85 var html = document.querySelector('html');
87 var html = document.querySelector('html');
88+ html.classList.remove('no-js')
86 html.classList.remove('{{ default_theme }}')
89 html.classList.remove('{{ default_theme }}')
87 html.classList.add(theme);
90 html.classList.add(theme);
88− var body = document.querySelector('body');
89− body.classList.remove('no-js')
90− body.classList.add('js');
91+ html.classList.add('js');
91 </script>
92 </script>
92
93
93− <input type="checkbox" id="sidebar-toggle-anchor" class="hidden">
94−
95 <!-- Hide / unhide sidebar before it is displayed -->
94 <!-- Hide / unhide sidebar before it is displayed -->
96− <script>
95+ <script type="text/javascript">
97− var body = document.querySelector('body');
96+ var html = document.querySelector('html');
98− var sidebar = null;
97+ var sidebar = 'hidden';
99− var sidebar_toggle = document.getElementById("sidebar-toggle-anchor");
100 if (document.body.clientWidth >= 1080) {
98 if (document.body.clientWidth >= 1080) {
101 try { sidebar = localStorage.getItem('mdbook-sidebar'); } catch(e) { }
99 try { sidebar = localStorage.getItem('mdbook-sidebar'); } catch(e) { }
102 sidebar = sidebar || 'visible';
100 sidebar = sidebar || 'visible';
103− } else {
104− sidebar = 'hidden';
105 }
101 }
106− sidebar_toggle.checked = sidebar === 'visible';
107− body.classList.remove('sidebar-visible');
102+ html.classList.remove('sidebar-visible');
108− body.classList.add("sidebar-" + sidebar);
103+ html.classList.add("sidebar-" + sidebar);
109 </script>
104 </script>
110
105
111 <nav id="sidebar" class="sidebar" aria-label="Table of contents">
106 <nav id="sidebar" class="sidebar" aria-label="Table of contents">
@@ -115,48 +110,26 @@
115 <div id="sidebar-resize-handle" class="sidebar-resize-handle"></div>
110 <div id="sidebar-resize-handle" class="sidebar-resize-handle"></div>
116 </nav>
111 </nav>
117
112
118− <!-- Track and set sidebar scroll position -->
119− <script>
120− var sidebarScrollbox = document.querySelector('#sidebar .sidebar-scrollbox');
121− sidebarScrollbox.addEventListener('click', function(e) {
122− if (e.target.tagName === 'A') {
123− sessionStorage.setItem('sidebar-scroll', sidebarScrollbox.scrollTop);
124− }
125− }, { passive: true });
126− var sidebarScrollTop = sessionStorage.getItem('sidebar-scroll');
127− sessionStorage.removeItem('sidebar-scroll');
128− if (sidebarScrollTop) {
129− // preserve sidebar scroll position when navigating via links within sidebar
130− sidebarScrollbox.scrollTop = sidebarScrollTop;
131− } else {
132− // scroll sidebar to current active section when navigating via "next/previous chapter" buttons
133− var activeSection = document.querySelector('#sidebar .active');
134− if (activeSection) {
135− activeSection.scrollIntoView({ block: 'center' });
136− }
137− }
138− </script>
139−
140 <div id="page-wrapper" class="page-wrapper">
113 <div id="page-wrapper" class="page-wrapper">
141
114
142 <div class="page">
115 <div class="page">
143 {{> header}}
116 {{> header}}
144 <div id="menu-bar-hover-placeholder"></div>
117 <div id="menu-bar-hover-placeholder"></div>
145− <div id="menu-bar" class="menu-bar sticky">
118+ <div id="menu-bar" class="menu-bar sticky bordered">
146 <div class="left-buttons">
119 <div class="left-buttons">
147− <label id="sidebar-toggle" class="icon-button" for="sidebar-toggle-anchor" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
120+ <button id="sidebar-toggle" class="icon-button" type="button" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
148 <i class="fa fa-bars"></i>
121 <i class="fa fa-bars"></i>
149− </label>
122+ </button>
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">
123 <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">
151 <i class="fa fa-paint-brush"></i>
124 <i class="fa fa-paint-brush"></i>
152 </button>
125 </button>
153 <ul id="theme-list" class="theme-popup" aria-label="Themes" role="menu">
126 <ul id="theme-list" class="theme-popup" aria-label="Themes" role="menu">
154− <li role="none"><button role="menuitem" class="theme" id="light">Light</button></li>
127+ <li role="none"><button role="menuitem" class="theme" id="light">{{ theme_option "Light" }}</button></li>
155− <li role="none"><button role="menuitem" class="theme" id="rust">Rust</button></li>
128+ <li role="none"><button role="menuitem" class="theme" id="rust">{{ theme_option "Rust" }}</button></li>
156− <li role="none"><button role="menuitem" class="theme" id="coal">Coal</button></li>
129+ <li role="none"><button role="menuitem" class="theme" id="coal">{{ theme_option "Coal" }}</button></li>
157− <li role="none"><button role="menuitem" class="theme" id="navy">Navy</button></li>
130+ <li role="none"><button role="menuitem" class="theme" id="navy">{{ theme_option "Navy" }}</button></li>
158− <li role="none"><button role="menuitem" class="theme" id="ayu">Ayu</button></li>
131+ <li role="none"><button role="menuitem" class="theme" id="ayu">{{ theme_option "Ayu" }}</button></li>
159− <li role="none"><button role="menuitem" class="theme" id="colibri">Colibri</button></li>
132+ <li role="none"><button role="menuitem" class="theme" id="colibri">{{ theme_option "Colibri" }}</button></li>
160 </ul>
133 </ul>
161 {{#if search_enabled}}
134 {{#if search_enabled}}
162 <button id="search-toggle" class="icon-button" type="button" title="Search. (Shortkey: s)" aria-label="Toggle Searchbar" aria-expanded="false" aria-keyshortcuts="S" aria-controls="searchbar">
135 <button id="search-toggle" class="icon-button" type="button" title="Search. (Shortkey: s)" aria-label="Toggle Searchbar" aria-expanded="false" aria-keyshortcuts="S" aria-controls="searchbar">
@@ -178,19 +151,13 @@
178 <i id="git-repository-button" class="fa {{git_repository_icon}}"></i>
151 <i id="git-repository-button" class="fa {{git_repository_icon}}"></i>
179 </a>
152 </a>
180 {{/if}}
153 {{/if}}
181− {{#if git_repository_edit_url}}
182− <a href="{{git_repository_edit_url}}" title="Suggest an edit" aria-label="Suggest an edit">
183− <i id="git-edit-button" class="fa fa-edit"></i>
184− </a>
185− {{/if}}
186−
187 </div>
154 </div>
188 </div>
155 </div>
189
156
190 {{#if search_enabled}}
157 {{#if search_enabled}}
191 <div id="search-wrapper" class="hidden">
158 <div id="search-wrapper" class="hidden">
192 <form id="searchbar-outer" class="searchbar-outer">
159 <form id="searchbar-outer" class="searchbar-outer">
193− <input type="search" id="searchbar" name="searchbar" placeholder="Search this book ..." aria-controls="searchresults-outer" aria-describedby="searchresults-header">
160+ <input type="search" name="search" id="searchbar" name="searchbar" placeholder="Search this book ..." aria-controls="searchresults-outer" aria-describedby="searchresults-header">
194 </form>
161 </form>
195 <div id="searchresults-outer" class="searchresults-outer hidden">
162 <div id="searchresults-outer" class="searchresults-outer hidden">
196 <div id="searchresults-header" class="searchresults-header"></div>
163 <div id="searchresults-header" class="searchresults-header"></div>
@@ -201,7 +168,7 @@
201 {{/if}}
168 {{/if}}
202
169
203 <!-- Apply ARIA attributes after the sidebar and the sidebar toggle button are added to the DOM -->
170 <!-- Apply ARIA attributes after the sidebar and the sidebar toggle button are added to the DOM -->
204− <script>
171+ <script type="text/javascript">
205 document.getElementById('sidebar-toggle').setAttribute('aria-expanded', sidebar === 'visible');
172 document.getElementById('sidebar-toggle').setAttribute('aria-expanded', sidebar === 'visible');
206 document.getElementById('sidebar').setAttribute('aria-hidden', sidebar !== 'visible');
173 document.getElementById('sidebar').setAttribute('aria-hidden', sidebar !== 'visible');
207 Array.from(document.querySelectorAll('#sidebar a')).forEach(function(link) {
174 Array.from(document.querySelectorAll('#sidebar a')).forEach(function(link) {
@@ -223,7 +190,7 @@
223 {{/previous}}
190 {{/previous}}
224
191
225 {{#next}}
192 {{#next}}
226− <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
193+ <a rel="next" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
227 <i class="fa fa-angle-right"></i>
194 <i class="fa fa-angle-right"></i>
228 </a>
195 </a>
229 {{/next}}
196 {{/next}}
@@ -241,7 +208,7 @@
241 {{/previous}}
208 {{/previous}}
242
209
243 {{#next}}
210 {{#next}}
244− <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
211+ <a rel="next" href="{{ path_to_root }}{{link}}" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
245 <i class="fa fa-angle-right"></i>
212 <i class="fa fa-angle-right"></i>
246 </a>
213 </a>
247 {{/next}}
214 {{/next}}
@@ -249,12 +216,10 @@
249
216
250 </div>
217 </div>
251
218
252− {{#if live_reload_endpoint}}
219+ {{#if livereload}}
253 <!-- Livereload script (if served using the cli tool) -->
220 <!-- Livereload script (if served using the cli tool) -->
254− <script>
221+ <script type="text/javascript">
255− const wsProtocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
256− const wsAddress = wsProtocol + "//" + location.host + "/" + "{{{live_reload_endpoint}}}";
257− const socket = new WebSocket(wsAddress);
222+ var socket = new WebSocket("{{{livereload}}}");
258 socket.onmessage = function (event) {
223 socket.onmessage = function (event) {
259 if (event.data === "reload") {
224 if (event.data === "reload") {
260 socket.close();
225 socket.close();
@@ -270,7 +235,7 @@
270
235
271 {{#if google_analytics}}
236 {{#if google_analytics}}
272 <!-- Google Analytics Tag -->
237 <!-- Google Analytics Tag -->
273− <script>
238+ <script type="text/javascript">
274 var localAddrs = ["localhost", "127.0.0.1", ""];
239 var localAddrs = ["localhost", "127.0.0.1", ""];
275
240
276 // make sure we don't activate google analytics if the developer is
241 // make sure we don't activate google analytics if the developer is
@@ -288,43 +253,43 @@
288 {{/if}}
253 {{/if}}
289
254
290 {{#if playground_line_numbers}}
255 {{#if playground_line_numbers}}
291− <script>
256+ <script type="text/javascript">
292 window.playground_line_numbers = true;
257 window.playground_line_numbers = true;
293 </script>
258 </script>
294 {{/if}}
259 {{/if}}
295
260
296 {{#if playground_copyable}}
261 {{#if playground_copyable}}
297− <script>
262+ <script type="text/javascript">
298 window.playground_copyable = true;
263 window.playground_copyable = true;
299 </script>
264 </script>
300 {{/if}}
265 {{/if}}
301
266
302 {{#if playground_js}}
267 {{#if playground_js}}
303− <script src="{{ path_to_root }}ace.js"></script>
268+ <script src="{{ path_to_root }}ace.js" type="text/javascript" charset="utf-8"></script>
304− <script src="{{ path_to_root }}editor.js"></script>
269+ <script src="{{ path_to_root }}editor.js" type="text/javascript" charset="utf-8"></script>
305− <script src="{{ path_to_root }}mode-rust.js"></script>
270+ <script src="{{ path_to_root }}mode-rust.js" type="text/javascript" charset="utf-8"></script>
306− <script src="{{ path_to_root }}theme-dawn.js"></script>
271+ <script src="{{ path_to_root }}theme-dawn.js" type="text/javascript" charset="utf-8"></script>
307− <script src="{{ path_to_root }}theme-tomorrow_night.js"></script>
272+ <script src="{{ path_to_root }}theme-tomorrow_night.js" type="text/javascript" charset="utf-8"></script>
308 {{/if}}
273 {{/if}}
309
274
310 {{#if search_js}}
275 {{#if search_js}}
311− <script src="{{ path_to_root }}elasticlunr.min.js"></script>
276+ <script src="{{ path_to_root }}elasticlunr.min.js" type="text/javascript" charset="utf-8"></script>
312− <script src="{{ path_to_root }}mark.min.js"></script>
277+ <script src="{{ path_to_root }}mark.min.js" type="text/javascript" charset="utf-8"></script>
313− <script src="{{ path_to_root }}searcher.js"></script>
278+ <script src="{{ path_to_root }}searcher.js" type="text/javascript" charset="utf-8"></script>
314 {{/if}}
279 {{/if}}
315
280
316− <script src="{{ path_to_root }}clipboard.min.js"></script>
281+ <script src="{{ path_to_root }}clipboard.min.js" type="text/javascript" charset="utf-8"></script>
317− <script src="{{ path_to_root }}highlight.js"></script>
282+ <script src="{{ path_to_root }}highlight.js" type="text/javascript" charset="utf-8"></script>
318− <script src="{{ path_to_root }}book.js"></script>
283+ <script src="{{ path_to_root }}book.js" type="text/javascript" charset="utf-8"></script>
319
284
320 <!-- Custom JS scripts -->
285 <!-- Custom JS scripts -->
321 {{#each additional_js}}
286 {{#each additional_js}}
322− <script src="{{ ../path_to_root }}{{this}}"></script>
287+ <script type="text/javascript" src="{{ ../path_to_root }}{{this}}"></script>
323 {{/each}}
288 {{/each}}
324
289
325 {{#if is_print}}
290 {{#if is_print}}
326 {{#if mathjax_support}}
291 {{#if mathjax_support}}
327− <script>
292+ <script type="text/javascript">
328 window.addEventListener('load', function() {
293 window.addEventListener('load', function() {
329 MathJax.Hub.Register.StartupHook('End', function() {
294 MathJax.Hub.Register.StartupHook('End', function() {
330 window.setTimeout(window.print, 100);
295 window.setTimeout(window.print, 100);
@@ -332,7 +297,7 @@
332 });
297 });
333 </script>
298 </script>
334 {{else}}
299 {{else}}
335− <script>
300+ <script type="text/javascript">
336 window.addEventListener('load', function() {
301 window.addEventListener('load', function() {
337 window.setTimeout(window.print, 100);
302 window.setTimeout(window.print, 100);
338 });
303 });
@@ -340,6 +305,5 @@
340 {{/if}}
305 {{/if}}
341 {{/if}}
306 {{/if}}
342
307
343− </div>
344 </body>
308 </body>
345</html>
309</html>
contrib/Helix.appdata.xml−15
@@ -5,7 +5,6 @@
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>
9
8
10 <description>
9 <description>
11 <p>
10 <p>
@@ -18,17 +17,6 @@
18 <li>Smart, incremental syntax highlighting and code editing via tree-sitter</li>
17 <li>Smart, incremental syntax highlighting and code editing via tree-sitter</li>
19 </ul>
18 </ul>
20 </description>
19 </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>
32
20
33 <launchable type="desktop-id">Helix.desktop</launchable>
21 <launchable type="desktop-id">Helix.desktop</launchable>
34
22
@@ -48,9 +36,6 @@
48 <content_rating type="oars-1.1" />
36 <content_rating type="oars-1.1" />
49
37
50 <releases>
38 <releases>
51− <release version="23.10" date="2023-10-24">
52− <url>https://helix-editor.com/news/release-23-10-highlights/</url>
53− </release>
54 <release version="23.05" date="2023-05-18">
39 <release version="23.05" date="2023-05-18">
55 <url>https://github.com/helix-editor/helix/releases/tag/23.05</url>
40 <url>https://github.com/helix-editor/helix/releases/tag/23.05</url>
56 </release>
41 </release>
contrib/Helix.desktop+1−3
@@ -1,7 +1,6 @@
1[Desktop Entry]
1[Desktop Entry]
2Name=Helix
2Name=Helix
3GenericName=Text Editor
3GenericName=Text Editor
4−GenericName[ar]=مُحَرِّرُ نُصُوص
5GenericName[de]=Texteditor
4GenericName[de]=Texteditor
6GenericName[fr]=Éditeur de texte
5GenericName[fr]=Éditeur de texte
7GenericName[ru]=Текстовый редактор
6GenericName[ru]=Текстовый редактор
@@ -10,7 +9,7 @@ GenericName[tr]=Metin Düzenleyici
10Comment=Edit text files
9Comment=Edit text files
11Comment[af]=Redigeer tekslêers
10Comment[af]=Redigeer tekslêers
12Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
11Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
13−Comment[ar]=مُحَرِّرُ مِلَفَّاتٍ نَصِّيَّة
12+Comment[ar]=حرّر ملفات نصية
14Comment[az]=Mətn fayllarını redaktə edin
13Comment[az]=Mətn fayllarını redaktə edin
15Comment[be]=Рэдагаваньне тэкставых файлаў
14Comment[be]=Рэдагаваньне тэкставых файлаў
16Comment[bg]=Редактиране на текстови файлове
15Comment[bg]=Редактиране на текстови файлове
@@ -80,7 +79,6 @@ Exec=hx %F
80Terminal=true
79Terminal=true
81Type=Application
80Type=Application
82Keywords=Text;editor;
81Keywords=Text;editor;
83−Keywords[ar]=نص;نصوص;محرر;
84Keywords[fr]=Texte;éditeur;
82Keywords[fr]=Texte;éditeur;
85Keywords[ru]=текст;текстовый редактор;
83Keywords[ru]=текст;текстовый редактор;
86Keywords[sr]=Текст;едитор;
84Keywords[sr]=Текст;едитор;
docs/CONTRIBUTING.md+3−10
@@ -29,15 +29,9 @@ 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.
32+inside the project. We use [xtask][xtask] as an ad-hoc task runner and
33−
33+thus do not require any dependencies other than `cargo` (You don't have
34−To preview the book itself, install [mdbook][mdbook]. Then, run
34+to `cargo install` anything either).
35−
36−```shell
37−mdbook serve book
38−```
39−
40−and visit [http://localhost:3000](http://localhost:3000).
41
35
42# Testing
36# Testing
43
37
@@ -64,5 +58,4 @@ The current MSRV and future changes to the MSRV are listed in the [Firefox docum
64[architecture.md]: ./architecture.md
58[architecture.md]: ./architecture.md
65[docs]: https://docs.helix-editor.com/
59[docs]: https://docs.helix-editor.com/
66[xtask]: https://github.com/matklad/cargo-xtask
60[xtask]: https://github.com/matklad/cargo-xtask
67−[mdbook]: https://rust-lang.github.io/mdBook/guide/installation.html
68[helpers.rs]: ../helix-term/tests/test/helpers.rs
61[helpers.rs]: ../helix-term/tests/test/helpers.rs
docs/releases.md+5−12
@@ -1,23 +1,16 @@
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, or in a patch release,
4+`YY.0M(.MICRO)`, for example, `22.05` for May of 2022. In these instructions
5−`22.05.1`. In these instructions we'll use `<tag>` as a placeholder for the tag
5+we'll use `<tag>` as a placeholder for the tag being published.
6−being published.
7
6
8* Merge the changelog PR
7* Merge the changelog PR
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)
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)
10* Tag and push
9* Tag and push
11 * `git tag -s -m "<tag>" -a <tag> && git push`
10 * `git tag -s -m "<tag>" -a <tag> && git push`
12 * Make sure to switch to master and pull first
11 * Make sure to switch to master and pull first
13−* Edit the `Cargo.toml` file and change the date in the `version` field to the next planned release
12+* Edit the `VERSION` file and change the date to the next planned release
14− * Due to Cargo having a strict requirement on SemVer with 3 or more version
15− numbers, a `0` is required in the micro version; however, unless we are
16− publishing a patch release after a major release, the `.0` is dropped in
17− the user facing version.
18− * Releases are planned to happen every two months, so `22.05.0` would change to `22.07.0`
13+ * Releases are planned to happen every two months, so `22.05` would change to `22.07`
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`
21* Wait for the Release CI to finish
14* Wait for the Release CI to finish
22 * It will automatically turn the git tag into a GitHub release when it uploads artifacts
15 * It will automatically turn the git tag into a GitHub release when it uploads artifacts
23* Edit the new release
16* Edit the new release
@@ -64,4 +57,4 @@ versions for convenience:
64> release. For the full log, check out the git log.
57> release. For the full log, check out the git log.
65
58
66Typically, small changes like dependencies or documentation updates, refactors,
59Typically, small changes like dependencies or documentation updates, refactors,
67−or meta changes like GitHub Actions work are left out.
60+or meta changes like GitHub Actions work are left out.
flake.lock+237−21
@@ -1,22 +1,126 @@
1{
1{
2 "nodes": {
2 "nodes": {
3 "crane": {
3 "crane": {
4+ "flake": false,
5+ "locked": {
6+ "lastModified": 1681175776,
7+ "narHash": "sha256-7SsUy9114fryHAZ8p1L6G6YSu7jjz55FddEwa2U8XZc=",
8+ "owner": "ipetkov",
9+ "repo": "crane",
10+ "rev": "445a3d222947632b5593112bb817850e8a9cf737",
11+ "type": "github"
12+ },
13+ "original": {
14+ "owner": "ipetkov",
15+ "ref": "v0.12.1",
16+ "repo": "crane",
17+ "type": "github"
18+ }
19+ },
20+ "dream2nix": {
4 "inputs": {
21 "inputs": {
22+ "all-cabal-json": [
23+ "nci"
24+ ],
25+ "crane": "crane",
26+ "devshell": [
27+ "nci"
28+ ],
29+ "drv-parts": "drv-parts",
30+ "flake-compat": "flake-compat",
31+ "flake-parts": [
32+ "nci",
33+ "parts"
34+ ],
35+ "flake-utils-pre-commit": [
36+ "nci"
37+ ],
38+ "ghc-utils": [
39+ "nci"
40+ ],
41+ "gomod2nix": [
42+ "nci"
43+ ],
44+ "mach-nix": [
45+ "nci"
46+ ],
47+ "nix-pypi-fetcher": [
48+ "nci"
49+ ],
5 "nixpkgs": [
50 "nixpkgs": [
51+ "nci",
6 "nixpkgs"
52 "nixpkgs"
53+ ],
54+ "nixpkgsV1": "nixpkgsV1",
55+ "poetry2nix": [
56+ "nci"
57+ ],
58+ "pre-commit-hooks": [
59+ "nci"
60+ ],
61+ "pruned-racket-catalog": [
62+ "nci"
7 ]
63 ]
8 },
64 },
9 "locked": {
65 "locked": {
10− "lastModified": 1701025348,
66+ "lastModified": 1683212002,
11− "narHash": "sha256-42GHmYH+GF7VjwGSt+fVT1CQuNpGanJbNgVHTAZppUM=",
67+ "narHash": "sha256-EObtqyQsv9v+inieRY5cvyCMCUI5zuU5qu+1axlJCPM=",
12− "owner": "ipetkov",
68+ "owner": "nix-community",
13− "repo": "crane",
69+ "repo": "dream2nix",
14− "rev": "42afaeb1a0325194a7cdb526332d2cb92fddd07b",
70+ "rev": "fbfb09d2ab5ff761d822dd40b4a1def81651d096",
15 "type": "github"
71 "type": "github"
16 },
72 },
17 "original": {
73 "original": {
18− "owner": "ipetkov",
74+ "owner": "nix-community",
19− "repo": "crane",
75+ "repo": "dream2nix",
76+ "type": "github"
77+ }
78+ },
79+ "drv-parts": {
80+ "inputs": {
81+ "flake-compat": [
82+ "nci",
83+ "dream2nix",
84+ "flake-compat"
85+ ],
86+ "flake-parts": [
87+ "nci",
88+ "dream2nix",
89+ "flake-parts"
90+ ],
91+ "nixpkgs": [
92+ "nci",
93+ "dream2nix",
94+ "nixpkgs"
95+ ]
96+ },
97+ "locked": {
98+ "lastModified": 1680698112,
99+ "narHash": "sha256-FgnobN/DvCjEsc0UAZEAdPLkL4IZi2ZMnu2K2bUaElc=",
100+ "owner": "davhau",
101+ "repo": "drv-parts",
102+ "rev": "e8c2ec1157dc1edb002989669a0dbd935f430201",
103+ "type": "github"
104+ },
105+ "original": {
106+ "owner": "davhau",
107+ "repo": "drv-parts",
108+ "type": "github"
109+ }
110+ },
111+ "flake-compat": {
112+ "flake": false,
113+ "locked": {
114+ "lastModified": 1673956053,
115+ "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
116+ "owner": "edolstra",
117+ "repo": "flake-compat",
118+ "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
119+ "type": "github"
120+ },
121+ "original": {
122+ "owner": "edolstra",
123+ "repo": "flake-compat",
20 "type": "github"
124 "type": "github"
21 }
125 }
22 },
126 },
@@ -25,11 +129,11 @@
25 "systems": "systems"
129 "systems": "systems"
26 },
130 },
27 "locked": {
131 "locked": {
28− "lastModified": 1694529238,
132+ "lastModified": 1681202837,
29− "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
133+ "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
30 "owner": "numtide",
134 "owner": "numtide",
31 "repo": "flake-utils",
135 "repo": "flake-utils",
32− "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
136+ "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
33 "type": "github"
137 "type": "github"
34 },
138 },
35 "original": {
139 "original": {
@@ -38,13 +142,55 @@
38 "type": "github"
142 "type": "github"
39 }
143 }
40 },
144 },
145+ "mk-naked-shell": {
146+ "flake": false,
147+ "locked": {
148+ "lastModified": 1681286841,
149+ "narHash": "sha256-3XlJrwlR0nBiREnuogoa5i1b4+w/XPe0z8bbrJASw0g=",
150+ "owner": "yusdacra",
151+ "repo": "mk-naked-shell",
152+ "rev": "7612f828dd6f22b7fb332cc69440e839d7ffe6bd",
153+ "type": "github"
154+ },
155+ "original": {
156+ "owner": "yusdacra",
157+ "repo": "mk-naked-shell",
158+ "type": "github"
159+ }
160+ },
161+ "nci": {
162+ "inputs": {
163+ "dream2nix": "dream2nix",
164+ "mk-naked-shell": "mk-naked-shell",
165+ "nixpkgs": [
166+ "nixpkgs"
167+ ],
168+ "parts": "parts",
169+ "rust-overlay": [
170+ "rust-overlay"
171+ ]
172+ },
173+ "locked": {
174+ "lastModified": 1683699050,
175+ "narHash": "sha256-UWKQpzVcSshB+sU2O8CCHjOSTQrNS7Kk9V3+UeBsJpg=",
176+ "owner": "yusdacra",
177+ "repo": "nix-cargo-integration",
178+ "rev": "ed27173cd1b223f598343ea3c15aacb1d140feac",
179+ "type": "github"
180+ },
181+ "original": {
182+ "owner": "yusdacra",
183+ "repo": "nix-cargo-integration",
184+ "type": "github"
185+ }
186+ },
41 "nixpkgs": {
187 "nixpkgs": {
42 "locked": {
188 "locked": {
43− "lastModified": 1700794826,
189+ "lastModified": 1683408522,
44− "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
190+ "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=",
45 "owner": "nixos",
191 "owner": "nixos",
46 "repo": "nixpkgs",
192 "repo": "nixpkgs",
47− "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
193+ "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7",
48 "type": "github"
194 "type": "github"
49 },
195 },
50 "original": {
196 "original": {
@@ -54,29 +200,99 @@
54 "type": "github"
200 "type": "github"
55 }
201 }
56 },
202 },
203+ "nixpkgs-lib": {
204+ "locked": {
205+ "dir": "lib",
206+ "lastModified": 1682879489,
207+ "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=",
208+ "owner": "NixOS",
209+ "repo": "nixpkgs",
210+ "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0",
211+ "type": "github"
212+ },
213+ "original": {
214+ "dir": "lib",
215+ "owner": "NixOS",
216+ "ref": "nixos-unstable",
217+ "repo": "nixpkgs",
218+ "type": "github"
219+ }
220+ },
221+ "nixpkgsV1": {
222+ "locked": {
223+ "lastModified": 1678500271,
224+ "narHash": "sha256-tRBLElf6f02HJGG0ZR7znMNFv/Uf7b2fFInpTHiHaSE=",
225+ "owner": "NixOS",
226+ "repo": "nixpkgs",
227+ "rev": "5eb98948b66de29f899c7fe27ae112a47964baf8",
228+ "type": "github"
229+ },
230+ "original": {
231+ "id": "nixpkgs",
232+ "ref": "nixos-22.11",
233+ "type": "indirect"
234+ }
235+ },
236+ "parts": {
237+ "inputs": {
238+ "nixpkgs-lib": [
239+ "nci",
240+ "nixpkgs"
241+ ]
242+ },
243+ "locked": {
244+ "lastModified": 1683560683,
245+ "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=",
246+ "owner": "hercules-ci",
247+ "repo": "flake-parts",
248+ "rev": "006c75898cf814ef9497252b022e91c946ba8e17",
249+ "type": "github"
250+ },
251+ "original": {
252+ "owner": "hercules-ci",
253+ "repo": "flake-parts",
254+ "type": "github"
255+ }
256+ },
257+ "parts_2": {
258+ "inputs": {
259+ "nixpkgs-lib": "nixpkgs-lib"
260+ },
261+ "locked": {
262+ "lastModified": 1683560683,
263+ "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=",
264+ "owner": "hercules-ci",
265+ "repo": "flake-parts",
266+ "rev": "006c75898cf814ef9497252b022e91c946ba8e17",
267+ "type": "github"
268+ },
269+ "original": {
270+ "owner": "hercules-ci",
271+ "repo": "flake-parts",
272+ "type": "github"
273+ }
274+ },
57 "root": {
275 "root": {
58 "inputs": {
276 "inputs": {
59− "crane": "crane",
277+ "nci": "nci",
60− "flake-utils": "flake-utils",
61 "nixpkgs": "nixpkgs",
278 "nixpkgs": "nixpkgs",
279+ "parts": "parts_2",
62 "rust-overlay": "rust-overlay"
280 "rust-overlay": "rust-overlay"
63 }
281 }
64 },
282 },
65 "rust-overlay": {
283 "rust-overlay": {
66 "inputs": {
284 "inputs": {
67− "flake-utils": [
285+ "flake-utils": "flake-utils",
68− "flake-utils"
69− ],
70 "nixpkgs": [
286 "nixpkgs": [
71 "nixpkgs"
287 "nixpkgs"
72 ]
288 ]
73 },
289 },
74 "locked": {
290 "locked": {
75− "lastModified": 1701137803,
291+ "lastModified": 1683771545,
76− "narHash": "sha256-0LcPAdql5IhQSUXJx3Zna0dYTgdIoYO7zUrsKgiBd04=",
292+ "narHash": "sha256-we0GYcKTo2jRQGmUGrzQ9VH0OYAUsJMCsK8UkF+vZUA=",
77 "owner": "oxalica",
293 "owner": "oxalica",
78 "repo": "rust-overlay",
294 "repo": "rust-overlay",
79− "rev": "9dd940c967502f844eacea52a61e9596268d4f70",
295+ "rev": "c57e210faf68e5d5386f18f1b17ad8365d25e4ed",
80 "type": "github"
296 "type": "github"
81 },
297 },
82 "original": {
298 "original": {
flake.nix+143−170
@@ -3,193 +3,166 @@
3
3
4 inputs = {
4 inputs = {
5 nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
5 nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
6− flake-utils.url = "github:numtide/flake-utils";
7 rust-overlay = {
6 rust-overlay = {
8 url = "github:oxalica/rust-overlay";
7 url = "github:oxalica/rust-overlay";
9− inputs = {
8+ inputs.nixpkgs.follows = "nixpkgs";
10− nixpkgs.follows = "nixpkgs";
11− flake-utils.follows = "flake-utils";
12− };
13 };
9 };
14− crane = {
10+ nci = {
15− url = "github:ipetkov/crane";
11+ url = "github:yusdacra/nix-cargo-integration";
16 inputs.nixpkgs.follows = "nixpkgs";
12 inputs.nixpkgs.follows = "nixpkgs";
13+ inputs.rust-overlay.follows = "rust-overlay";
17 };
14 };
15+ parts.url = "github:hercules-ci/flake-parts";
18 };
16 };
19
17
20− outputs = {
18+ outputs = inp: let
21− self,
19+ mkRootPath = rel:
22− nixpkgs,
20+ builtins.path {
23− crane,
21+ path = "${toString ./.}/${rel}";
24− flake-utils,
22+ name = rel;
25− rust-overlay,
26− ...
27− }:
28− flake-utils.lib.eachDefaultSystem (system: let
29− pkgs = import nixpkgs {
30− inherit system;
31− overlays = [(import rust-overlay)];
32 };
23 };
33− mkRootPath = rel:
34− builtins.path {
35− path = "${toString ./.}/${rel}";
36− name = rel;
37− };
38− filteredSource = let
24+ filteredSource = let
39− pathsToIgnore = [
25+ pathsToIgnore = [
40− ".envrc"
26+ ".envrc"
41− ".ignore"
27+ ".ignore"
42− ".github"
28+ ".github"
43− ".gitignore"
29+ ".gitignore"
30+ "logo.svg"
44− "logo_dark.svg"
31+ "logo_dark.svg"
45− "logo_light.svg"
32+ "logo_light.svg"
46− "rust-toolchain.toml"
33+ "rust-toolchain.toml"
47− "rustfmt.toml"
34+ "rustfmt.toml"
48− "runtime"
35+ "runtime"
49− "screenshot.png"
36+ "screenshot.png"
50− "book"
37+ "book"
38+ "contrib"
51− "docs"
39+ "docs"
52− "README.md"
40+ "README.md"
53− "CHANGELOG.md"
41+ "CHANGELOG.md"
54− "shell.nix"
42+ "shell.nix"
55− "default.nix"
43+ "default.nix"
56− "grammars.nix"
44+ "grammars.nix"
57− "flake.nix"
45+ "flake.nix"
58− "flake.lock"
46+ "flake.lock"
59− ];
47+ ];
60− ignorePaths = path: type: let
48+ ignorePaths = path: type: let
61− inherit (nixpkgs) lib;
49+ inherit (inp.nixpkgs) lib;
62− # split the nix store path into its components
50+ # split the nix store path into its components
63− components = lib.splitString "/" path;
51+ components = lib.splitString "/" path;
64− # drop off the `/nix/hash-source` section from the path
52+ # drop off the `/nix/hash-source` section from the path
65− relPathComponents = lib.drop 4 components;
53+ relPathComponents = lib.drop 4 components;
66− # reassemble the path components
54+ # reassemble the path components
67− relPath = lib.concatStringsSep "/" relPathComponents;
55+ relPath = lib.concatStringsSep "/" relPathComponents;
68− in
69− lib.all (p: ! (lib.hasPrefix p relPath)) pathsToIgnore;
70 in
56 in
57+ lib.all (p: ! (lib.hasPrefix p relPath)) pathsToIgnore;
58+ in
71− builtins.path {
59+ builtins.path {
72− name = "helix-source";
60+ name = "helix-source";
73− path = toString ./.;
61+ path = toString ./.;
74− # filter out unnecessary paths
62+ # filter out unnecessary paths
75− filter = ignorePaths;
63+ filter = ignorePaths;
76− };
64+ };
65+ in
66+ inp.parts.lib.mkFlake {inputs = inp;} {
67+ imports = [inp.nci.flakeModule inp.parts.flakeModules.easyOverlay];
68+ systems = [
69+ "x86_64-linux"
70+ "x86_64-darwin"
71+ "aarch64-linux"
72+ "aarch64-darwin"
73+ "i686-linux"
74+ ];
75+ perSystem = {
76+ config,
77+ pkgs,
78+ lib,
79+ ...
80+ }: let
77− makeOverridableHelix = old: config: let
81+ makeOverridableHelix = old: config: let
78− grammars = pkgs.callPackage ./grammars.nix config;
82+ grammars = pkgs.callPackage ./grammars.nix config;
79− runtimeDir = pkgs.runCommand "helix-runtime" {} ''
83+ runtimeDir = pkgs.runCommand "helix-runtime" {} ''
80− mkdir -p $out
84+ mkdir -p $out
81− ln -s ${mkRootPath "runtime"}/* $out
85+ ln -s ${mkRootPath "runtime"}/* $out
82− rm -r $out/grammars
86+ rm -r $out/grammars
83− ln -s ${grammars} $out/grammars
87+ ln -s ${grammars} $out/grammars
84− '';
88+ '';
85− helix-wrapped =
89+ helix-wrapped =
86− pkgs.runCommand
90+ pkgs.runCommand
87− old.name
91+ old.name
88− {
92+ {
89− inherit (old) pname version;
93+ inherit (old) pname version;
90− meta = old.meta or {};
94+ meta = old.meta or {};
95+ passthru =
96+ (old.passthru or {})
97+ // {
98+ unwrapped = old;
99+ };
100+ nativeBuildInputs = [pkgs.makeWrapper];
101+ makeWrapperArgs = config.makeWrapperArgs or [];
102+ }
103+ ''
104+ cp -rs --no-preserve=mode,ownership ${old} $out
105+ wrapProgram "$out/bin/hx" ''${makeWrapperArgs[@]} --set HELIX_RUNTIME "${runtimeDir}"
106+ '';
107+ in
108+ helix-wrapped
109+ // {
110+ override = makeOverridableHelix old;
91 passthru =
111 passthru =
92− (old.passthru or {})
112+ helix-wrapped.passthru
93 // {
113 // {
94− unwrapped = old;
114+ wrapper = old: makeOverridableHelix old config;
95 };
115 };
96− nativeBuildInputs = [pkgs.makeWrapper];
116+ };
97− makeWrapperArgs = config.makeWrapperArgs or [];
117+ stdenv =
98− }
118+ if pkgs.stdenv.isLinux
99− ''
119+ then pkgs.stdenv
100− cp -rs --no-preserve=mode,ownership ${old} $out
120+ else pkgs.clangStdenv;
101− wrapProgram "$out/bin/hx" ''${makeWrapperArgs[@]} --set HELIX_RUNTIME "${runtimeDir}"
121+ rustFlagsEnv =
102− '';
122+ if stdenv.isLinux
123+ then ''$RUSTFLAGS -C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment''
124+ else "$RUSTFLAGS";
103− in
125+ in {
104− helix-wrapped
126+ nci.projects."helix-project".relPath = "";
105− // {
127+ nci.crates."helix-term" = {
106− override = makeOverridableHelix old;
128+ overrides = {
107− passthru =
129+ add-meta.override = _: {meta.mainProgram = "hx";};
108− helix-wrapped.passthru
130+ add-inputs.overrideAttrs = prev: {
109− // {
131+ buildInputs = (prev.buildInputs or []) ++ [stdenv.cc.cc.lib];
110− wrapper = old: makeOverridableHelix old config;
132+ };
133+ disable-grammar-builds = {
134+ # disable fetching and building of tree-sitter grammars in the helix-term build.rs
135+ HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
111 };
136 };
137+ disable-tests = {checkPhase = ":";};
138+ set-stdenv.override = _: {inherit stdenv;};
139+ set-filtered-src.override = _: {src = filteredSource;};
140+ };
112 };
141 };
113− stdenv =
114− if pkgs.stdenv.isLinux
115− then pkgs.stdenv
116− else pkgs.clangStdenv;
117− rustFlagsEnv =
118− if stdenv.isLinux
119− then ''$RUSTFLAGS -C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment''
120− else "$RUSTFLAGS";
121− rustToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
122− craneLibMSRV = (crane.mkLib pkgs).overrideToolchain rustToolchain;
123− craneLibStable = (crane.mkLib pkgs).overrideToolchain pkgs.pkgsBuildHost.rust-bin.stable.latest.default;
124− commonArgs = {
125− inherit stdenv;
126− inherit (craneLibMSRV.crateNameFromCargoToml {cargoToml = ./helix-term/Cargo.toml;}) pname;
127− inherit (craneLibMSRV.crateNameFromCargoToml {cargoToml = ./Cargo.toml;}) version;
128− src = filteredSource;
129− # disable fetching and building of tree-sitter grammars in the helix-term build.rs
130− HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
131− buildInputs = [stdenv.cc.cc.lib];
132− # disable tests
133− doCheck = false;
134− meta.mainProgram = "hx";
135− };
136− cargoArtifacts = craneLibMSRV.buildDepsOnly commonArgs;
137− in {
138− packages = {
139− helix-unwrapped = craneLibStable.buildPackage (commonArgs
140− // {
141− cargoArtifacts = craneLibStable.buildDepsOnly commonArgs;
142− postInstall = ''
143− mkdir -p $out/share/applications $out/share/icons/hicolor/scalable/apps $out/share/icons/hicolor/256x256/apps
144− cp contrib/Helix.desktop $out/share/applications
145− cp logo.svg $out/share/icons/hicolor/scalable/apps/helix.svg
146− cp contrib/helix.png $out/share/icons/hicolor/256x256/apps
147− '';
148− });
149− helix = makeOverridableHelix self.packages.${system}.helix-unwrapped {};
150− default = self.packages.${system}.helix;
151− };
152
142
153− checks = {
143+ packages.helix-unwrapped = config.nci.outputs."helix-term".packages.release;
154− # Build the crate itself
144+ packages.helix-unwrapped-dev = config.nci.outputs."helix-term".packages.dev;
155− inherit (self.packages.${system}) helix;
145+ packages.helix = makeOverridableHelix config.packages.helix-unwrapped {};
146+ packages.helix-dev = makeOverridableHelix config.packages.helix-unwrapped-dev {};
147+ packages.default = config.packages.helix;
156
148
157− clippy = craneLibMSRV.cargoClippy (commonArgs
149+ overlayAttrs = {
158− // {
150+ inherit (config.packages) helix;
159− inherit cargoArtifacts;
160− cargoClippyExtraArgs = "--all-targets -- --deny warnings";
161− });
162−
163− fmt = craneLibMSRV.cargoFmt commonArgs;
164−
165− doc = craneLibMSRV.cargoDoc (commonArgs
166− // {
167− inherit cargoArtifacts;
168− });
169−
170− test = craneLibMSRV.cargoTest (commonArgs
171− // {
172− inherit cargoArtifacts;
173− });
174− };
151+ };
175
152
176− devShells.default = pkgs.mkShell {
153+ devShells.default = config.nci.outputs."helix-project".devShell.overrideAttrs (old: {
177− inputsFrom = builtins.attrValues self.checks.${system};
178− nativeBuildInputs = with pkgs;
154+ nativeBuildInputs =
155+ (old.nativeBuildInputs or [])
179− [lld_13 cargo-flamegraph rust-analyzer]
156+ ++ (with pkgs; [lld_13 cargo-flamegraph rust-analyzer])
180− ++ (lib.optional (stdenv.isx86_64 && stdenv.isLinux) pkgs.cargo-tarpaulin)
157+ ++ (lib.optional (stdenv.isx86_64 && stdenv.isLinux) pkgs.cargo-tarpaulin)
181− ++ (lib.optional stdenv.isLinux pkgs.lldb)
158+ ++ (lib.optional stdenv.isLinux pkgs.lldb)
182− ++ (lib.optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.CoreFoundation);
159+ ++ (lib.optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.CoreFoundation);
183− shellHook = ''
160+ shellHook = ''
184− export HELIX_RUNTIME="$PWD/runtime"
161+ export HELIX_RUNTIME="$PWD/runtime"
185− export RUST_BACKTRACE="1"
162+ export RUST_BACKTRACE="1"
186− export RUSTFLAGS="${rustFlagsEnv}"
163+ export RUSTFLAGS="${rustFlagsEnv}"
187− '';
164+ '';
188− };
165+ });
189− })
190− // {
191− overlays.default = final: prev: {
192− inherit (self.packages.${final.system}) helix;
193 };
166 };
194 };
167 };
195
168
grammars.nix+21−24
@@ -5,7 +5,6 @@
5 runCommand,
5 runCommand,
6 yj,
6 yj,
7 includeGrammarIf ? _: true,
7 includeGrammarIf ? _: true,
8− grammarOverlays ? [],
9 ...
8 ...
10}: let
9}: let
11 # HACK: nix < 2.6 has a bug in the toml parser, so we convert to JSON
10 # HACK: nix < 2.6 has a bug in the toml parser, so we convert to JSON
@@ -49,22 +48,22 @@
49 then sourceGitHub
48 then sourceGitHub
50 else sourceGit;
49 else sourceGit;
51 in
50 in
52− stdenv.mkDerivation {
51+ stdenv.mkDerivation rec {
53 # see https://github.com/NixOS/nixpkgs/blob/fbdd1a7c0bc29af5325e0d7dd70e804a972eb465/pkgs/development/tools/parsing/tree-sitter/grammar.nix
52 # see https://github.com/NixOS/nixpkgs/blob/fbdd1a7c0bc29af5325e0d7dd70e804a972eb465/pkgs/development/tools/parsing/tree-sitter/grammar.nix
54
53
55 pname = "helix-tree-sitter-${grammar.name}";
54 pname = "helix-tree-sitter-${grammar.name}";
56 version = grammar.source.rev;
55 version = grammar.source.rev;
57
56
58− src = source;
57+ src =
59− sourceRoot = if builtins.hasAttr "subpath" grammar.source then
58+ if builtins.hasAttr "subpath" grammar.source
60− "source/${grammar.source.subpath}"
59+ then "${source}/${grammar.source.subpath}"
61− else
62− "source";
60+ else source;
63
61
62+ dontUnpack = true;
64 dontConfigure = true;
63 dontConfigure = true;
65
64
66 FLAGS = [
65 FLAGS = [
67− "-Isrc"
66+ "-I${src}/src"
68 "-g"
67 "-g"
69 "-O3"
68 "-O3"
70 "-fPIC"
69 "-fPIC"
@@ -77,13 +76,13 @@
77 buildPhase = ''
76 buildPhase = ''
78 runHook preBuild
77 runHook preBuild
79
78
80− if [[ -e src/scanner.cc ]]; then
79+ if [[ -e "$src/src/scanner.cc" ]]; then
81− $CXX -c src/scanner.cc -o scanner.o $FLAGS
80+ $CXX -c "$src/src/scanner.cc" -o scanner.o $FLAGS
82− elif [[ -e src/scanner.c ]]; then
81+ elif [[ -e "$src/src/scanner.c" ]]; then
83− $CC -c src/scanner.c -o scanner.o $FLAGS
82+ $CC -c "$src/src/scanner.c" -o scanner.o $FLAGS
84 fi
83 fi
85
84
86− $CC -c src/parser.c -o parser.o $FLAGS
85+ $CC -c "$src/src/parser.c" -o parser.o $FLAGS
87 $CXX -shared -o $NAME.so *.o
86 $CXX -shared -o $NAME.so *.o
88
87
89 ls -al
88 ls -al
@@ -106,17 +105,15 @@
106 '';
105 '';
107 };
106 };
108 grammarsToBuild = builtins.filter includeGrammarIf gitGrammars;
107 grammarsToBuild = builtins.filter includeGrammarIf gitGrammars;
108+ builtGrammars =
109− builtGrammars = builtins.map (grammar: {
109+ builtins.map (grammar: {
110− inherit (grammar) name;
110+ inherit (grammar) name;
111− value = buildGrammar grammar;
111+ artifact = buildGrammar grammar;
112+ })
112− }) grammarsToBuild;
113+ grammarsToBuild;
113− extensibleGrammars =
114− lib.makeExtensible (self: builtins.listToAttrs builtGrammars);
115− overlayedGrammars = lib.pipe extensibleGrammars
116− (builtins.map (overlay: grammar: grammar.extend overlay) grammarOverlays);
117− grammarLinks = lib.mapAttrsToList
114+ grammarLinks =
118− (name: artifact: "ln -s ${artifact}/${name}.so $out/${name}.so")
115+ builtins.map (grammar: "ln -s ${grammar.artifact}/${grammar.name}.so $out/${grammar.name}.so")
119− (lib.filterAttrs (n: v: lib.isDerivation v) overlayedGrammars);
116+ builtGrammars;
120in
117in
121 runCommand "consolidated-helix-grammars" {} ''
118 runCommand "consolidated-helix-grammars" {} ''
122 mkdir -p $out
119 mkdir -p $out
helix-core/Cargo.toml+16−20
@@ -1,38 +1,37 @@
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"
3description = "Helix editor core editing primitives"
7description = "Helix editor core editing primitives"
8+categories = ["editor"]
9+repository = "https://github.com/helix-editor/helix"
10+homepage = "https://helix-editor.com"
4include = ["src/**/*", "README.md"]
11include = ["src/**/*", "README.md"]
5−version.workspace = true
6−authors.workspace = true
7−edition.workspace = true
8−license.workspace = true
9−rust-version.workspace = true
10−categories.workspace = true
11−repository.workspace = true
12−homepage.workspace = true
13
12
14[features]
13[features]
15unicode-lines = ["ropey/unicode_lines"]
14unicode-lines = ["ropey/unicode_lines"]
16integration = []
15integration = []
17
16
18[dependencies]
17[dependencies]
19−helix-loader = { path = "../helix-loader" }
18+helix-loader = { version = "0.6", path = "../helix-loader" }
20
19
21−ropey = { version = "1.6.1", default-features = false, features = ["simd"] }
20+ropey = { version = "1.6.0", default-features = false, features = ["simd"] }
22−smallvec = "1.11"
21+smallvec = "1.10"
23smartstring = "1.0.1"
22smartstring = "1.0.1"
24unicode-segmentation = "1.10"
23unicode-segmentation = "1.10"
25unicode-width = "0.1"
24unicode-width = "0.1"
26unicode-general-category = "0.6"
25unicode-general-category = "0.6"
27# slab = "0.4.2"
26# slab = "0.4.2"
28slotmap = "1.0"
27slotmap = "1.0"
29−tree-sitter.workspace = true
28+tree-sitter = "0.20"
30−once_cell = "1.19"
29+once_cell = "1.18"
31arc-swap = "1"
30arc-swap = "1"
32regex = "1"
31regex = "1"
33−bitflags = "2.4"
32+bitflags = "2.3"
34−ahash = "0.8.6"
33+ahash = "0.8.3"
35−hashbrown = { version = "0.14.3", features = ["raw"] }
34+hashbrown = { version = "0.14.0", features = ["raw"] }
36dunce = "1.0"
35dunce = "1.0"
37
36
38log = "0.4"
37log = "0.4"
@@ -49,9 +48,6 @@ chrono = { version = "0.4", default-features = false, features = ["alloc", "std"
49etcetera = "0.8"
48etcetera = "0.8"
50textwrap = "0.16.0"
49textwrap = "0.16.0"
51
50
52−nucleo.workspace = true
53−parking_lot = "0.12"
54−
55[dev-dependencies]
51[dev-dependencies]
56quickcheck = { version = "1", default-features = false }
52quickcheck = { version = "1", default-features = false }
57−indoc = "2.0.4"
53+indoc = "2.0.1"
helix-core/src/diagnostic.rs−4
@@ -39,10 +39,6 @@ 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,
46 pub line: usize,
42 pub line: usize,
47 pub message: String,
43 pub message: String,
48 pub severity: Option<Severity>,
44 pub severity: Option<Severity>,
helix-core/src/fuzzy.rsdeleted−43
@@ -1,43 +0,0 @@
1−use std::ops::DerefMut;
2−
3−use nucleo::pattern::{Atom, AtomKind, CaseMatching};
4−use nucleo::Config;
5−use parking_lot::Mutex;
6−
7−pub struct LazyMutex<T> {
8− inner: Mutex<Option<T>>,
9− init: fn() -> T,
10−}
11−
12−impl<T> LazyMutex<T> {
13− pub const fn new(init: fn() -> T) -> Self {
14− Self {
15− inner: Mutex::new(None),
16− init,
17− }
18− }
19−
20− pub fn lock(&self) -> impl DerefMut<Target = T> + '_ {
21− parking_lot::MutexGuard::map(self.inner.lock(), |val| val.get_or_insert_with(self.init))
22− }
23−}
24−
25−pub static MATCHER: LazyMutex<nucleo::Matcher> = LazyMutex::new(nucleo::Matcher::default);
26−
27−/// convenience function to easily fuzzy match
28−/// on a (relatively small list of inputs). This is not recommended for building a full tui
29−/// application that can match large numbers of matches as all matching is done on the current
30−/// thread, effectively blocking the UI
31−pub fn fuzzy_match<T: AsRef<str>>(
32− pattern: &str,
33− items: impl IntoIterator<Item = T>,
34− path: bool,
35−) -> Vec<(T, u16)> {
36− let mut matcher = MATCHER.lock();
37− matcher.config = Config::DEFAULT;
38− if path {
39− matcher.config.set_match_paths();
40− }
41− let pattern = Atom::new(pattern, CaseMatching::Smart, AtomKind::Fuzzy, false);
42− pattern.match_list(items, &mut matcher)
43−}
helix-core/src/graphemes.rs+1−1
@@ -481,7 +481,7 @@ impl<'a> From<String> for GraphemeStr<'a> {
481 let ptr = Box::into_raw(g.into_bytes().into_boxed_slice()) as *mut u8;
481 let ptr = Box::into_raw(g.into_bytes().into_boxed_slice()) as *mut u8;
482 GraphemeStr {
482 GraphemeStr {
483 ptr: unsafe { NonNull::new_unchecked(ptr) },
483 ptr: unsafe { NonNull::new_unchecked(ptr) },
484− len: (i32::try_from(len).unwrap() as u32) | Self::MASK_OWNED,
484+ len: i32::try_from(len).unwrap() as u32,
485 phantom: PhantomData,
485 phantom: PhantomData,
486 }
486 }
487 }
487 }
helix-core/src/history.rs+2−2
@@ -72,8 +72,8 @@ impl Default for History {
72 revisions: vec![Revision {
72 revisions: vec![Revision {
73 parent: 0,
73 parent: 0,
74 last_child: None,
74 last_child: None,
75− transaction: Transaction::from(ChangeSet::new("".into())),
75+ transaction: Transaction::from(ChangeSet::new(&Rope::new())),
76− inversion: Transaction::from(ChangeSet::new("".into())),
76+ inversion: Transaction::from(ChangeSet::new(&Rope::new())),
77 timestamp: Instant::now(),
77 timestamp: Instant::now(),
78 }],
78 }],
79 current: 0,
79 current: 0,
helix-core/src/indent.rs+127−586
@@ -1,14 +1,13 @@
1−use std::{borrow::Cow, collections::HashMap};
1+use std::collections::HashMap;
2
2
3use tree_sitter::{Query, QueryCursor, QueryPredicateArg};
3use 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,
8− graphemes::{grapheme_width, tab_width_at},
7+ graphemes::tab_width_at,
9− syntax::{IndentationHeuristic, LanguageConfiguration, RopeProvider, Syntax},
8+ syntax::{LanguageConfiguration, RopeProvider, Syntax},
10 tree_sitter::Node,
9 tree_sitter::Node,
11− Position, Rope, RopeGraphemes, RopeSlice,
10+ Rope, RopeSlice,
12};
11};
13
12
14/// Enum representing indentation style.
13/// Enum representing indentation style.
@@ -22,7 +21,7 @@ pub enum IndentStyle {
22
21
23// 16 spaces
22// 16 spaces
24const INDENTS: &str = " ";
23const INDENTS: &str = " ";
25−pub const MAX_INDENT: u8 = 16;
24+const MAX_INDENT: u8 = 16;
26
25
27impl IndentStyle {
26impl IndentStyle {
28 /// Creates an `IndentStyle` from an indentation string.
27 /// Creates an `IndentStyle` from an indentation string.
@@ -197,56 +196,6 @@ pub fn indent_level_for_line(line: RopeSlice, tab_width: usize, indent_width: us
197 len / indent_width
196 len / indent_width
198}
197}
199
198
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−
250/// Computes for node and all ancestors whether they are the first node on their line.
199/// Computes for node and all ancestors whether they are the first node on their line.
251/// The first entry in the return value represents the root node, the last one the node itself
200/// The first entry in the return value represents the root node, the last one the node itself
252fn get_first_in_line(mut node: Node, new_line_byte_pos: Option<usize>) -> Vec<bool> {
201fn get_first_in_line(mut node: Node, new_line_byte_pos: Option<usize>) -> Vec<bool> {
@@ -288,140 +237,68 @@ fn get_first_in_line(mut node: Node, new_line_byte_pos: Option<usize>) -> Vec<bo
288/// This is usually constructed in one of 2 ways:
237/// This is usually constructed in one of 2 ways:
289/// - Successively add indent captures to get the (added) indent from a single line
238/// - Successively add indent captures to get the (added) indent from a single line
290/// - Successively add the indent results for each line
239/// - Successively add the indent results for each line
291−/// The string that this indentation defines starts with the string contained in the align field (unless it is None), followed by:
292−/// - max(0, indent - outdent) tabs, if tabs are used for indentation
293−/// - max(0, indent - outdent)*indent_width spaces, if spaces are used for indentation
294−#[derive(Default, Debug, PartialEq, Eq, Clone)]
240+#[derive(Default)]
295−pub struct Indentation<'a> {
241+pub struct Indentation {
242+ /// The total indent (the number of indent levels) is defined as max(0, indent-outdent).
243+ /// The string that this results in depends on the indent style (spaces or tabs, etc.)
296 indent: usize,
244 indent: usize,
297− indent_always: usize,
298 outdent: usize,
245 outdent: usize,
299− outdent_always: usize,
300− /// The alignment, as a string containing only tabs & spaces. Storing this as a string instead of e.g.
301− /// the (visual) width ensures that the alignment is preserved even if the tab width changes.
302− align: Option<RopeSlice<'a>>,
303}
246}
304−
305−impl<'a> Indentation<'a> {
247+impl Indentation {
306 /// Add some other [Indentation] to this.
248 /// Add some other [Indentation] to this.
307− /// The added indent should be the total added indent from one line.
249+ /// The added indent should be the total added indent from one line
308− /// Indent should always be added starting from the bottom (or equivalently, the innermost tree-sitter node).
309− fn add_line(&mut self, added: Indentation<'a>) {
250+ fn add_line(&mut self, added: &Indentation) {
310− // Align overrides the indent from outer scopes.
251+ if added.indent > 0 && added.outdent == 0 {
311− if self.align.is_some() {
252+ self.indent += 1;
312− return;
253+ } else if added.outdent > 0 && added.indent == 0 {
313− }
254+ self.outdent += 1;
314− if added.align.is_some() {
315− self.align = added.align;
316− return;
317 }
255 }
318− self.indent += added.indent;
319− self.indent_always += added.indent_always;
320− self.outdent += added.outdent;
321− self.outdent_always += added.outdent_always;
322 }
256 }
323−
324 /// Add an indent capture to this indent.
257 /// Add an indent capture to this indent.
325− /// Only captures that apply to the same line should be added together in this way (otherwise use `add_line`)
258+ /// All the captures that are added in this way should be on the same line.
326− /// and the captures should be added starting from the innermost tree-sitter node (currently this only matters
327− /// if multiple `@align` patterns occur on the same line).
328− fn add_capture(&mut self, added: IndentCaptureType<'a>) {
259+ fn add_capture(&mut self, added: IndentCaptureType) {
329 match added {
260 match added {
330 IndentCaptureType::Indent => {
261 IndentCaptureType::Indent => {
331− if self.indent_always == 0 {
332− self.indent = 1;
262+ self.indent = 1;
333− }
334− }
335− IndentCaptureType::IndentAlways => {
336− // any time we encounter an `indent.always` on the same line, we
337− // want to cancel out all regular indents
338− self.indent_always += 1;
339− self.indent = 0;
340 }
263 }
341 IndentCaptureType::Outdent => {
264 IndentCaptureType::Outdent => {
342− if self.outdent_always == 0 {
343− self.outdent = 1;
265+ self.outdent = 1;
344− }
345− }
346− IndentCaptureType::OutdentAlways => {
347− self.outdent_always += 1;
348− self.outdent = 0;
349− }
350− IndentCaptureType::Align(align) => {
351− if self.align.is_none() {
352− self.align = Some(align);
353− }
354 }
266 }
355 }
267 }
356 }
268 }
357− fn net_indent(&self) -> isize {
358− (self.indent + self.indent_always) as isize
359− - ((self.outdent + self.outdent_always) as isize)
360− }
361− /// Convert `self` into a string, taking into account the computed and actual indentation of some other line.
362− fn relative_indent(
363− &self,
364− other_computed_indent: &Self,
365− other_leading_whitespace: RopeSlice,
366− indent_style: &IndentStyle,
269+ fn as_string(&self, indent_style: &IndentStyle) -> String {
367− tab_width: usize,
270+ let indent_level = if self.indent >= self.outdent {
368− ) -> Option<String> {
271+ self.indent - self.outdent
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− ))
380 } else {
272 } else {
381− // If the alignment of both lines is different, we cannot compare their indentation in any meaningful way
273+ log::warn!("Encountered more outdent than indent nodes while calculating indentation: {} outdent, {} indent", self.outdent, self.indent);
382− None
274+ 0
383− }
275+ };
384− }
276+ indent_style.as_str().repeat(indent_level)
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− )
393 }
277 }
394}
278}
395
279
396/// An indent definition which corresponds to a capture from the indent query
280/// An indent definition which corresponds to a capture from the indent query
397−#[derive(Debug)]
398−struct IndentCapture<'a> {
281+struct IndentCapture {
399− capture_type: IndentCaptureType<'a>,
282+ capture_type: IndentCaptureType,
400 scope: IndentScope,
283 scope: IndentScope,
401}
284}
402−#[derive(Debug, Clone, PartialEq)]
285+#[derive(Clone, Copy)]
403−enum IndentCaptureType<'a> {
286+enum IndentCaptureType {
404 Indent,
287 Indent,
405− IndentAlways,
406 Outdent,
288 Outdent,
407− OutdentAlways,
408− /// Alignment given as a string of whitespace
409− Align(RopeSlice<'a>),
410}
289}
411−
412−impl<'a> IndentCaptureType<'a> {
290+impl IndentCaptureType {
413 fn default_scope(&self) -> IndentScope {
291 fn default_scope(&self) -> IndentScope {
414 match self {
292 match self {
415− IndentCaptureType::Indent | IndentCaptureType::IndentAlways => IndentScope::Tail,
293+ IndentCaptureType::Indent => IndentScope::Tail,
416− IndentCaptureType::Outdent | IndentCaptureType::OutdentAlways => IndentScope::All,
294+ IndentCaptureType::Outdent => IndentScope::All,
417− IndentCaptureType::Align(_) => IndentScope::All,
418 }
295 }
419 }
296 }
420}
297}
421/// This defines which part of a node an [IndentCapture] applies to.
298/// This defines which part of a node an [IndentCapture] applies to.
422/// Each [IndentCaptureType] has a default scope, but the scope can be changed
299/// Each [IndentCaptureType] has a default scope, but the scope can be changed
423/// with `#set!` property declarations.
300/// with `#set!` property declarations.
424−#[derive(Debug, Clone, Copy)]
301+#[derive(Clone, Copy)]
425enum IndentScope {
302enum IndentScope {
426 /// The indent applies to the whole node
303 /// The indent applies to the whole node
427 All,
304 All,
@@ -431,7 +308,6 @@ enum IndentScope {
431
308
432/// A capture from the indent query which does not define an indent but extends
309/// A capture from the indent query which does not define an indent but extends
433/// the range of a node. This is used before the indent is calculated.
310/// the range of a node. This is used before the indent is calculated.
434−#[derive(Debug)]
435enum ExtendCapture {
311enum ExtendCapture {
436 Extend,
312 Extend,
437 PreventOnce,
313 PreventOnce,
@@ -440,41 +316,24 @@ enum ExtendCapture {
440/// The result of running a tree-sitter indent query. This stores for
316/// The result of running a tree-sitter indent query. This stores for
441/// each node (identified by its ID) the relevant captures (already filtered
317/// each node (identified by its ID) the relevant captures (already filtered
442/// by predicates).
318/// by predicates).
443−#[derive(Debug)]
444−struct IndentQueryResult<'a> {
319+struct IndentQueryResult {
445− indent_captures: HashMap<usize, Vec<IndentCapture<'a>>>,
320+ indent_captures: HashMap<usize, Vec<IndentCapture>>,
446 extend_captures: HashMap<usize, Vec<ExtendCapture>>,
321 extend_captures: HashMap<usize, Vec<ExtendCapture>>,
447}
322}
448
323
449−fn get_node_start_line(node: Node, new_line_byte_pos: Option<usize>) -> usize {
450− let mut node_line = node.start_position().row;
451− // Adjust for the new line that will be inserted
452− if new_line_byte_pos.map_or(false, |pos| node.start_byte() >= pos) {
453− node_line += 1;
454− }
455− node_line
456−}
457−fn get_node_end_line(node: Node, new_line_byte_pos: Option<usize>) -> usize {
458− let mut node_line = node.end_position().row;
459− // Adjust for the new line that will be inserted (with a strict inequality since end_byte is exclusive)
460− if new_line_byte_pos.map_or(false, |pos| node.end_byte() > pos) {
461− node_line += 1;
462− }
463− node_line
464−}
465−
466−fn query_indents<'a>(
324+fn query_indents(
467 query: &Query,
325 query: &Query,
468 syntax: &Syntax,
326 syntax: &Syntax,
469 cursor: &mut QueryCursor,
327 cursor: &mut QueryCursor,
470− text: RopeSlice<'a>,
328+ text: RopeSlice,
471 range: std::ops::Range<usize>,
329 range: std::ops::Range<usize>,
472− new_line_byte_pos: Option<usize>,
330+ // Position of the (optional) newly inserted line break.
331+ // Given as (line, byte_pos)
332+ new_line_break: Option<(usize, usize)>,
473−) -> IndentQueryResult<'a> {
333+) -> IndentQueryResult {
474 let mut indent_captures: HashMap<usize, Vec<IndentCapture>> = HashMap::new();
334 let mut indent_captures: HashMap<usize, Vec<IndentCapture>> = HashMap::new();
475 let mut extend_captures: HashMap<usize, Vec<ExtendCapture>> = HashMap::new();
335 let mut extend_captures: HashMap<usize, Vec<ExtendCapture>> = HashMap::new();
476 cursor.set_byte_range(range);
336 cursor.set_byte_range(range);
477−
478 // Iterate over all captures from the query
337 // Iterate over all captures from the query
479 for m in cursor.matches(query, syntax.tree().root_node(), RopeProvider(text)) {
338 for m in cursor.matches(query, syntax.tree().root_node(), RopeProvider(text)) {
480 // Skip matches where not all custom predicates are fulfilled
339 // Skip matches where not all custom predicates are fulfilled
@@ -501,13 +360,21 @@ fn query_indents<'a>(
501 Some(QueryPredicateArg::Capture(capt1)),
360 Some(QueryPredicateArg::Capture(capt1)),
502 Some(QueryPredicateArg::Capture(capt2))
361 Some(QueryPredicateArg::Capture(capt2))
503 ) => {
362 ) => {
363+ let get_line_num = |node: Node| {
364+ let mut node_line = node.start_position().row;
365+ // Adjust for the new line that will be inserted
366+ if let Some((line, byte)) = new_line_break {
367+ if node_line==line && node.start_byte()>=byte {
368+ node_line += 1;
369+ }
370+ }
371+ node_line
372+ };
504 let n1 = m.nodes_for_capture_index(*capt1).next();
373 let n1 = m.nodes_for_capture_index(*capt1).next();
505 let n2 = m.nodes_for_capture_index(*capt2).next();
374 let n2 = m.nodes_for_capture_index(*capt2).next();
506 match (n1, n2) {
375 match (n1, n2) {
507 (Some(n1), Some(n2)) => {
376 (Some(n1), Some(n2)) => {
508− let n1_line = get_node_start_line(n1, new_line_byte_pos);
377+ let same_line = get_line_num(n1)==get_line_num(n2);
509− let n2_line = get_node_start_line(n2, new_line_byte_pos);
510− let same_line = n1_line == n2_line;
511 same_line==(pred.operator.as_ref()=="same-line?")
378 same_line==(pred.operator.as_ref()=="same-line?")
512 }
379 }
513 _ => true,
380 _ => true,
@@ -518,23 +385,6 @@ fn query_indents<'a>(
518 }
385 }
519 }
386 }
520 }
387 }
521− "one-line?" | "not-one-line?" => match pred.args.get(0) {
522− Some(QueryPredicateArg::Capture(capture_idx)) => {
523− let node = m.nodes_for_capture_index(*capture_idx).next();
524−
525− match node {
526− Some(node) => {
527− let (start_line, end_line) = (get_node_start_line(node,new_line_byte_pos), get_node_end_line(node, new_line_byte_pos));
528− let one_line = end_line == start_line;
529− one_line != (pred.operator.as_ref() == "not-one-line?")
530− },
531− _ => true,
532− }
533− }
534− _ => {
535− panic!("Invalid indent query: Arguments to \"not-kind-eq?\" must be a capture and a string");
536− }
537− },
538 _ => {
388 _ => {
539 panic!(
389 panic!(
540 "Invalid indent query: Unknown predicate (\"{}\")",
390 "Invalid indent query: Unknown predicate (\"{}\")",
@@ -545,28 +395,11 @@ fn query_indents<'a>(
545 }) {
395 }) {
546 continue;
396 continue;
547 }
397 }
548− // A list of pairs (node_id, indent_capture) that are added by this match.
549− // They cannot be added to indent_captures immediately since they may depend on other captures (such as an @anchor).
550− let mut added_indent_captures: Vec<(usize, IndentCapture)> = Vec::new();
551− // The row/column position of the optional anchor in this query
552− let mut anchor: Option<tree_sitter::Node> = None;
553 for capture in m.captures {
398 for capture in m.captures {
554 let capture_name = query.capture_names()[capture.index as usize].as_str();
399 let capture_name = query.capture_names()[capture.index as usize].as_str();
555 let capture_type = match capture_name {
400 let capture_type = match capture_name {
556 "indent" => IndentCaptureType::Indent,
401 "indent" => IndentCaptureType::Indent,
557− "indent.always" => IndentCaptureType::IndentAlways,
558 "outdent" => IndentCaptureType::Outdent,
402 "outdent" => IndentCaptureType::Outdent,
559− "outdent.always" => IndentCaptureType::OutdentAlways,
560− // The alignment will be updated to the correct value at the end, when the anchor is known.
561− "align" => IndentCaptureType::Align(RopeSlice::from("")),
562− "anchor" => {
563− if anchor.is_some() {
564− log::error!("Invalid indent query: Encountered more than one @anchor in the same match.")
565− } else {
566− anchor = Some(capture.node);
567− }
568− continue;
569− }
570 "extend" => {
403 "extend" => {
571 extend_captures
404 extend_captures
572 .entry(capture.node.id())
405 .entry(capture.node.id())
@@ -616,40 +449,17 @@ fn query_indents<'a>(
616 }
449 }
617 }
450 }
618 }
451 }
619− added_indent_captures.push((capture.node.id(), indent_capture))
620− }
621− for (node_id, mut capture) in added_indent_captures {
622− // Set the anchor for all align queries.
623− if let IndentCaptureType::Align(_) = capture.capture_type {
624− let anchor = match anchor {
625− None => {
626− log::error!(
627− "Invalid indent query: @align requires an accompanying @anchor."
628− );
629− continue;
630− }
631− Some(anchor) => anchor,
632− };
633− capture.capture_type = IndentCaptureType::Align(
634− text.line(anchor.start_position().row)
635− .byte_slice(0..anchor.start_position().column),
636− );
637− }
638 indent_captures
452 indent_captures
639− .entry(node_id)
453+ .entry(capture.node.id())
454+ // Most entries only need to contain a single IndentCapture
640 .or_insert_with(|| Vec::with_capacity(1))
455 .or_insert_with(|| Vec::with_capacity(1))
641− .push(capture);
456+ .push(indent_capture);
642 }
457 }
643 }
458 }
644−
645− let result = IndentQueryResult {
459+ IndentQueryResult {
646 indent_captures,
460 indent_captures,
647 extend_captures,
461 extend_captures,
648− };
462+ }
649−
650− log::trace!("indent result = {:?}", result);
651−
652− result
653}
463}
654
464
655/// Handle extend queries. deepest_preceding is the deepest descendant of node that directly precedes the cursor position.
465/// Handle extend queries. deepest_preceding is the deepest descendant of node that directly precedes the cursor position.
@@ -719,27 +529,61 @@ fn extend_nodes<'a>(
719 }
529 }
720}
530}
721
531
722−/// Prepare an indent query by computing:
532+/// Use the syntax tree to determine the indentation for a given position.
723−/// - The node from which to start the query (this is non-trivial due to `@extend` captures)
533+/// This can be used in 2 ways:
724−/// - The indent captures for all relevant nodes.
534+///
535+/// - To get the correct indentation for an existing line (new_line=false), not necessarily equal to the current indentation.
536+/// - In this case, pos should be inside the first tree-sitter node on that line.
537+/// In most cases, this can just be the first non-whitespace on that line.
538+/// - To get the indentation for a new line (new_line=true). This behaves like the first usecase if the part of the current line
539+/// after pos were moved to a new line.
540+///
541+/// The indentation is determined by traversing all the tree-sitter nodes containing the position.
542+/// Each of these nodes produces some [Indentation] for:
543+///
544+/// - The line of the (beginning of the) node. This is defined by the scope `all` if this is the first node on its line.
545+/// - The line after the node. This is defined by:
546+/// - The scope `tail`.
547+/// - The scope `all` if this node is not the first node on its line.
548+/// Intuitively, `all` applies to everything contained in this node while `tail` applies to everything except for the first line of the node.
549+/// The indents from different nodes for the same line are then combined.
550+/// The result [Indentation] is simply the sum of the [Indentation] for all lines.
551+///
552+/// Specifying which line exactly an [Indentation] applies to is important because indents on the same line combine differently than indents on different lines:
553+/// ```ignore
554+/// some_function(|| {
555+/// // Both the function parameters as well as the contained block should be indented.
556+/// // Because they are on the same line, this only yields one indent level
557+/// });
558+/// ```
559+///
560+/// ```ignore
561+/// some_function(
562+/// param1,
563+/// || {
564+/// // Here we get 2 indent levels because the 'parameters' and the 'block' node begin on different lines
565+/// },
566+/// );
567+/// ```
725#[allow(clippy::too_many_arguments)]
568#[allow(clippy::too_many_arguments)]
726−fn init_indent_query<'a, 'b>(
569+pub fn treesitter_indent_for_pos(
727 query: &Query,
570 query: &Query,
728− syntax: &'a Syntax,
571+ syntax: &Syntax,
729− text: RopeSlice<'b>,
572+ indent_style: &IndentStyle,
730 tab_width: usize,
573 tab_width: usize,
731 indent_width: usize,
574 indent_width: usize,
575+ text: RopeSlice,
732 line: usize,
576 line: usize,
733− byte_pos: usize,
577+ pos: usize,
734− new_line_byte_pos: Option<usize>,
578+ new_line: bool,
735−) -> Option<(Node<'a>, HashMap<usize, Vec<IndentCapture<'b>>>)> {
579+) -> Option<String> {
580+ let byte_pos = text.char_to_byte(pos);
736 // The innermost tree-sitter node which is considered for the indent
581 // The innermost tree-sitter node which is considered for the indent
737 // computation. It may change if some predeceding node is extended
582 // computation. It may change if some predeceding node is extended
738 let mut node = syntax
583 let mut node = syntax
739 .tree()
584 .tree()
740 .root_node()
585 .root_node()
741 .descendant_for_byte_range(byte_pos, byte_pos)?;
586 .descendant_for_byte_range(byte_pos, byte_pos)?;
742−
743 let (query_result, deepest_preceding) = {
587 let (query_result, deepest_preceding) = {
744 // The query range should intersect with all nodes directly preceding
588 // The query range should intersect with all nodes directly preceding
745 // the position of the indent query in case one of them is extended.
589 // the position of the indent query in case one of them is extended.
@@ -770,12 +614,13 @@ fn init_indent_query<'a, 'b>(
770 &mut cursor,
614 &mut cursor,
771 text,
615 text,
772 query_range,
616 query_range,
773− new_line_byte_pos,
617+ new_line.then_some((line, byte_pos)),
774 );
618 );
775 ts_parser.cursors.push(cursor);
619 ts_parser.cursors.push(cursor);
776 (query_result, deepest_preceding)
620 (query_result, deepest_preceding)
777 })
621 })
778 };
622 };
623+ let indent_captures = query_result.indent_captures;
779 let extend_captures = query_result.extend_captures;
624 let extend_captures = query_result.extend_captures;
780
625
781 // Check for extend captures, potentially changing the node that the indent calculation starts with
626 // Check for extend captures, potentially changing the node that the indent calculation starts with
@@ -790,68 +635,6 @@ fn init_indent_query<'a, 'b>(
790 indent_width,
635 indent_width,
791 );
636 );
792 }
637 }
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− )?;
855 let mut first_in_line = get_first_in_line(node, new_line.then_some(byte_pos));
638 let mut first_in_line = get_first_in_line(node, new_line.then_some(byte_pos));
856
639
857 let mut result = Indentation::default();
640 let mut result = Indentation::default();
@@ -859,16 +642,12 @@ pub fn treesitter_indent_for_pos<'a>(
859 // even if there are multiple "indent" nodes on the same line
642 // even if there are multiple "indent" nodes on the same line
860 let mut indent_for_line = Indentation::default();
643 let mut indent_for_line = Indentation::default();
861 let mut indent_for_line_below = Indentation::default();
644 let mut indent_for_line_below = Indentation::default();
862−
863 loop {
645 loop {
864 // This can safely be unwrapped because `first_in_line` contains
646 // This can safely be unwrapped because `first_in_line` contains
865 // one entry for each ancestor of the node (which is what we iterate over)
647 // one entry for each ancestor of the node (which is what we iterate over)
866 let is_first = *first_in_line.last().unwrap();
648 let is_first = *first_in_line.last().unwrap();
867−
868− // Apply all indent definitions for this node.
649+ // Apply all indent definitions for this node
869− // Since we only iterate over each node once, we can remove the
870− // corresponding captures from the HashMap to avoid cloning them.
871− if let Some(definitions) = indent_captures.remove(&node.id()) {
650+ if let Some(definitions) = indent_captures.get(&node.id()) {
872 for definition in definitions {
651 for definition in definitions {
873 match definition.scope {
652 match definition.scope {
874 IndentScope::All => {
653 IndentScope::All => {
@@ -886,22 +665,28 @@ pub fn treesitter_indent_for_pos<'a>(
886 }
665 }
887
666
888 if let Some(parent) = node.parent() {
667 if let Some(parent) = node.parent() {
889− let node_line = get_node_start_line(node, new_line_byte_pos);
668+ let mut node_line = node.start_position().row;
890− let parent_line = get_node_start_line(parent, new_line_byte_pos);
669+ let mut parent_line = parent.start_position().row;
891−
670+ if node_line == line && new_line {
671+ // Also consider the line that will be inserted
672+ if node.start_byte() >= byte_pos {
673+ node_line += 1;
674+ }
675+ if parent.start_byte() >= byte_pos {
676+ parent_line += 1;
677+ }
678+ };
892 if node_line != parent_line {
679 if node_line != parent_line {
893− // Don't add indent for the line below the line of the query
894 if node_line < line + (new_line as usize) {
680 if node_line < line + (new_line as usize) {
681+ // Don't add indent for the line below the line of the query
895− result.add_line(indent_for_line_below);
682+ result.add_line(&indent_for_line_below);
896 }
683 }
897−
898 if node_line == parent_line + 1 {
684 if node_line == parent_line + 1 {
899 indent_for_line_below = indent_for_line;
685 indent_for_line_below = indent_for_line;
900 } else {
686 } else {
901− result.add_line(indent_for_line);
687+ result.add_line(&indent_for_line);
902 indent_for_line_below = Indentation::default();
688 indent_for_line_below = Indentation::default();
903 }
689 }
904−
905 indent_for_line = Indentation::default();
690 indent_for_line = Indentation::default();
906 }
691 }
907
692
@@ -913,13 +698,13 @@ pub fn treesitter_indent_for_pos<'a>(
913 if (node.start_position().row < line)
698 if (node.start_position().row < line)
914 || (new_line && node.start_position().row == line && node.start_byte() < byte_pos)
699 || (new_line && node.start_position().row == line && node.start_byte() < byte_pos)
915 {
700 {
916− result.add_line(indent_for_line_below);
701+ result.add_line(&indent_for_line_below);
917 }
702 }
918− result.add_line(indent_for_line);
703+ result.add_line(&indent_for_line);
919 break;
704 break;
920 }
705 }
921 }
706 }
922− Some(result)
707+ Some(result.as_string(indent_style))
923}
708}
924
709
925/// Returns the indentation for a new line.
710/// Returns the indentation for a new line.
@@ -928,7 +713,6 @@ pub fn treesitter_indent_for_pos<'a>(
928pub fn indent_for_newline(
713pub fn indent_for_newline(
929 language_config: Option<&LanguageConfiguration>,
714 language_config: Option<&LanguageConfiguration>,
930 syntax: Option<&Syntax>,
715 syntax: Option<&Syntax>,
931− indent_heuristic: &IndentationHeuristic,
932 indent_style: &IndentStyle,
716 indent_style: &IndentStyle,
933 tab_width: usize,
717 tab_width: usize,
934 text: RopeSlice,
718 text: RopeSlice,
@@ -937,18 +721,14 @@ pub fn indent_for_newline(
937 current_line: usize,
721 current_line: usize,
938) -> String {
722) -> String {
939 let indent_width = indent_style.indent_width(tab_width);
723 let indent_width = indent_style.indent_width(tab_width);
940− if let (
941− IndentationHeuristic::TreeSitter | IndentationHeuristic::Hybrid,
942− Some(query),
943− Some(syntax),
724+ if let (Some(query), Some(syntax)) = (
944− ) = (
945− indent_heuristic,
946 language_config.and_then(|config| config.indent_query()),
725 language_config.and_then(|config| config.indent_query()),
947 syntax,
726 syntax,
948 ) {
727 ) {
949 if let Some(indent) = treesitter_indent_for_pos(
728 if let Some(indent) = treesitter_indent_for_pos(
950 query,
729 query,
951 syntax,
730 syntax,
731+ indent_style,
952 tab_width,
732 tab_width,
953 indent_width,
733 indent_width,
954 text,
734 text,
@@ -956,57 +736,9 @@ pub fn indent_for_newline(
956 line_before_end_pos,
736 line_before_end_pos,
957 true,
737 true,
958 ) {
738 ) {
959− if *indent_heuristic == IndentationHeuristic::Hybrid {
960− // We want to compute the indentation not only based on the
961− // syntax tree but also on the actual indentation of a previous
962− // line. This makes indentation computation more resilient to
963− // incomplete queries, incomplete source code & differing indentation
964− // styles for the same language.
965− // However, using the indent of a previous line as a baseline may not
966− // make sense, e.g. if it has a different alignment than the new line.
967− // In order to prevent edge cases with long running times, we only try
968− // a constant number of (non-empty) lines.
969− const MAX_ATTEMPTS: usize = 4;
970− let mut num_attempts = 0;
971− for line_idx in (0..=line_before).rev() {
972− let line = text.line(line_idx);
973− let first_non_whitespace_char = match find_first_non_whitespace_char(line) {
974− Some(i) => i,
975− None => {
976− continue;
977− }
978− };
979− if let Some(indent) = (|| {
980− let computed_indent = treesitter_indent_for_pos(
981− query,
982− syntax,
983− tab_width,
984− indent_width,
985− text,
986− line_idx,
987− text.line_to_char(line_idx) + first_non_whitespace_char,
988− false,
989− )?;
990− let leading_whitespace = line.slice(0..first_non_whitespace_char);
991− indent.relative_indent(
992− &computed_indent,
993− leading_whitespace,
994− indent_style,
995− tab_width,
996− )
997− })() {
998− return indent;
739+ 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);
1007 };
740 };
1008 }
741 }
1009− // Fallback in case we either don't have indent queries or they failed for some reason
1010 let indent_level = indent_level_for_line(text.line(current_line), tab_width, indent_width);
742 let indent_level = indent_level_for_line(text.line(current_line), tab_width, indent_width);
1011 indent_style.as_str().repeat(indent_level)
743 indent_style.as_str().repeat(indent_level)
1012}
744}
@@ -1078,195 +810,4 @@ mod test {
1078 2
810 2
1079 );
811 );
1080 }
812 }
1081−
1082− #[test]
1083− fn add_capture() {
1084− let indent = || Indentation {
1085− indent: 1,
1086− ..Default::default()
1087− };
1088− let indent_always = || Indentation {
1089− indent_always: 1,
1090− ..Default::default()
1091− };
1092− let outdent = || Indentation {
1093− outdent: 1,
1094− ..Default::default()
1095− };
1096− let outdent_always = || Indentation {
1097− outdent_always: 1,
1098− ..Default::default()
1099− };
1100−
1101− fn add_capture<'a>(
1102− mut indent: Indentation<'a>,
1103− capture: IndentCaptureType<'a>,
1104− ) -> Indentation<'a> {
1105− indent.add_capture(capture);
1106− indent
1107− }
1108−
1109− // adding an indent to no indent makes an indent
1110− assert_eq!(
1111− indent(),
1112− add_capture(Indentation::default(), IndentCaptureType::Indent)
1113− );
1114− assert_eq!(
1115− indent_always(),
1116− add_capture(Indentation::default(), IndentCaptureType::IndentAlways)
1117− );
1118− assert_eq!(
1119− outdent(),
1120− add_capture(Indentation::default(), IndentCaptureType::Outdent)
1121− );
1122− assert_eq!(
1123− outdent_always(),
1124− add_capture(Indentation::default(), IndentCaptureType::OutdentAlways)
1125− );
1126−
1127− // adding an indent to an already indented has no effect
1128− assert_eq!(indent(), add_capture(indent(), IndentCaptureType::Indent));
1129− assert_eq!(
1130− outdent(),
1131− add_capture(outdent(), IndentCaptureType::Outdent)
1132− );
1133−
1134− // adding an always to a regular makes it always
1135− assert_eq!(
1136− indent_always(),
1137− add_capture(indent(), IndentCaptureType::IndentAlways)
1138− );
1139− assert_eq!(
1140− outdent_always(),
1141− add_capture(outdent(), IndentCaptureType::OutdentAlways)
1142− );
1143−
1144− // adding an always to an always is additive
1145− assert_eq!(
1146− Indentation {
1147− indent_always: 2,
1148− ..Default::default()
1149− },
1150− add_capture(indent_always(), IndentCaptureType::IndentAlways)
1151− );
1152− assert_eq!(
1153− Indentation {
1154− outdent_always: 2,
1155− ..Default::default()
1156− },
1157− add_capture(outdent_always(), IndentCaptureType::OutdentAlways)
1158− );
1159−
1160− // adding regular to always should be associative
1161− assert_eq!(
1162− Indentation {
1163− indent_always: 1,
1164− ..Default::default()
1165− },
1166− add_capture(
1167− add_capture(indent(), IndentCaptureType::Indent),
1168− IndentCaptureType::IndentAlways
1169− )
1170− );
1171− assert_eq!(
1172− Indentation {
1173− indent_always: 1,
1174− ..Default::default()
1175− },
1176− add_capture(
1177− add_capture(indent(), IndentCaptureType::IndentAlways),
1178− IndentCaptureType::Indent
1179− )
1180− );
1181− assert_eq!(
1182− Indentation {
1183− outdent_always: 1,
1184− ..Default::default()
1185− },
1186− add_capture(
1187− add_capture(outdent(), IndentCaptureType::Outdent),
1188− IndentCaptureType::OutdentAlways
1189− )
1190− );
1191− assert_eq!(
1192− Indentation {
1193− outdent_always: 1,
1194− ..Default::default()
1195− },
1196− add_capture(
1197− add_capture(outdent(), IndentCaptureType::OutdentAlways),
1198− IndentCaptureType::Outdent
1199− )
1200− );
1201− }
1202−
1203− #[test]
1204− fn test_relative_indent() {
1205− let indent_style = IndentStyle::Spaces(4);
1206− let tab_width: usize = 4;
1207− let no_align = [
1208− Indentation::default(),
1209− Indentation {
1210− indent: 1,
1211− ..Default::default()
1212− },
1213− Indentation {
1214− indent: 5,
1215− outdent: 1,
1216− ..Default::default()
1217− },
1218− ];
1219− let align = no_align.clone().map(|indent| Indentation {
1220− align: Some(RopeSlice::from("12345")),
1221− ..indent
1222− });
1223− let different_align = Indentation {
1224− align: Some(RopeSlice::from("123456")),
1225− ..Default::default()
1226− };
1227−
1228− // Check that relative and absolute indentation computation are the same when the line we compare to is
1229− // indented as we expect.
1230− let check_consistency = |indent: &Indentation, other: &Indentation| {
1231− assert_eq!(
1232− indent.relative_indent(
1233− other,
1234− RopeSlice::from(other.to_string(&indent_style, tab_width).as_str()),
1235− &indent_style,
1236− tab_width
1237− ),
1238− Some(indent.to_string(&indent_style, tab_width))
1239− );
1240− };
1241− for a in &no_align {
1242− for b in &no_align {
1243− check_consistency(a, b);
1244− }
1245− }
1246− for a in &align {
1247− for b in &align {
1248− check_consistency(a, b);
1249− }
1250− }
1251−
1252− // Relative indent computation makes no sense if the alignment differs
1253− assert_eq!(
1254− align[0].relative_indent(
1255− &no_align[0],
1256− RopeSlice::from(" "),
1257− &indent_style,
1258− tab_width
1259− ),
1260− None
1261− );
1262− assert_eq!(
1263− align[0].relative_indent(
1264− &different_align,
1265− RopeSlice::from(" "),
1266− &indent_style,
1267− tab_width
1268− ),
1269− None
1270− );
1271− }
1272}
813}
helix-core/src/lib.rs+1−3
@@ -7,7 +7,6 @@ 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;
11pub mod graphemes;
10pub mod graphemes;
12pub mod history;
11pub mod history;
13pub mod increment;
12pub mod increment;
@@ -19,6 +18,7 @@ pub mod movement;
19pub mod object;
18pub mod object;
20pub mod path;
19pub mod path;
21mod position;
20mod position;
21+pub mod register;
22pub mod search;
22pub mod search;
23pub mod selection;
23pub mod selection;
24pub mod shellwords;
24pub mod shellwords;
@@ -41,9 +41,7 @@ pub use helix_loader::find_workspace;
41pub fn find_first_non_whitespace_char(line: RopeSlice) -> Option<usize> {
41pub fn find_first_non_whitespace_char(line: RopeSlice) -> Option<usize> {
42 line.chars().position(|ch| !ch.is_whitespace())
42 line.chars().position(|ch| !ch.is_whitespace())
43}
43}
44−mod rope_reader;
45
44
46−pub use rope_reader::RopeReader;
47pub use ropey::{self, str_utils, Rope, RopeBuilder, RopeSlice};
45pub use ropey::{self, str_utils, Rope, RopeBuilder, RopeSlice};
48
46
49// pub use tendril::StrTendril as Tendril;
47// pub use tendril::StrTendril as Tendril;
helix-core/src/match_brackets.rs+2−6
@@ -106,16 +106,12 @@ fn find_pair(
106 for close in
106 for close in
107 iter::successors(node.next_sibling(), |node| node.next_sibling()).take(MATCH_LIMIT)
107 iter::successors(node.next_sibling(), |node| node.next_sibling()).take(MATCH_LIMIT)
108 {
108 {
109− let Some(open) = as_close_pair(doc, &close) else {
109+ let Some(open) = as_close_pair(doc, &close) else { continue; };
110− continue;
111− };
112 if find_pair_end(doc, Some(node), open, Backward).is_some() {
110 if find_pair_end(doc, Some(node), open, Backward).is_some() {
113 return doc.try_byte_to_char(close.start_byte()).ok();
111 return doc.try_byte_to_char(close.start_byte()).ok();
114 }
112 }
115 }
113 }
116− let Some(parent) = node.parent() else {
114+ let Some(parent) = node.parent() else { break; };
117− break;
118− };
119 node = parent;
115 node = parent;
120 }
116 }
121 let node = tree.root_node().named_descendant_for_byte_range(pos, pos)?;
117 let node = tree.root_node().named_descendant_for_byte_range(pos, pos)?;
helix-core/src/movement.rs+1−80
@@ -16,7 +16,7 @@ use crate::{
16 syntax::LanguageConfiguration,
16 syntax::LanguageConfiguration,
17 text_annotations::TextAnnotations,
17 text_annotations::TextAnnotations,
18 textobject::TextObject,
18 textobject::TextObject,
19− visual_offset_from_block, Range, RopeSlice, Selection, Syntax,
19+ visual_offset_from_block, Range, RopeSlice,
20};
20};
21
21
22#[derive(Debug, Copy, Clone, PartialEq, Eq)]
22#[derive(Debug, Copy, Clone, PartialEq, Eq)]
@@ -556,85 +556,6 @@ pub fn goto_treesitter_object(
556 last_range
556 last_range
557}
557}
558
558
559−fn find_parent_start(mut node: Node) -> Option<Node> {
560− let start = node.start_byte();
561−
562− while node.start_byte() >= start || !node.is_named() {
563− node = node.parent()?;
564− }
565−
566− Some(node)
567−}
568−
569−pub fn move_parent_node_end(
570− syntax: &Syntax,
571− text: RopeSlice,
572− selection: Selection,
573− dir: Direction,
574− movement: Movement,
575−) -> Selection {
576− let tree = syntax.tree();
577−
578− selection.transform(|range| {
579− let start_from = text.char_to_byte(range.from());
580− let start_to = text.char_to_byte(range.to());
581−
582− let mut node = match tree
583− .root_node()
584− .named_descendant_for_byte_range(start_from, start_to)
585− {
586− Some(node) => node,
587− None => {
588− log::debug!(
589− "no descendant found for byte range: {} - {}",
590− start_from,
591− start_to
592− );
593− return range;
594− }
595− };
596−
597− let mut end_head = match dir {
598− // moving forward, we always want to move one past the end of the
599− // current node, so use the end byte of the current node, which is an exclusive
600− // end of the range
601− Direction::Forward => text.byte_to_char(node.end_byte()),
602−
603− // moving backward, we want the cursor to land on the start char of
604− // the current node, or if it is already at the start of a node, to traverse up to
605− // the parent
606− Direction::Backward => {
607− let end_head = text.byte_to_char(node.start_byte());
608−
609− // if we're already on the beginning, look up to the parent
610− if end_head == range.cursor(text) {
611− node = find_parent_start(node).unwrap_or(node);
612− text.byte_to_char(node.start_byte())
613− } else {
614− end_head
615− }
616− }
617− };
618−
619− if movement == Movement::Move {
620− // preserve direction of original range
621− if range.direction() == Direction::Forward {
622− Range::new(end_head, end_head + 1)
623− } else {
624− Range::new(end_head + 1, end_head)
625− }
626− } else {
627− // if we end up with a forward range, then adjust it to be one past
628− // where we want
629− if end_head >= range.anchor {
630− end_head += 1;
631− }
632−
633− Range::new(range.anchor, end_head)
634− }
635− })
636−}
637−
638#[cfg(test)]
559#[cfg(test)]
639mod test {
560mod test {
640 use ropey::Rope;
561 use ropey::Rope;
helix-core/src/path.rs+7−5
@@ -85,21 +85,23 @@ pub fn get_normalized_path(path: &Path) -> PathBuf {
85///
85///
86/// This function is used instead of `std::fs::canonicalize` because we don't want to verify
86/// This function is used instead of `std::fs::canonicalize` because we don't want to verify
87/// here if the path exists, just normalize it's components.
87/// here if the path exists, just normalize it's components.
88−pub fn get_canonicalized_path(path: &Path) -> PathBuf {
88+pub fn get_canonicalized_path(path: &Path) -> std::io::Result<PathBuf> {
89 let path = expand_tilde(path);
89 let path = expand_tilde(path);
90 let path = if path.is_relative() {
90 let path = if path.is_relative() {
91− helix_loader::current_working_dir().join(path)
91+ std::env::current_dir().map(|current_dir| current_dir.join(path))?
92 } else {
92 } else {
93 path
93 path
94 };
94 };
95
95
96− get_normalized_path(path.as_path())
96+ Ok(get_normalized_path(path.as_path()))
97}
97}
98
98
99pub fn get_relative_path(path: &Path) -> PathBuf {
99pub fn get_relative_path(path: &Path) -> PathBuf {
100 let path = PathBuf::from(path);
100 let path = PathBuf::from(path);
101 let path = if path.is_absolute() {
101 let path = if path.is_absolute() {
102+ let cwdir = std::env::current_dir()
102− let cwdir = get_normalized_path(&helix_loader::current_working_dir());
103+ .map(|path| get_normalized_path(&path))
104+ .expect("couldn't determine current directory");
103 get_normalized_path(&path)
105 get_normalized_path(&path)
104 .strip_prefix(cwdir)
106 .strip_prefix(cwdir)
105 .map(PathBuf::from)
107 .map(PathBuf::from)
@@ -140,7 +142,7 @@ pub fn get_relative_path(path: &Path) -> PathBuf {
140/// ```
142/// ```
141///
143///
142pub fn get_truncated_path<P: AsRef<Path>>(path: P) -> PathBuf {
144pub fn get_truncated_path<P: AsRef<Path>>(path: P) -> PathBuf {
143− let cwd = helix_loader::current_working_dir();
145+ let cwd = std::env::current_dir().unwrap_or_default();
144 let path = path
146 let path = path
145 .as_ref()
147 .as_ref()
146 .strip_prefix(cwd)
148 .strip_prefix(cwd)
helix-core/src/register.rsnew file+89
@@ -0,0 +1,89 @@
1+use std::collections::HashMap;
2+
3+#[derive(Debug)]
4+pub struct Register {
5+ name: char,
6+ values: Vec<String>,
7+}
8+
9+impl Register {
10+ pub const fn new(name: char) -> Self {
11+ Self {
12+ name,
13+ values: Vec::new(),
14+ }
15+ }
16+
17+ pub fn new_with_values(name: char, values: Vec<String>) -> Self {
18+ Self { name, values }
19+ }
20+
21+ pub const fn name(&self) -> char {
22+ self.name
23+ }
24+
25+ pub fn read(&self) -> &[String] {
26+ &self.values
27+ }
28+
29+ pub fn write(&mut self, values: Vec<String>) {
30+ self.values = values;
31+ }
32+
33+ pub fn push(&mut self, value: String) {
34+ self.values.push(value);
35+ }
36+}
37+
38+/// Currently just wraps a `HashMap` of `Register`s
39+#[derive(Debug, Default)]
40+pub struct Registers {
41+ inner: HashMap<char, Register>,
42+}
43+
44+impl Registers {
45+ pub fn get(&self, name: char) -> Option<&Register> {
46+ self.inner.get(&name)
47+ }
48+
49+ pub fn read(&self, name: char) -> Option<&[String]> {
50+ self.get(name).map(|reg| reg.read())
51+ }
52+
53+ pub fn write(&mut self, name: char, values: Vec<String>) {
54+ if name != '_' {
55+ self.inner
56+ .insert(name, Register::new_with_values(name, values));
57+ }
58+ }
59+
60+ pub fn push(&mut self, name: char, value: String) {
61+ if name != '_' {
62+ if let Some(r) = self.inner.get_mut(&name) {
63+ r.push(value);
64+ } else {
65+ self.write(name, vec![value]);
66+ }
67+ }
68+ }
69+
70+ pub fn first(&self, name: char) -> Option<&String> {
71+ self.read(name).and_then(|entries| entries.first())
72+ }
73+
74+ pub fn last(&self, name: char) -> Option<&String> {
75+ self.read(name).and_then(|entries| entries.last())
76+ }
77+
78+ pub fn inner(&self) -> &HashMap<char, Register> {
79+ &self.inner
80+ }
81+
82+ pub fn clear(&mut self) {
83+ self.inner.clear();
84+ }
85+
86+ pub fn remove(&mut self, name: char) -> Option<Register> {
87+ self.inner.remove(&name)
88+ }
89+}
helix-core/src/rope_reader.rsdeleted−37
@@ -1,37 +0,0 @@
1−use std::io;
2−
3−use ropey::iter::Chunks;
4−use ropey::RopeSlice;
5−
6−pub struct RopeReader<'a> {
7− current_chunk: &'a [u8],
8− chunks: Chunks<'a>,
9−}
10−
11−impl<'a> RopeReader<'a> {
12− pub fn new(rope: RopeSlice<'a>) -> RopeReader<'a> {
13− RopeReader {
14− current_chunk: &[],
15− chunks: rope.chunks(),
16− }
17− }
18−}
19−
20−impl io::Read for RopeReader<'_> {
21− fn read(&mut self, mut buf: &mut [u8]) -> io::Result<usize> {
22− let buf_len = buf.len();
23− loop {
24− let read_bytes = self.current_chunk.read(buf)?;
25− buf = &mut buf[read_bytes..];
26− if buf.is_empty() {
27− return Ok(buf_len);
28− }
29−
30− if let Some(next_chunk) = self.chunks.next() {
31− self.current_chunk = next_chunk.as_bytes();
32− } else {
33− return Ok(buf_len - buf.len());
34− }
35− }
36− }
37−}
helix-core/src/selection.rs+2−10
@@ -630,19 +630,11 @@ impl Selection {
630 self.transform(|range| Range::point(range.cursor(text)))
630 self.transform(|range| Range::point(range.cursor(text)))
631 }
631 }
632
632
633− pub fn fragments<'a>(
633+ pub fn fragments<'a>(&'a self, text: RopeSlice<'a>) -> impl Iterator<Item = Cow<str>> + 'a {
634− &'a self,
635− text: RopeSlice<'a>,
636− ) -> impl DoubleEndedIterator<Item = Cow<'a, str>> + ExactSizeIterator<Item = Cow<str>> + 'a
637− {
638 self.ranges.iter().map(move |range| range.fragment(text))
634 self.ranges.iter().map(move |range| range.fragment(text))
639 }
635 }
640
636
641− pub fn slices<'a>(
637+ pub fn slices<'a>(&'a self, text: RopeSlice<'a>) -> impl Iterator<Item = RopeSlice> + 'a {
642− &'a self,
643− text: RopeSlice<'a>,
644− ) -> impl DoubleEndedIterator<Item = RopeSlice<'a>> + ExactSizeIterator<Item = RopeSlice<'a>> + 'a
645− {
646 self.ranges.iter().map(move |range| range.slice(text))
638 self.ranges.iter().map(move |range| range.slice(text))
647 }
639 }
648
640
helix-core/src/syntax.rs+80−88
@@ -4,7 +4,7 @@ use crate::{
4 diagnostic::Severity,
4 diagnostic::Severity,
5 regex::Regex,
5 regex::Regex,
6 transaction::{ChangeSet, Operation},
6 transaction::{ChangeSet, Operation},
7− RopeSlice, Tendril,
7+ Rope, RopeSlice, Tendril,
8};
8};
9
9
10use ahash::RandomState;
10use ahash::RandomState;
@@ -101,8 +101,7 @@ 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)]
105− pub roots: Vec<String>, // these indicate project roots <.git, Cargo.toml>
104+ pub roots: Vec<String>, // these indicate project roots <.git, Cargo.toml>
106 pub comment_token: Option<String>,
105 pub comment_token: Option<String>,
107 pub text_width: Option<usize>,
106 pub text_width: Option<usize>,
108 pub soft_wrap: Option<SoftWrap>,
107 pub soft_wrap: Option<SoftWrap>,
@@ -155,8 +154,6 @@ pub struct LanguageConfiguration {
155 /// Hardcoded LSP root directories relative to the workspace root, like `examples` or `tools/fuzz`.
154 /// Hardcoded LSP root directories relative to the workspace root, like `examples` or `tools/fuzz`.
156 /// Falling back to the current working directory if none are configured.
155 /// Falling back to the current working directory if none are configured.
157 pub workspace_lsp_roots: Option<Vec<PathBuf>>,
156 pub workspace_lsp_roots: Option<Vec<PathBuf>>,
158− #[serde(default)]
159− pub persistent_diagnostic_sources: Vec<String>,
160}
157}
161
158
162#[derive(Debug, PartialEq, Eq, Hash)]
159#[derive(Debug, PartialEq, Eq, Hash)]
@@ -214,7 +211,10 @@ impl<'de> Deserialize<'de> for FileType {
214 {
211 {
215 match map.next_entry::<String, String>()? {
212 match map.next_entry::<String, String>()? {
216 Some((key, suffix)) if key == "suffix" => Ok(FileType::Suffix({
213 Some((key, suffix)) if key == "suffix" => Ok(FileType::Suffix({
217− suffix.replace('/', std::path::MAIN_SEPARATOR_STR)
214+ // FIXME: use `suffix.replace('/', std::path::MAIN_SEPARATOR_STR)`
215+ // if MSRV is updated to 1.68
216+ let mut separator = [0; 1];
217+ suffix.replace('/', std::path::MAIN_SEPARATOR.encode_utf8(&mut separator))
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,22 +444,6 @@ 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−
463/// Configuration for auto pairs
447/// Configuration for auto pairs
464#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
448#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
465#[serde(rename_all = "kebab-case", deny_unknown_fields, untagged)]
449#[serde(rename_all = "kebab-case", deny_unknown_fields, untagged)]
@@ -834,10 +818,7 @@ impl Loader {
834 // TODO: content_regex handling conflict resolution
818 // TODO: content_regex handling conflict resolution
835 }
819 }
836
820
837− pub fn language_config_for_shebang(
821+ pub fn language_config_for_shebang(&self, source: &Rope) -> Option<Arc<LanguageConfiguration>> {
838− &self,
839− source: RopeSlice,
840− ) -> Option<Arc<LanguageConfiguration>> {
841 let line = Cow::from(source.line(0));
822 let line = Cow::from(source.line(0));
842 static SHEBANG_REGEX: Lazy<Regex> =
823 static SHEBANG_REGEX: Lazy<Regex> =
843 Lazy::new(|| Regex::new(&["^", SHEBANG].concat()).unwrap());
824 Lazy::new(|| Regex::new(&["^", SHEBANG].concat()).unwrap());
@@ -947,7 +928,7 @@ fn byte_range_to_str(range: std::ops::Range<usize>, source: RopeSlice) -> Cow<st
947
928
948impl Syntax {
929impl Syntax {
949 pub fn new(
930 pub fn new(
950− source: RopeSlice,
931+ source: &Rope,
951 config: Arc<HighlightConfiguration>,
932 config: Arc<HighlightConfiguration>,
952 loader: Arc<Loader>,
933 loader: Arc<Loader>,
953 ) -> Option<Self> {
934 ) -> Option<Self> {
@@ -978,7 +959,7 @@ impl Syntax {
978 let res = syntax.update(source, source, &ChangeSet::new(source));
959 let res = syntax.update(source, source, &ChangeSet::new(source));
979
960
980 if res.is_err() {
961 if res.is_err() {
981− log::error!("TS parser failed, disabling TS for the current buffer: {res:?}");
962+ log::error!("TS parser failed, disabeling TS for the current buffer: {res:?}");
982 return None;
963 return None;
983 }
964 }
984 Some(syntax)
965 Some(syntax)
@@ -986,8 +967,8 @@ impl Syntax {
986
967
987 pub fn update(
968 pub fn update(
988 &mut self,
969 &mut self,
989− old_source: RopeSlice,
970+ old_source: &Rope,
990− source: RopeSlice,
971+ source: &Rope,
991 changeset: &ChangeSet,
972 changeset: &ChangeSet,
992 ) -> Result<(), Error> {
973 ) -> Result<(), Error> {
993 let mut queue = VecDeque::new();
974 let mut queue = VecDeque::new();
@@ -1154,38 +1135,12 @@ impl Syntax {
1154 layer.tree().root_node(),
1135 layer.tree().root_node(),
1155 RopeProvider(source_slice),
1136 RopeProvider(source_slice),
1156 );
1137 );
1157− let mut combined_injections = vec![
1158− (None, Vec::new(), IncludedChildren::default());
1159− layer.config.combined_injections_patterns.len()
1160− ];
1161 let mut injections = Vec::new();
1138 let mut injections = Vec::new();
1162− let mut last_injection_end = 0;
1163 for mat in matches {
1139 for mat in matches {
1164 let (injection_capture, content_node, included_children) = layer
1140 let (injection_capture, content_node, included_children) = layer
1165 .config
1141 .config
1166 .injection_for_match(&layer.config.injections_query, &mat, source_slice);
1142 .injection_for_match(&layer.config.injections_query, &mat, source_slice);
1167
1143
1168− // in case this is a combined injection save it for more processing later
1169− if let Some(combined_injection_idx) = layer
1170− .config
1171− .combined_injections_patterns
1172− .iter()
1173− .position(|&pattern| pattern == mat.pattern_index)
1174− {
1175− let entry = &mut combined_injections[combined_injection_idx];
1176− if injection_capture.is_some() {
1177− entry.0 = injection_capture;
1178− }
1179− if let Some(content_node) = content_node {
1180− if content_node.start_byte() >= last_injection_end {
1181− entry.1.push(content_node);
1182− last_injection_end = content_node.end_byte();
1183− }
1184− }
1185− entry.2 = included_children;
1186− continue;
1187− }
1188−
1189 // Explicitly remove this match so that none of its other captures will remain
1144 // Explicitly remove this match so that none of its other captures will remain
1190 // in the stream of captures.
1145 // in the stream of captures.
1191 mat.remove();
1146 mat.remove();
@@ -1200,23 +1155,49 @@ impl Syntax {
1200 intersect_ranges(&layer.ranges, &[content_node], included_children);
1155 intersect_ranges(&layer.ranges, &[content_node], included_children);
1201
1156
1202 if !ranges.is_empty() {
1157 if !ranges.is_empty() {
1203− if content_node.start_byte() < last_injection_end {
1204− continue;
1205− }
1206− last_injection_end = content_node.end_byte();
1207 injections.push((config, ranges));
1158 injections.push((config, ranges));
1208 }
1159 }
1209 }
1160 }
1210 }
1161 }
1211 }
1162 }
1212
1163
1164+ // Process combined injections.
1165+ if let Some(combined_injections_query) = &layer.config.combined_injections_query {
1166+ let mut injections_by_pattern_index =
1167+ vec![
1168+ (None, Vec::new(), IncludedChildren::default());
1169+ combined_injections_query.pattern_count()
1170+ ];
1171+ let matches = cursor.matches(
1172+ combined_injections_query,
1173+ layer.tree().root_node(),
1174+ RopeProvider(source_slice),
1175+ );
1176+ for mat in matches {
1177+ let entry = &mut injections_by_pattern_index[mat.pattern_index];
1178+ let (injection_capture, content_node, included_children) = layer
1179+ .config
1180+ .injection_for_match(combined_injections_query, &mat, source_slice);
1181+ if injection_capture.is_some() {
1182+ entry.0 = injection_capture;
1183+ }
1184+ if let Some(content_node) = content_node {
1185+ entry.1.push(content_node);
1186+ }
1187+ entry.2 = included_children;
1188+ }
1213− for (lang_name, content_nodes, included_children) in combined_injections {
1189+ for (lang_name, content_nodes, included_children) in injections_by_pattern_index
1190+ {
1214− if let (Some(lang_name), false) = (lang_name, content_nodes.is_empty()) {
1191+ if let (Some(lang_name), false) = (lang_name, content_nodes.is_empty()) {
1215− if let Some(config) = (injection_callback)(&lang_name) {
1192+ if let Some(config) = (injection_callback)(&lang_name) {
1216− let ranges =
1193+ let ranges = intersect_ranges(
1194+ &layer.ranges,
1195+ &content_nodes,
1217− intersect_ranges(&layer.ranges, &content_nodes, included_children);
1196+ included_children,
1197+ );
1218− if !ranges.is_empty() {
1198+ if !ranges.is_empty() {
1219− injections.push((config, ranges));
1199+ injections.push((config, ranges));
1200+ }
1220 }
1201 }
1221 }
1202 }
1222 }
1203 }
@@ -1406,7 +1387,7 @@ impl LanguageLayer {
1406 self.tree.as_ref().unwrap()
1387 self.tree.as_ref().unwrap()
1407 }
1388 }
1408
1389
1409− fn parse(&mut self, parser: &mut Parser, source: RopeSlice) -> Result<(), Error> {
1390+ fn parse(&mut self, parser: &mut Parser, source: &Rope) -> Result<(), Error> {
1410 parser
1391 parser
1411 .set_included_ranges(&self.ranges)
1392 .set_included_ranges(&self.ranges)
1412 .map_err(|_| Error::InvalidRanges)?;
1393 .map_err(|_| Error::InvalidRanges)?;
@@ -1437,7 +1418,7 @@ impl LanguageLayer {
1437}
1418}
1438
1419
1439pub(crate) fn generate_edits(
1420pub(crate) fn generate_edits(
1440− old_text: RopeSlice,
1421+ old_text: &Rope,
1441 changeset: &ChangeSet,
1422 changeset: &ChangeSet,
1442) -> Vec<tree_sitter::InputEdit> {
1423) -> Vec<tree_sitter::InputEdit> {
1443 use Operation::*;
1424 use Operation::*;
@@ -1453,7 +1434,7 @@ pub(crate) fn generate_edits(
1453
1434
1454 // TODO; this is a lot easier with Change instead of Operation.
1435 // TODO; this is a lot easier with Change instead of Operation.
1455
1436
1456− fn point_at_pos(text: RopeSlice, pos: usize) -> (usize, Point) {
1437+ fn point_at_pos(text: &Rope, pos: usize) -> (usize, Point) {
1457 let byte = text.char_to_byte(pos); // <- attempted to index past end
1438 let byte = text.char_to_byte(pos); // <- attempted to index past end
1458 let line = text.char_to_line(pos);
1439 let line = text.char_to_line(pos);
1459 let line_start_byte = text.line_to_byte(line);
1440 let line_start_byte = text.line_to_byte(line);
@@ -1579,7 +1560,7 @@ pub struct HighlightConfiguration {
1579 pub language: Grammar,
1560 pub language: Grammar,
1580 pub query: Query,
1561 pub query: Query,
1581 injections_query: Query,
1562 injections_query: Query,
1582− combined_injections_patterns: Vec<usize>,
1563+ combined_injections_query: Option<Query>,
1583 highlights_pattern_index: usize,
1564 highlights_pattern_index: usize,
1584 highlight_indices: ArcSwap<Vec<Option<Highlight>>>,
1565 highlight_indices: ArcSwap<Vec<Option<Highlight>>>,
1585 non_local_variable_patterns: Vec<bool>,
1566 non_local_variable_patterns: Vec<bool>,
@@ -1630,7 +1611,7 @@ impl<'a> Iterator for ChunksBytes<'a> {
1630}
1611}
1631
1612
1632pub struct RopeProvider<'a>(pub RopeSlice<'a>);
1613pub struct RopeProvider<'a>(pub RopeSlice<'a>);
1633−impl<'a> TextProvider<&'a [u8]> for RopeProvider<'a> {
1614+impl<'a> TextProvider<'a> for RopeProvider<'a> {
1634 type I = ChunksBytes<'a>;
1615 type I = ChunksBytes<'a>;
1635
1616
1636 fn text(&mut self, node: Node) -> Self::I {
1617 fn text(&mut self, node: Node) -> Self::I {
@@ -1644,7 +1625,7 @@ impl<'a> TextProvider<&'a [u8]> for RopeProvider<'a> {
1644struct HighlightIterLayer<'a> {
1625struct HighlightIterLayer<'a> {
1645 _tree: Option<Tree>,
1626 _tree: Option<Tree>,
1646 cursor: QueryCursor,
1627 cursor: QueryCursor,
1647− captures: RefCell<iter::Peekable<QueryCaptures<'a, 'a, RopeProvider<'a>, &'a [u8]>>>,
1628+ captures: RefCell<iter::Peekable<QueryCaptures<'a, 'a, RopeProvider<'a>>>>,
1648 config: &'a HighlightConfiguration,
1629 config: &'a HighlightConfiguration,
1649 highlight_end_stack: Vec<usize>,
1630 highlight_end_stack: Vec<usize>,
1650 scope_stack: Vec<LocalScope<'a>>,
1631 scope_stack: Vec<LocalScope<'a>>,
@@ -1695,15 +1676,26 @@ impl HighlightConfiguration {
1695 }
1676 }
1696 }
1677 }
1697
1678
1698− let injections_query = Query::new(language, injection_query)?;
1679+ let mut injections_query = Query::new(language, injection_query)?;
1680+
1681+ // Construct a separate query just for dealing with the 'combined injections'.
1682+ // Disable the combined injection patterns in the main query.
1683+ let mut combined_injections_query = Query::new(language, injection_query)?;
1684+ let mut has_combined_queries = false;
1699− let combined_injections_patterns = (0..injections_query.pattern_count())
1685+ for pattern_index in 0..injections_query.pattern_count() {
1700− .filter(|&i| {
1701− injections_query
1702− .property_settings(i)
1686+ let settings = injections_query.property_settings(pattern_index);
1703− .iter()
1704− .any(|s| &*s.key == "injection.combined")
1687+ if settings.iter().any(|s| &*s.key == "injection.combined") {
1705− })
1688+ has_combined_queries = true;
1706− .collect();
1689+ injections_query.disable_pattern(pattern_index);
1690+ } else {
1691+ combined_injections_query.disable_pattern(pattern_index);
1692+ }
1693+ }
1694+ let combined_injections_query = if has_combined_queries {
1695+ Some(combined_injections_query)
1696+ } else {
1697+ None
1698+ };
1707
1699
1708 // Find all of the highlighting patterns that are disabled for nodes that
1700 // Find all of the highlighting patterns that are disabled for nodes that
1709 // have been identified as local variables.
1701 // have been identified as local variables.
@@ -1752,7 +1744,7 @@ impl HighlightConfiguration {
1752 language,
1744 language,
1753 query,
1745 query,
1754 injections_query,
1746 injections_query,
1755− combined_injections_patterns,
1747+ combined_injections_query,
1756 highlights_pattern_index,
1748 highlights_pattern_index,
1757 highlight_indices,
1749 highlight_indices,
1758 non_local_variable_patterns,
1750 non_local_variable_patterns,
@@ -2548,7 +2540,7 @@ mod test {
2548 let mut cursor = QueryCursor::new();
2540 let mut cursor = QueryCursor::new();
2549
2541
2550 let config = HighlightConfiguration::new(language, "", "", "").unwrap();
2542 let config = HighlightConfiguration::new(language, "", "", "").unwrap();
2551− let syntax = Syntax::new(source.slice(..), Arc::new(config), Arc::new(loader)).unwrap();
2543+ let syntax = Syntax::new(&source, Arc::new(config), Arc::new(loader)).unwrap();
2552
2544
2553 let root = syntax.tree().root_node();
2545 let root = syntax.tree().root_node();
2554 let mut test = |capture, range| {
2546 let mut test = |capture, range| {
@@ -2622,7 +2614,7 @@ mod test {
2622 fn main() {}
2614 fn main() {}
2623 ",
2615 ",
2624 );
2616 );
2625− let syntax = Syntax::new(source.slice(..), Arc::new(config), Arc::new(loader)).unwrap();
2617+ let syntax = Syntax::new(&source, Arc::new(config), Arc::new(loader)).unwrap();
2626 let tree = syntax.tree();
2618 let tree = syntax.tree();
2627 let root = tree.root_node();
2619 let root = tree.root_node();
2628 assert_eq!(root.kind(), "source_file");
2620 assert_eq!(root.kind(), "source_file");
@@ -2649,7 +2641,7 @@ mod test {
2649 &doc,
2641 &doc,
2650 vec![(6, 11, Some("test".into())), (12, 17, None)].into_iter(),
2642 vec![(6, 11, Some("test".into())), (12, 17, None)].into_iter(),
2651 );
2643 );
2652− let edits = generate_edits(doc.slice(..), transaction.changes());
2644+ let edits = generate_edits(&doc, transaction.changes());
2653 // transaction.apply(&mut state);
2645 // transaction.apply(&mut state);
2654
2646
2655 assert_eq!(
2647 assert_eq!(
@@ -2678,7 +2670,7 @@ mod test {
2678 let mut doc = Rope::from("fn test() {}");
2670 let mut doc = Rope::from("fn test() {}");
2679 let transaction =
2671 let transaction =
2680 Transaction::change(&doc, vec![(8, 8, Some("a: u32".into()))].into_iter());
2672 Transaction::change(&doc, vec![(8, 8, Some("a: u32".into()))].into_iter());
2681− let edits = generate_edits(doc.slice(..), transaction.changes());
2673+ let edits = generate_edits(&doc, transaction.changes());
2682 transaction.apply(&mut doc);
2674 transaction.apply(&mut doc);
2683
2675
2684 assert_eq!(doc, "fn test(a: u32) {}");
2676 assert_eq!(doc, "fn test(a: u32) {}");
@@ -2712,7 +2704,7 @@ mod test {
2712 let language = get_language(language_name).unwrap();
2704 let language = get_language(language_name).unwrap();
2713
2705
2714 let config = HighlightConfiguration::new(language, "", "", "").unwrap();
2706 let config = HighlightConfiguration::new(language, "", "", "").unwrap();
2715− let syntax = Syntax::new(source.slice(..), Arc::new(config), Arc::new(loader)).unwrap();
2707+ let syntax = Syntax::new(&source, Arc::new(config), Arc::new(loader)).unwrap();
2716
2708
2717 let root = syntax
2709 let root = syntax
2718 .tree()
2710 .tree()
helix-core/src/transaction.rs+46−167
@@ -1,7 +1,6 @@
1−use ropey::RopeSlice;
2use smallvec::SmallVec;
1use smallvec::SmallVec;
3
2
4−use crate::{chars::char_is_word, Range, Rope, Selection, Tendril};
3+use crate::{Range, Rope, Selection, Tendril};
5use std::{borrow::Cow, iter::once};
4use std::{borrow::Cow, iter::once};
6
5
7/// (from, to, replacement)
6/// (from, to, replacement)
@@ -23,30 +22,6 @@ pub enum Operation {
23pub enum Assoc {
22pub enum Assoc {
24 Before,
23 Before,
25 After,
24 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− }
50}
25}
51
26
52#[derive(Debug, Default, Clone, PartialEq, Eq)]
27#[derive(Debug, Default, Clone, PartialEq, Eq)]
@@ -67,7 +42,7 @@ impl ChangeSet {
67 }
42 }
68
43
69 #[must_use]
44 #[must_use]
70− pub fn new(doc: RopeSlice) -> Self {
45+ pub fn new(doc: &Rope) -> Self {
71 let len = doc.len_chars();
46 let len = doc.len_chars();
72 Self {
47 Self {
73 changes: Vec::new(),
48 changes: Vec::new(),
@@ -351,7 +326,7 @@ impl ChangeSet {
351 self.changes.is_empty() || self.changes == [Operation::Retain(self.len)]
326 self.changes.is_empty() || self.changes == [Operation::Retain(self.len)]
352 }
327 }
353
328
354− /// Map a (mostly) *sorted* list of positions through the changes.
329+ /// Map a *sorted* list of positions through the changes.
355 ///
330 ///
356 /// This is equivalent to updating each position with `map_pos`:
331 /// This is equivalent to updating each position with `map_pos`:
357 ///
332 ///
@@ -360,66 +335,27 @@ impl ChangeSet {
360 /// *pos = changes.map_pos(*pos, assoc);
335 /// *pos = changes.map_pos(*pos, assoc);
361 /// }
336 /// }
362 /// ```
337 /// ```
363− /// However this function is significantly faster for sorted lists running
338+ /// However this function is significantly faster running in `O(N+M)` instead of `O(NM)`
364− /// in `O(N+M)` instead of `O(NM)`. This function also handles unsorted/
365− /// partially sorted lists. However, in that case worst case complexity is
366− /// again `O(MN)`. For lists that are often/mostly sorted (like the end of diagnostic ranges)
367− /// performance is usally close to `O(N + M)`
368 pub fn update_positions<'a>(&self, positions: impl Iterator<Item = (&'a mut usize, Assoc)>) {
339 pub fn update_positions<'a>(&self, positions: impl Iterator<Item = (&'a mut usize, Assoc)>) {
369 use Operation::*;
340 use Operation::*;
370
341
371 let mut positions = positions.peekable();
342 let mut positions = positions.peekable();
343+ macro_rules! map {
344+ ($map: expr) => {
345+ loop {
346+ let Some((pos, assoc)) = positions.peek_mut() else { return; };
347+ let Some(new_pos) = $map(**pos, *assoc) else { break; };
348+ **pos = new_pos;
349+ positions.next();
350+ }
351+ };
352+ }
372
353
373 let mut old_pos = 0;
354 let mut old_pos = 0;
374 let mut new_pos = 0;
355 let mut new_pos = 0;
375− let mut iter = self.changes.iter().enumerate().peekable();
356+ let mut iter = self.changes.iter().peekable();
376−
377− 'outer: loop {
378− macro_rules! map {
379− ($map: expr, $i: expr) => {
380− loop {
381− let Some((pos, assoc)) = positions.peek_mut() else { return; };
382− if **pos < old_pos {
383− // Positions are not sorted, revert to the last Operation that
384− // contains this position and continue iterating from there.
385− // We can unwrap here since `pos` can not be negative
386− // (unsigned integer) and iterating backwards to the start
387− // should always move us back to the start
388− for (i, change) in self.changes[..$i].iter().enumerate().rev() {
389− match change {
390− Retain(i) => {
391− old_pos -= i;
392− new_pos -= i;
393− }
394− Delete(i) => {
395− old_pos -= i;
396− }
397− Insert(ins) => {
398− new_pos -= ins.chars().count();
399− }
400− }
401− if old_pos <= **pos {
402− iter = self.changes[i..].iter().enumerate().peekable();
403− }
404− }
405− debug_assert!(old_pos <= **pos, "Reverse Iter across changeset works");
406− continue 'outer;
407− }
408− let Some(new_pos) = $map(**pos, *assoc) else { break; };
409− **pos = new_pos;
410− positions.next();
411− }
412− };
413− }
414−
415− let Some((i, change)) = iter.next() else {
416− map!(
417− |pos, _| (old_pos == pos).then_some(new_pos),
418− self.changes.len()
419− );
420− break;
421− };
422
357
358+ while let Some(change) = iter.next() {
423 let len = match change {
359 let len = match change {
424 Delete(i) | Retain(i) => *i,
360 Delete(i) | Retain(i) => *i,
425 Insert(_) => 0,
361 Insert(_) => 0,
@@ -428,51 +364,50 @@ impl ChangeSet {
428
364
429 match change {
365 match change {
430 Retain(_) => {
366 Retain(_) => {
431− map!(
432− |pos, _| (old_end > pos).then_some(new_pos + (pos - old_pos)),
367+ map!(|pos, _| (old_end > pos).then_some(new_pos + (pos - old_pos)));
433− i
434− );
435 new_pos += len;
368 new_pos += len;
436 }
369 }
437 Delete(_) => {
370 Delete(_) => {
438 // in range
371 // in range
439− map!(|pos, _| (old_end > pos).then_some(new_pos), i);
372+ map!(|pos, _| (old_end > pos).then_some(new_pos));
440 }
373 }
441 Insert(s) => {
374 Insert(s) => {
375+ let ins = s.chars().count();
376+
442 // a subsequent delete means a replace, consume it
377 // a subsequent delete means a replace, consume it
443− if let Some((_, Delete(len))) = iter.peek() {
378+ if let Some(Delete(len)) = iter.peek() {
444 iter.next();
379 iter.next();
445
380
446 old_end = old_pos + len;
381 old_end = old_pos + len;
447 // in range of replaced text
382 // in range of replaced text
448− map!(
449− |pos, assoc: Assoc| (old_end > pos).then(|| {
383+ map!(|pos, assoc| (old_end > pos).then(|| {
450− // at point or tracking before
384+ // at point or tracking before
451− if pos == old_pos && assoc.stay_at_gaps() {
385+ if pos == old_pos || assoc == Assoc::Before {
452− new_pos
386+ new_pos
453− } else {
387+ } else {
454− // place to end of insert
388+ // place to end of insert
455− new_pos + assoc.insert_offset(s)
389+ new_pos + ins
456− }
457− }),
390+ }
458− i
459− );
391+ }));
460 } else {
392 } else {
461 // at insert point
393 // at insert point
462− map!(
463− |pos, assoc: Assoc| (old_pos == pos).then(|| {
394+ map!(|pos, assoc| (old_pos == pos).then(|| {
464− // return position before inserted text
395+ // return position before inserted text
465− new_pos + assoc.insert_offset(s)
396+ if assoc == Assoc::Before {
397+ new_pos
398+ } else {
399+ // after text
400+ new_pos + ins
466− }),
401+ }
467− i
468− );
402+ }));
469 }
403 }
470
404
471− new_pos += s.chars().count();
405+ new_pos += ins;
472 }
406 }
473 }
407 }
474 old_pos = old_end;
408 old_pos = old_end;
475 }
409 }
410+ map!(|pos, _| (old_pos == pos).then_some(new_pos));
476 let out_of_bounds: Vec<_> = positions.collect();
411 let out_of_bounds: Vec<_> = positions.collect();
477
412
478 panic!("Positions {out_of_bounds:?} are out of range for changeset len {old_pos}!",)
413 panic!("Positions {out_of_bounds:?} are out of range for changeset len {old_pos}!",)
@@ -506,7 +441,7 @@ impl Transaction {
506 /// Create a new, empty transaction.
441 /// Create a new, empty transaction.
507 pub fn new(doc: &Rope) -> Self {
442 pub fn new(doc: &Rope) -> Self {
508 Self {
443 Self {
509− changes: ChangeSet::new(doc.slice(..)),
444+ changes: ChangeSet::new(doc),
510 selection: None,
445 selection: None,
511 }
446 }
512 }
447 }
@@ -887,62 +822,6 @@ mod test {
887 };
822 };
888 assert_eq!(cs.map_pos(2, Assoc::Before), 2);
823 assert_eq!(cs.map_pos(2, Assoc::Before), 2);
889 assert_eq!(cs.map_pos(2, Assoc::After), 2);
824 assert_eq!(cs.map_pos(2, Assoc::After), 2);
890− // unsorted selection
891− let cs = ChangeSet {
892− changes: vec![
893− Insert("ab".into()),
894− Delete(2),
895− Insert("cd".into()),
896− Delete(2),
897− ],
898− len: 4,
899− len_after: 4,
900− };
901− let mut positions = [4, 2];
902− cs.update_positions(positions.iter_mut().map(|pos| (pos, Assoc::After)));
903− assert_eq!(positions, [4, 2]);
904− // stays at word boundary
905− let cs = ChangeSet {
906− changes: vec![
907− Retain(2), // <space><space>
908− Insert(" ab".into()),
909− Retain(2), // cd
910− Insert("de ".into()),
911− ],
912− len: 4,
913− len_after: 10,
914− };
915− assert_eq!(cs.map_pos(2, Assoc::BeforeWord), 3);
916− assert_eq!(cs.map_pos(4, Assoc::AfterWord), 9);
917− let cs = ChangeSet {
918− changes: vec![
919− Retain(1), // <space>
920− Insert(" b".into()),
921− Delete(1), // c
922− Retain(1), // d
923− Insert("e ".into()),
924− Delete(1), // <space>
925− ],
926− len: 5,
927− len_after: 7,
928− };
929− assert_eq!(cs.map_pos(1, Assoc::BeforeWord), 2);
930− assert_eq!(cs.map_pos(3, Assoc::AfterWord), 5);
931− let cs = ChangeSet {
932− changes: vec![
933− Retain(1), // <space>
934− Insert("a".into()),
935− Delete(2), // <space>b
936− Retain(1), // d
937− Insert("e".into()),
938− Delete(1), // f
939− Retain(1), // <space>
940− ],
941− len: 5,
942− len_after: 7,
943− };
944− assert_eq!(cs.map_pos(2, Assoc::BeforeWord), 1);
945− assert_eq!(cs.map_pos(4, Assoc::AfterWord), 4);
946 }
825 }
947
826
948 #[test]
827 #[test]
@@ -1009,9 +888,9 @@ mod test {
1009 #[test]
888 #[test]
1010 fn combine_with_empty() {
889 fn combine_with_empty() {
1011 let empty = Rope::from("");
890 let empty = Rope::from("");
1012− let a = ChangeSet::new(empty.slice(..));
891+ let a = ChangeSet::new(&empty);
1013
892
1014− let mut b = ChangeSet::new(empty.slice(..));
893+ let mut b = ChangeSet::new(&empty);
1015 b.insert("a".into());
894 b.insert("a".into());
1016
895
1017 let changes = a.compose(b);
896 let changes = a.compose(b);
@@ -1025,9 +904,9 @@ mod test {
1025 const TEST_CASE: &str = "Hello, これはヘリックスエディターです!";
904 const TEST_CASE: &str = "Hello, これはヘリックスエディターです!";
1026
905
1027 let empty = Rope::from("");
906 let empty = Rope::from("");
1028− let a = ChangeSet::new(empty.slice(..));
907+ let a = ChangeSet::new(&empty);
1029
908
1030− let mut b = ChangeSet::new(empty.slice(..));
909+ let mut b = ChangeSet::new(&empty);
1031 b.insert(TEST_CASE.into());
910 b.insert(TEST_CASE.into());
1032
911
1033 let changes = a.compose(b);
912 let changes = a.compose(b);
helix-core/src/wrap.rs+1−3
@@ -1,9 +1,7 @@
1use smartstring::{LazyCompact, SmartString};
1use smartstring::{LazyCompact, SmartString};
2−use textwrap::{Options, WordSplitter::NoHyphenation};
3
2
4/// Given a slice of text, return the text re-wrapped to fit it
3/// Given a slice of text, return the text re-wrapped to fit it
5/// within the given width.
4/// within the given width.
6pub fn reflow_hard_wrap(text: &str, text_width: usize) -> SmartString<LazyCompact> {
5pub fn reflow_hard_wrap(text: &str, text_width: usize) -> SmartString<LazyCompact> {
7− let options = Options::new(text_width).word_splitter(NoHyphenation);
8− textwrap::refill(text, options).into()
6+ textwrap::refill(text, text_width).into()
9}
7}
helix-core/tests/data/indent/cpp.cppdeleted−48
@@ -1,48 +0,0 @@
1−std::vector<std::string>
2−fn_with_many_parameters(int parm1, long parm2, float parm3, double parm4,
3− char* parm5, bool parm6);
4−
5−std::vector<std::string>
6−fn_with_many_parameters(int parm1, long parm2, float parm3, double parm4,
7− char* parm5, bool parm6) {
8− auto lambda = []() {
9− return 0;
10− };
11− auto lambda_with_a_really_long_name_that_uses_a_whole_line
12− = [](int some_more_aligned_parameters,
13− std::string parm2) {
14− do_smth();
15− };
16− if (brace_on_same_line) {
17− do_smth();
18− } else if (brace_on_next_line)
19− {
20− do_smth();
21− } else if (another_condition) {
22− do_smth();
23− }
24− else {
25− do_smth();
26− }
27− if (inline_if_statement)
28− do_smth();
29− if (another_inline_if_statement)
30− return [](int parm1, char* parm2) {
31− this_is_a_really_pointless_lambda();
32− };
33−
34− switch (var) {
35− case true:
36− return -1;
37− case false:
38− return 42;
39− }
40−}
41−
42−class MyClass : public MyBaseClass {
43−public:
44− MyClass();
45− void public_fn();
46−private:
47− super_secret_private_fn();
48−}
helix-core/tests/data/indent/indent.rsnew file+1
@@ -0,0 +1 @@
1+../../../src/indent.rs
helix-core/tests/data/indent/languages.toml−13
@@ -11,16 +11,3 @@ indent = { tab-width = 4, unit = " " }
11[[grammar]]
11[[grammar]]
12name = "rust"
12name = "rust"
13source = { git = "https://github.com/tree-sitter/tree-sitter-rust", rev = "0431a2c60828731f27491ee9fdefe25e250ce9c9" }
13source = { git = "https://github.com/tree-sitter/tree-sitter-rust", rev = "0431a2c60828731f27491ee9fdefe25e250ce9c9" }
14−
15−[[language]]
16−name = "cpp"
17−scope = "source.cpp"
18−injection-regex = "cpp"
19−file-types = ["cc", "hh", "c++", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino", "C", "H"]
20−roots = []
21−comment-token = "//"
22−indent = { tab-width = 2, unit = " " }
23−
24−[[grammar]]
25−name = "cpp"
26−source = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "2d2c4aee8672af4c7c8edff68e7dd4c07e88d2b1" }
helix-core/tests/indent.rs+25−153
@@ -1,122 +1,20 @@
1use helix_core::{
1use helix_core::{
2 indent::{indent_level_for_line, treesitter_indent_for_pos, IndentStyle},
2 indent::{indent_level_for_line, treesitter_indent_for_pos, IndentStyle},
3− syntax::{Configuration, Loader},
3+ syntax::Loader,
4 Syntax,
4 Syntax,
5};
5};
6−use ropey::Rope;
7−use std::{ops::Range, path::PathBuf, process::Command};
6+use std::path::PathBuf;
8
7
9#[test]
8#[test]
10fn test_treesitter_indent_rust() {
9fn test_treesitter_indent_rust() {
11− standard_treesitter_test("rust.rs", "source.rust");
10+ test_treesitter_indent("rust.rs", "source.rust");
12}
11}
13−
14#[test]
12#[test]
15−fn test_treesitter_indent_cpp() {
13+fn test_treesitter_indent_rust_2() {
16− standard_treesitter_test("cpp.cpp", "source.cpp");
14+ test_treesitter_indent("indent.rs", "source.rust");
17−}
15+ // TODO Use commands.rs as indentation test.
18−
16+ // Currently this fails because we can't align the parameters of a closure yet
19−#[test]
17+ // test_treesitter_indent("commands.rs", "source.rust");
20−fn test_treesitter_indent_rust_helix() {
21− // We pin a specific git revision to prevent unrelated changes from causing the indent tests to fail.
22− // Ideally, someone updates this once in a while and fixes any errors that occur.
23− let rev = "af382768cdaf89ff547dbd8f644a1bddd90e7c8f";
24− let files = Command::new("git")
25− .args([
26− "ls-tree",
27− "-r",
28− "--name-only",
29− "--full-tree",
30− rev,
31− "helix-term/src",
32− ])
33− .output()
34− .unwrap();
35− let files = String::from_utf8(files.stdout).unwrap();
36−
37− let ignored_files = vec![
38− // Contains many macros that tree-sitter does not parse in a meaningful way and is otherwise not very interesting
39− "helix-term/src/health.rs",
40− ];
41−
42− for file in files.split_whitespace() {
43− if ignored_files.contains(&file) {
44− continue;
45− }
46− let ignored_lines: Vec<Range<usize>> = match file {
47− "helix-term/src/application.rs" => vec![
48− // We can't handle complicated indent rules inside macros (`json!` in this case) since
49− // the tree-sitter grammar only parses them as `token_tree` and `identifier` nodes.
50− 1045..1051,
51− ],
52− "helix-term/src/commands.rs" => vec![
53− // This is broken because of the current handling of `call_expression`
54− // (i.e. having an indent query for it but outdenting again in specific cases).
55− // The indent query is needed to correctly handle multi-line arguments in function calls
56− // inside indented `field_expression` nodes (which occurs fairly often).
57− //
58− // Once we have the `@indent.always` capture type, it might be possible to just have an indent
59− // capture for the `arguments` field of a call expression. That could enable us to correctly
60− // handle this.
61− 2226..2230,
62− ],
63− "helix-term/src/commands/dap.rs" => vec![
64− // Complex `format!` macro
65− 46..52,
66− ],
67− "helix-term/src/commands/lsp.rs" => vec![
68− // Macro
69− 624..627,
70− // Return type declaration of a closure. `cargo fmt` adds an additional space here,
71− // which we cannot (yet) model with our indent queries.
72− 878..879,
73− // Same as in `helix-term/src/commands.rs`
74− 1335..1343,
75− ],
76− "helix-term/src/config.rs" => vec![
77− // Multiline string
78− 146..152,
79− ],
80− "helix-term/src/keymap.rs" => vec![
81− // Complex macro (see above)
82− 456..470,
83− // Multiline string without indent
84− 563..567,
85− ],
86− "helix-term/src/main.rs" => vec![
87− // Multiline string
88− 44..70,
89− ],
90− "helix-term/src/ui/completion.rs" => vec![
91− // Macro
92− 218..232,
93− ],
94− "helix-term/src/ui/editor.rs" => vec![
95− // The chained function calls here are not indented, probably because of the comment
96− // in between. Since `cargo fmt` doesn't even attempt to format it, there's probably
97− // no point in trying to indent this correctly.
98− 342..350,
99− ],
100− "helix-term/src/ui/lsp.rs" => vec![
101− // Macro
102− 56..61,
103− ],
104− "helix-term/src/ui/statusline.rs" => vec![
105− // Same as in `helix-term/src/commands.rs`
106− 436..442,
107− 450..456,
108− ],
109− _ => Vec::new(),
110− };
111−
112− let git_object = rev.to_string() + ":" + file;
113− let content = Command::new("git")
114− .args(["cat-file", "blob", &git_object])
115− .output()
116− .unwrap();
117− let doc = Rope::from_reader(&mut content.stdout.as_slice()).unwrap();
118− test_treesitter_indent(file, doc, "source.rust", ignored_lines);
119− }
120}
18}
121
19
122#[test]
20#[test]
@@ -152,41 +50,20 @@ fn test_indent_level_for_line_with_spaces_and_tabs() {
152 assert_eq!(indent_level, 2)
50 assert_eq!(indent_level, 2)
153}
51}
154
52
155−fn indent_tests_dir() -> PathBuf {
53+fn test_treesitter_indent(file_name: &str, lang_scope: &str) {
156 let mut test_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
54 let mut test_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
157 test_dir.push("tests/data/indent");
55 test_dir.push("tests/data/indent");
158− test_dir
159−}
160
56
161−fn indent_test_path(name: &str) -> PathBuf {
57+ let mut test_file = test_dir.clone();
162− let mut path = indent_tests_dir();
58+ test_file.push(file_name);
163− path.push(name);
164− path
165−}
166−
167−fn indent_tests_config() -> Configuration {
168− let mut config_path = indent_tests_dir();
169− config_path.push("languages.toml");
170− let config = std::fs::read_to_string(config_path).unwrap();
171− toml::from_str(&config).unwrap()
172−}
173−
174−fn standard_treesitter_test(file_name: &str, lang_scope: &str) {
175− let test_path = indent_test_path(file_name);
176− let test_file = std::fs::File::open(test_path).unwrap();
59+ let test_file = std::fs::File::open(test_file).unwrap();
177 let doc = ropey::Rope::from_reader(test_file).unwrap();
60 let doc = ropey::Rope::from_reader(test_file).unwrap();
178− test_treesitter_indent(file_name, doc, lang_scope, Vec::new())
179−}
180
61
181−/// Test that all the lines in the given file are indented as expected.
62+ let mut config_file = test_dir;
182−/// ignored_lines is a list of (1-indexed) line ranges that are excluded from this test.
63+ config_file.push("languages.toml");
183−fn test_treesitter_indent(
64+ let config = std::fs::read_to_string(config_file).unwrap();
184− test_name: &str,
65+ let config = toml::from_str(&config).unwrap();
185− doc: Rope,
186− lang_scope: &str,
187− ignored_lines: Vec<std::ops::Range<usize>>,
188−) {
189− let loader = Loader::new(indent_tests_config());
66+ let loader = Loader::new(config);
190
67
191 // set runtime path so we can find the queries
68 // set runtime path so we can find the queries
192 let mut runtime = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"));
69 let mut runtime = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"));
@@ -194,35 +71,30 @@ fn test_treesitter_indent(
194 std::env::set_var("HELIX_RUNTIME", runtime.to_str().unwrap());
71 std::env::set_var("HELIX_RUNTIME", runtime.to_str().unwrap());
195
72
196 let language_config = loader.language_config_for_scope(lang_scope).unwrap();
73 let language_config = loader.language_config_for_scope(lang_scope).unwrap();
197− let indent_style = IndentStyle::from_str(&language_config.indent.as_ref().unwrap().unit);
198 let highlight_config = language_config.highlight_config(&[]).unwrap();
74 let highlight_config = language_config.highlight_config(&[]).unwrap();
199− let text = doc.slice(..);
200− let syntax = Syntax::new(text, highlight_config, std::sync::Arc::new(loader)).unwrap();
75+ let syntax = Syntax::new(&doc, highlight_config, std::sync::Arc::new(loader)).unwrap();
201 let indent_query = language_config.indent_query().unwrap();
76 let indent_query = language_config.indent_query().unwrap();
77+ let text = doc.slice(..);
202
78
203 for i in 0..doc.len_lines() {
79 for i in 0..doc.len_lines() {
204 let line = text.line(i);
80 let line = text.line(i);
205− if ignored_lines.iter().any(|range| range.contains(&(i + 1))) {
206− continue;
207− }
208 if let Some(pos) = helix_core::find_first_non_whitespace_char(line) {
81 if let Some(pos) = helix_core::find_first_non_whitespace_char(line) {
209− let tab_width: usize = 4;
82+ let tab_and_indent_width: usize = 4;
210 let suggested_indent = treesitter_indent_for_pos(
83 let suggested_indent = treesitter_indent_for_pos(
211 indent_query,
84 indent_query,
212 &syntax,
85 &syntax,
213− tab_width,
86+ &IndentStyle::Spaces(tab_and_indent_width as u8),
214− indent_style.indent_width(tab_width),
87+ tab_and_indent_width,
88+ tab_and_indent_width,
215 text,
89 text,
216 i,
90 i,
217 text.line_to_char(i) + pos,
91 text.line_to_char(i) + pos,
218 false,
92 false,
219 )
93 )
220− .unwrap()
94+ .unwrap();
221− .to_string(&indent_style, tab_width);
222 assert!(
95 assert!(
223 line.get_slice(..pos).map_or(false, |s| s == suggested_indent),
96 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",
97+ "Wrong indentation on line {}:\n\"{}\" (original line)\n\"{}\" (suggested indentation)\n",
225− test_name,
226 i+1,
98 i+1,
227 line.slice(..line.len_chars()-1),
99 line.slice(..line.len_chars()-1),
228 suggested_indent,
100 suggested_indent,
helix-dap/Cargo.toml+9−11
@@ -1,27 +1,25 @@
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"
3description = "DAP client implementation for Helix project"
7description = "DAP client implementation for Helix project"
4−version.workspace = true
5−authors.workspace = true
6−edition.workspace = true
7−license.workspace = true
8−rust-version.workspace = true
9−categories.workspace = true
8+categories = ["editor"]
10−repository.workspace = true
9+repository = "https://github.com/helix-editor/helix"
11−homepage.workspace = true
10+homepage = "https://helix-editor.com"
12
11
13# 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
14
13
15[dependencies]
14[dependencies]
16−helix-core = { path = "../helix-core" }
15+helix-core = { version = "0.6", path = "../helix-core" }
17−
18anyhow = "1.0"
16anyhow = "1.0"
19log = "0.4"
17log = "0.4"
20serde = { version = "1.0", features = ["derive"] }
18serde = { version = "1.0", features = ["derive"] }
21serde_json = "1.0"
19serde_json = "1.0"
22thiserror = "1.0"
20thiserror = "1.0"
23tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "net", "sync"] }
21tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "net", "sync"] }
24−which = "5.0.0"
22+which = "4.4"
25
23
26[dev-dependencies]
24[dev-dependencies]
27fern = "0.6"
25fern = "0.6"
helix-event/Cargo.tomldeleted−16
@@ -1,16 +0,0 @@
1−[package]
2−name = "helix-event"
3−version.workspace = true
4−authors.workspace = true
5−edition.workspace = true
6−license.workspace = true
7−rust-version.workspace = true
8−categories.workspace = true
9−repository.workspace = true
10−homepage.workspace = true
11−
12−# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
13−
14−[dependencies]
15−tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot"] }
16−parking_lot = { version = "0.12", features = ["send_guard"] }
helix-event/src/lib.rsdeleted−8
@@ -1,8 +0,0 @@
1−//! `helix-event` contains systems that allow (often async) communication between
2−//! different editor components without strongly coupling them. Currently this
3−//! crate only contains some smaller facilities but the intend is to add more
4−//! functionality in the future ( like a generic hook system)
5−
6−pub use redraw::{lock_frame, redraw_requested, request_redraw, start_frame, RenderLockGuard};
7−
8−mod redraw;
helix-event/src/redraw.rsdeleted−49
@@ -1,49 +0,0 @@
1−//! Signals that control when/if the editor redraws
2−
3−use std::future::Future;
4−
5−use parking_lot::{RwLock, RwLockReadGuard};
6−use tokio::sync::Notify;
7−
8−/// A `Notify` instance that can be used to (asynchronously) request
9−/// the editor the render a new frame.
10−static REDRAW_NOTIFY: Notify = Notify::const_new();
11−
12−/// A `RwLock` that prevents the next frame from being
13−/// drawn until an exclusive (write) lock can be acquired.
14−/// This allows asynchsonous tasks to acquire `non-exclusive`
15−/// locks (read) to prevent the next frame from being drawn
16−/// until a certain computation has finished.
17−static RENDER_LOCK: RwLock<()> = RwLock::new(());
18−
19−pub type RenderLockGuard = RwLockReadGuard<'static, ()>;
20−
21−/// Requests that the editor is redrawn. The redraws are debounced (currently to
22−/// 30FPS) so this can be called many times without causing a ton of frames to
23−/// be rendered.
24−pub fn request_redraw() {
25− REDRAW_NOTIFY.notify_one();
26−}
27−
28−/// Returns a future that will yield once a redraw has been asynchronously
29−/// requested using [`request_redraw`].
30−pub fn redraw_requested() -> impl Future<Output = ()> {
31− REDRAW_NOTIFY.notified()
32−}
33−
34−/// Wait until all locks acquired with [`lock_frame`] have been released.
35−/// This function is called before rendering and is intended to allow the frame
36−/// to wait for async computations that should be included in the current frame.
37−pub fn start_frame() {
38− drop(RENDER_LOCK.write());
39− // exhaust any leftover redraw notifications
40− let notify = REDRAW_NOTIFY.notified();
41− tokio::pin!(notify);
42− notify.enable();
43−}
44−
45−/// Acquires the render lock which will prevent the next frame from being drawn
46−/// until the returned guard is dropped.
47−pub fn lock_frame() -> RenderLockGuard {
48− RENDER_LOCK.read()
49−}
helix-loader/Cargo.toml+12−14
@@ -1,14 +1,13 @@
1[package]
1[package]
2name = "helix-loader"
2name = "helix-loader"
3−description = "Build bootstrapping for Helix crates"
3+version = "0.6.0"
4−version.workspace = true
4+description = "A post-modern text editor."
5−authors.workspace = true
5+authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
6−edition.workspace = true
6+edition = "2021"
7−license.workspace = true
7+license = "MPL-2.0"
8−rust-version.workspace = true
9−categories.workspace = true
8+categories = ["editor"]
10−repository.workspace = true
9+repository = "https://github.com/helix-editor/helix"
11−homepage.workspace = true
10+homepage = "https://helix-editor.com"
12
11
13[[bin]]
12[[bin]]
14name = "hx-loader"
13name = "hx-loader"
@@ -19,18 +18,17 @@ anyhow = "1"
19serde = { version = "1.0", features = ["derive"] }
18serde = { version = "1.0", features = ["derive"] }
20toml = "0.7"
19toml = "0.7"
21etcetera = "0.8"
20etcetera = "0.8"
22−tree-sitter.workspace = true
21+tree-sitter = "0.20"
23−once_cell = "1.19"
22+once_cell = "1.18"
24log = "0.4"
23log = "0.4"
25−which = "5.0.0"
24+which = "4.4"
26
25
27# TODO: these two should be on !wasm32 only
26# TODO: these two should be on !wasm32 only
28
27
29# cloning/compiling tree-sitter grammars
28# cloning/compiling tree-sitter grammars
30cc = { version = "1" }
29cc = { version = "1" }
31threadpool = { version = "1.0" }
30threadpool = { version = "1.0" }
32−tempfile = "3.8.1"
31+tempfile = "3.6.0"
33−dunce = "1.0.4"
34
32
35[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
33[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
36libloading = "0.8"
34libloading = "0.8"
helix-loader/build.rs+6−20
@@ -2,17 +2,7 @@ use std::borrow::Cow;
2use std::path::Path;
2use std::path::Path;
3use std::process::Command;
3use std::process::Command;
4
4
5−const MAJOR: &str = env!("CARGO_PKG_VERSION_MAJOR");
5+const VERSION: &str = include_str!("../VERSION");
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−}
16
6
17fn main() {
7fn main() {
18 let git_hash = Command::new("git")
8 let git_hash = Command::new("git")
@@ -22,10 +12,9 @@ fn main() {
22 .filter(|output| output.status.success())
12 .filter(|output| output.status.success())
23 .and_then(|x| String::from_utf8(x.stdout).ok());
13 .and_then(|x| String::from_utf8(x.stdout).ok());
24
14
25− let calver = get_calver();
26 let version: Cow<_> = match &git_hash {
15 let version: Cow<_> = match &git_hash {
27− Some(git_hash) => format!("{} ({})", calver, &git_hash[..8]).into(),
16+ Some(git_hash) => format!("{} ({})", VERSION, &git_hash[..8]).into(),
28− None => calver.into(),
17+ None => VERSION.into(),
29 };
18 };
30
19
31 println!(
20 println!(
@@ -33,6 +22,7 @@ fn main() {
33 std::env::var("TARGET").unwrap()
22 std::env::var("TARGET").unwrap()
34 );
23 );
35
24
25+ println!("cargo:rerun-if-changed=../VERSION");
36 println!("cargo:rustc-env=VERSION_AND_GIT_HASH={}", version);
26 println!("cargo:rustc-env=VERSION_AND_GIT_HASH={}", version);
37
27
38 if git_hash.is_none() {
28 if git_hash.is_none() {
@@ -50,9 +40,7 @@ fn main() {
50 .ok()
40 .ok()
51 .filter(|output| output.status.success())
41 .filter(|output| output.status.success())
52 .and_then(|x| String::from_utf8(x.stdout).ok())
42 .and_then(|x| String::from_utf8(x.stdout).ok())
53− else {
54− return;
43+ else{ return; };
55− };
56 // If heads starts pointing at something else (different branch)
44 // If heads starts pointing at something else (different branch)
57 // we need to return
45 // we need to return
58 let head = Path::new(&git_dir).join("HEAD");
46 let head = Path::new(&git_dir).join("HEAD");
@@ -67,9 +55,7 @@ fn main() {
67 .ok()
55 .ok()
68 .filter(|output| output.status.success())
56 .filter(|output| output.status.success())
69 .and_then(|x| String::from_utf8(x.stdout).ok())
57 .and_then(|x| String::from_utf8(x.stdout).ok())
70− else {
71− return;
58+ else{ return; };
72− };
73 let head_ref = Path::new(&git_dir).join(head_ref);
59 let head_ref = Path::new(&git_dir).join(head_ref);
74 if head_ref.exists() {
60 if head_ref.exists() {
75 println!("cargo:rerun-if-changed={}", head_ref.display());
61 println!("cargo:rerun-if-changed={}", head_ref.display());
helix-loader/src/lib.rs+17−78
@@ -3,56 +3,29 @@ pub mod grammar;
3
3
4use etcetera::base_strategy::{choose_base_strategy, BaseStrategy};
4use etcetera::base_strategy::{choose_base_strategy, BaseStrategy};
5use std::path::{Path, PathBuf};
5use std::path::{Path, PathBuf};
6−use std::sync::RwLock;
7
6
8pub const VERSION_AND_GIT_HASH: &str = env!("VERSION_AND_GIT_HASH");
7pub const VERSION_AND_GIT_HASH: &str = env!("VERSION_AND_GIT_HASH");
9
8
10−static CWD: RwLock<Option<PathBuf>> = RwLock::new(None);
11−
12static RUNTIME_DIRS: once_cell::sync::Lazy<Vec<PathBuf>> =
9static RUNTIME_DIRS: once_cell::sync::Lazy<Vec<PathBuf>> =
13 once_cell::sync::Lazy::new(prioritize_runtime_dirs);
10 once_cell::sync::Lazy::new(prioritize_runtime_dirs);
14
11
15static CONFIG_FILE: once_cell::sync::OnceCell<PathBuf> = once_cell::sync::OnceCell::new();
12static CONFIG_FILE: once_cell::sync::OnceCell<PathBuf> = once_cell::sync::OnceCell::new();
16
13
17−static LOG_FILE: once_cell::sync::OnceCell<PathBuf> = once_cell::sync::OnceCell::new();
14+pub fn initialize_config_file(specified_file: Option<PathBuf>) {
18−
15+ let config_file = specified_file.unwrap_or_else(|| {
19−// Get the current working directory.
16+ let config_dir = config_dir();
20−// This information is managed internally as the call to std::env::current_dir
21−// might fail if the cwd has been deleted.
22−pub fn current_working_dir() -> PathBuf {
23− if let Some(path) = &*CWD.read().unwrap() {
24− return path.clone();
25− }
26
17
27− let path = std::env::current_dir()
18+ if !config_dir.exists() {
28− .and_then(dunce::canonicalize)
19+ std::fs::create_dir_all(&config_dir).ok();
29− .expect("Couldn't determine current working directory");
20+ }
30− let mut cwd = CWD.write().unwrap();
31− *cwd = Some(path.clone());
32
21
33− path
22+ config_dir.join("config.toml")
34−}
23+ });
35
24
36−pub fn set_current_working_dir(path: impl AsRef<Path>) -> std::io::Result<()> {
25+ // We should only initialize this value once.
37− let path = dunce::canonicalize(path)?;
38− std::env::set_current_dir(&path)?;
39− let mut cwd = CWD.write().unwrap();
40− *cwd = Some(path);
41− Ok(())
42−}
43−
44−pub fn initialize_config_file(specified_file: Option<PathBuf>) {
45− let config_file = specified_file.unwrap_or_else(default_config_file);
46− ensure_parent_dir(&config_file);
47 CONFIG_FILE.set(config_file).ok();
26 CONFIG_FILE.set(config_file).ok();
48}
27}
49
28
50−pub fn initialize_log_file(specified_file: Option<PathBuf>) {
51− let log_file = specified_file.unwrap_or_else(default_log_file);
52− ensure_parent_dir(&log_file);
53− LOG_FILE.set(log_file).ok();
54−}
55−
56/// A list of runtime directories from highest to lowest priority
29/// A list of runtime directories from highest to lowest priority
57///
30///
58/// The priority is:
31/// The priority is:
@@ -60,8 +33,7 @@ pub fn initialize_log_file(specified_file: Option<PathBuf>) {
60/// 1. sibling directory to `CARGO_MANIFEST_DIR` (if environment variable is set)
33/// 1. sibling directory to `CARGO_MANIFEST_DIR` (if environment variable is set)
61/// 2. subdirectory of user config directory (always included)
34/// 2. subdirectory of user config directory (always included)
62/// 3. `HELIX_RUNTIME` (if environment variable is set)
35/// 3. `HELIX_RUNTIME` (if environment variable is set)
63−/// 4. `HELIX_DEFAULT_RUNTIME` (if environment variable is set *at build time*)
64−/// 5. subdirectory of path to helix executable (always included)
36+/// 4. subdirectory of path to helix executable (always included)
65///
37///
66/// Postcondition: returns at least two paths (they might not exist).
38/// Postcondition: returns at least two paths (they might not exist).
67fn prioritize_runtime_dirs() -> Vec<PathBuf> {
39fn prioritize_runtime_dirs() -> Vec<PathBuf> {
@@ -82,14 +54,6 @@ fn prioritize_runtime_dirs() -> Vec<PathBuf> {
82 rt_dirs.push(dir.into());
54 rt_dirs.push(dir.into());
83 }
55 }
84
56
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−
93 // fallback to location of the executable being run
57 // fallback to location of the executable being run
94 // canonicalize the path in case the executable is symlinked
58 // canonicalize the path in case the executable is symlinked
95 let exe_rt_dir = std::env::current_exe()
59 let exe_rt_dir = std::env::current_exe()
@@ -158,11 +122,10 @@ pub fn cache_dir() -> PathBuf {
158}
122}
159
123
160pub fn config_file() -> PathBuf {
124pub fn config_file() -> PathBuf {
125+ CONFIG_FILE
126+ .get()
161− CONFIG_FILE.get().map(|path| path.to_path_buf()).unwrap()
127+ .map(|path| path.to_path_buf())
162−}
128+ .unwrap_or_else(|| config_dir().join("config.toml"))
163−
164−pub fn log_file() -> PathBuf {
165− LOG_FILE.get().map(|path| path.to_path_buf()).unwrap()
166}
129}
167
130
168pub fn workspace_config_file() -> PathBuf {
131pub fn workspace_config_file() -> PathBuf {
@@ -173,7 +136,7 @@ pub fn lang_config_file() -> PathBuf {
173 config_dir().join("languages.toml")
136 config_dir().join("languages.toml")
174}
137}
175
138
176−pub fn default_log_file() -> PathBuf {
139+pub fn log_file() -> PathBuf {
177 cache_dir().join("helix.log")
140 cache_dir().join("helix.log")
178}
141}
179
142
@@ -254,7 +217,7 @@ pub fn merge_toml_values(left: toml::Value, right: toml::Value, merge_depth: usi
254/// If no workspace was found returns (CWD, true).
217/// If no workspace was found returns (CWD, true).
255/// Otherwise (workspace, false) is returned
218/// Otherwise (workspace, false) is returned
256pub fn find_workspace() -> (PathBuf, bool) {
219pub fn find_workspace() -> (PathBuf, bool) {
257− let current_dir = current_working_dir();
220+ let current_dir = std::env::current_dir().expect("unable to determine current directory");
258 for ancestor in current_dir.ancestors() {
221 for ancestor in current_dir.ancestors() {
259 if ancestor.join(".git").exists() || ancestor.join(".helix").exists() {
222 if ancestor.join(".git").exists() || ancestor.join(".helix").exists() {
260 return (ancestor.to_owned(), false);
223 return (ancestor.to_owned(), false);
@@ -264,37 +227,13 @@ pub fn find_workspace() -> (PathBuf, bool) {
264 (current_dir, true)
227 (current_dir, true)
265}
228}
266
229
267−fn default_config_file() -> PathBuf {
268− config_dir().join("config.toml")
269−}
270−
271−fn ensure_parent_dir(path: &Path) {
272− if let Some(parent) = path.parent() {
273− if !parent.exists() {
274− std::fs::create_dir_all(parent).ok();
275− }
276− }
277−}
278−
279#[cfg(test)]
230#[cfg(test)]
280mod merge_toml_tests {
231mod merge_toml_tests {
281 use std::str;
232 use std::str;
282
233
283− use super::{current_working_dir, merge_toml_values, set_current_working_dir};
234+ use super::merge_toml_values;
284 use toml::Value;
235 use toml::Value;
285
236
286− #[test]
287− fn current_dir_is_set() {
288− let new_path = dunce::canonicalize(std::env::temp_dir()).unwrap();
289− let cwd = current_working_dir();
290− assert_ne!(cwd, new_path);
291−
292− set_current_working_dir(&new_path).expect("Couldn't set new path");
293−
294− let cwd = current_working_dir();
295− assert_eq!(cwd, new_path);
296− }
297−
298 #[test]
237 #[test]
299 fn language_toml_map_merges() {
238 fn language_toml_map_merges() {
300 const USER: &str = r#"
239 const USER: &str = r#"
helix-lsp/Cargo.toml+13−15
@@ -1,32 +1,30 @@
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"
3description = "LSP client implementation for Helix project"
7description = "LSP client implementation for Helix project"
4−version.workspace = true
5−authors.workspace = true
6−edition.workspace = true
7−license.workspace = true
8−rust-version.workspace = true
9−categories.workspace = true
8+categories = ["editor"]
10−repository.workspace = true
9+repository = "https://github.com/helix-editor/helix"
11−homepage.workspace = true
10+homepage = "https://helix-editor.com"
12
11
13# 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
14
13
15[dependencies]
14[dependencies]
16−helix-core = { path = "../helix-core" }
15+helix-core = { version = "0.6", path = "../helix-core" }
17−helix-loader = { path = "../helix-loader" }
16+helix-loader = { version = "0.6", path = "../helix-loader" }
18−helix-parsec = { path = "../helix-parsec" }
17+helix-parsec = { version = "0.6", path = "../helix-parsec" }
19
18
20anyhow = "1.0"
19anyhow = "1.0"
21futures-executor = "0.3"
20futures-executor = "0.3"
22futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
21futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
23−globset = "0.4.14"
24log = "0.4"
22log = "0.4"
25−lsp-types = { version = "0.95" }
23+lsp-types = { version = "0.94" }
26serde = { version = "1.0", features = ["derive"] }
24serde = { version = "1.0", features = ["derive"] }
27serde_json = "1.0"
25serde_json = "1.0"
28thiserror = "1.0"
26thiserror = "1.0"
29−tokio = { version = "1.35", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
27+tokio = { version = "1.28", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
30tokio-stream = "0.1.14"
28tokio-stream = "0.1.14"
31−which = "5.0.0"
29+which = "4.4"
32parking_lot = "0.12.1"
30parking_lot = "0.12.1"
helix-lsp/src/client.rs+11−123
@@ -7,9 +7,8 @@ use crate::{
7use helix_core::{find_workspace, path, syntax::LanguageServerFeature, ChangeSet, Rope};
7use helix_core::{find_workspace, path, syntax::LanguageServerFeature, ChangeSet, Rope};
8use helix_loader::{self, VERSION_AND_GIT_HASH};
8use helix_loader::{self, VERSION_AND_GIT_HASH};
9use lsp::{
9use lsp::{
10− notification::DidChangeWorkspaceFolders, CodeActionCapabilityResolveSupport,
10+ notification::DidChangeWorkspaceFolders, DidChangeWorkspaceFoldersParams, OneOf,
11− DidChangeWorkspaceFoldersParams, OneOf, PositionEncodingKind, WorkspaceFolder,
12− WorkspaceFoldersChangeEvent,
11+ PositionEncodingKind, WorkspaceFolder, WorkspaceFoldersChangeEvent,
13};
12};
14use lsp_types as lsp;
13use lsp_types as lsp;
15use parking_lot::Mutex;
14use parking_lot::Mutex;
@@ -401,22 +400,12 @@ impl Client {
401 &self,
400 &self,
402 params: R::Params,
401 params: R::Params,
403 ) -> impl Future<Output = Result<Value>>
402 ) -> 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>>
415 where
403 where
416 R::Params: serde::Serialize,
404 R::Params: serde::Serialize,
417 {
405 {
418 let server_tx = self.server_tx.clone();
406 let server_tx = self.server_tx.clone();
419 let id = self.next_request_id();
407 let id = self.next_request_id();
408+ let timeout_secs = self.req_timeout;
420
409
421 async move {
410 async move {
422 use std::time::Duration;
411 use std::time::Duration;
@@ -554,15 +543,6 @@ impl Client {
554 normalizes_line_endings: Some(false),
543 normalizes_line_endings: Some(false),
555 change_annotation_support: None,
544 change_annotation_support: None,
556 }),
545 }),
557− did_change_watched_files: Some(lsp::DidChangeWatchedFilesClientCapabilities {
558− dynamic_registration: Some(true),
559− relative_pattern_support: Some(false),
560− }),
561− file_operations: Some(lsp::WorkspaceFileOperationsClientCapabilities {
562− will_rename: Some(true),
563− did_rename: Some(true),
564− ..Default::default()
565− }),
566 ..Default::default()
546 ..Default::default()
567 }),
547 }),
568 text_document: Some(lsp::TextDocumentClientCapabilities {
548 text_document: Some(lsp::TextDocumentClientCapabilities {
@@ -629,12 +609,6 @@ impl Client {
629 .collect(),
609 .collect(),
630 },
610 },
631 }),
611 }),
632− is_preferred_support: Some(true),
633− disabled_support: Some(true),
634− data_support: Some(true),
635− resolve_support: Some(CodeActionCapabilityResolveSupport {
636− properties: vec!["edit".to_owned(), "command".to_owned()],
637− }),
638 ..Default::default()
612 ..Default::default()
639 }),
613 }),
640 publish_diagnostics: Some(lsp::PublishDiagnosticsClientCapabilities {
614 publish_diagnostics: Some(lsp::PublishDiagnosticsClientCapabilities {
@@ -667,7 +641,6 @@ impl Client {
667 version: Some(String::from(VERSION_AND_GIT_HASH)),
641 version: Some(String::from(VERSION_AND_GIT_HASH)),
668 }),
642 }),
669 locale: None, // TODO
643 locale: None, // TODO
670− work_done_progress_params: lsp::WorkDoneProgressParams::default(),
671 };
644 };
672
645
673 self.request::<lsp::request::Initialize>(params).await
646 self.request::<lsp::request::Initialize>(params).await
@@ -716,65 +689,6 @@ impl Client {
716 })
689 })
717 }
690 }
718
691
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−
778 // -------------------------------------------------------------------------------------------
692 // -------------------------------------------------------------------------------------------
779 // Text document
693 // Text document
780 // -------------------------------------------------------------------------------------------
694 // -------------------------------------------------------------------------------------------
@@ -970,19 +884,20 @@ impl Client {
970 ) -> Option<impl Future<Output = Result<()>>> {
884 ) -> Option<impl Future<Output = Result<()>>> {
971 let capabilities = self.capabilities.get().unwrap();
885 let capabilities = self.capabilities.get().unwrap();
972
886
973− let include_text = match &capabilities.text_document_sync.as_ref()? {
887+ let include_text = match &capabilities.text_document_sync {
974− lsp::TextDocumentSyncCapability::Options(lsp::TextDocumentSyncOptions {
888+ Some(lsp::TextDocumentSyncCapability::Options(lsp::TextDocumentSyncOptions {
975− save: options,
889+ save: Some(options),
976 ..
890 ..
977− }) => match options.as_ref()? {
891+ })) => match options {
978 lsp::TextDocumentSyncSaveOptions::Supported(true) => false,
892 lsp::TextDocumentSyncSaveOptions::Supported(true) => false,
979 lsp::TextDocumentSyncSaveOptions::SaveOptions(lsp_types::SaveOptions {
893 lsp::TextDocumentSyncSaveOptions::SaveOptions(lsp_types::SaveOptions {
980 include_text,
894 include_text,
981 }) => include_text.unwrap_or(false),
895 }) => include_text.unwrap_or(false),
982− lsp::TextDocumentSyncSaveOptions::Supported(false) => return None,
896+ // Supported(false)
897+ _ => return None,
983 },
898 },
984− // see: https://github.com/microsoft/language-server-protocol/issues/288
899+ // unsupported
985− lsp::TextDocumentSyncCapability::Kind(..) => false,
900+ _ => return None,
986 };
901 };
987
902
988 Some(self.notify::<lsp::notification::DidSaveTextDocument>(
903 Some(self.notify::<lsp::notification::DidSaveTextDocument>(
@@ -1039,24 +954,6 @@ impl Client {
1039 Some(self.call::<lsp::request::ResolveCompletionItem>(completion_item))
954 Some(self.call::<lsp::request::ResolveCompletionItem>(completion_item))
1040 }
955 }
1041
956
1042− pub fn resolve_code_action(
1043− &self,
1044− code_action: lsp::CodeAction,
1045− ) -> Option<impl Future<Output = Result<Value>>> {
1046− let capabilities = self.capabilities.get().unwrap();
1047−
1048− // Return early if the server does not support resolving code actions.
1049− match capabilities.code_action_provider {
1050− Some(lsp::CodeActionProviderCapability::Options(lsp::CodeActionOptions {
1051− resolve_provider: Some(true),
1052− ..
1053− })) => (),
1054− _ => return None,
1055− }
1056−
1057− Some(self.call::<lsp::request::CodeActionResolveRequest>(code_action))
1058− }
1059−
1060 pub fn text_document_signature_help(
957 pub fn text_document_signature_help(
1061 &self,
958 &self,
1062 text_document: lsp::TextDocumentIdentifier,
959 text_document: lsp::TextDocumentIdentifier,
@@ -1531,13 +1428,4 @@ impl Client {
1531
1428
1532 Some(self.call::<lsp::request::ExecuteCommand>(params))
1429 Some(self.call::<lsp::request::ExecuteCommand>(params))
1533 }
1430 }
1534−
1535− pub fn did_change_watched_files(
1536− &self,
1537− changes: Vec<lsp::FileEvent>,
1538− ) -> impl Future<Output = std::result::Result<(), Error>> {
1539− self.notify::<lsp::notification::DidChangeWatchedFiles>(lsp::DidChangeWatchedFilesParams {
1540− changes,
1541− })
1542− }
1543}
1431}
helix-lsp/src/file_event.rsdeleted−193
@@ -1,193 +0,0 @@
1−use std::{collections::HashMap, path::PathBuf, sync::Weak};
2−
3−use globset::{GlobBuilder, GlobSetBuilder};
4−use tokio::sync::mpsc;
5−
6−use crate::{lsp, Client};
7−
8−enum Event {
9− FileChanged {
10− path: PathBuf,
11− },
12− Register {
13− client_id: usize,
14− client: Weak<Client>,
15− registration_id: String,
16− options: lsp::DidChangeWatchedFilesRegistrationOptions,
17− },
18− Unregister {
19− client_id: usize,
20− registration_id: String,
21− },
22− RemoveClient {
23− client_id: usize,
24− },
25−}
26−
27−#[derive(Default)]
28−struct ClientState {
29− client: Weak<Client>,
30− registered: HashMap<String, globset::GlobSet>,
31−}
32−
33−/// The Handler uses a dedicated tokio task to respond to file change events by
34−/// forwarding changes to LSPs that have registered for notifications with a
35−/// matching glob.
36−///
37−/// When an LSP registers for the DidChangeWatchedFiles notification, the
38−/// Handler is notified by sending the registration details in addition to a
39−/// weak reference to the LSP client. This is done so that the Handler can have
40−/// access to the client without preventing the client from being dropped if it
41−/// is closed and the Handler isn't properly notified.
42−#[derive(Clone, Debug)]
43−pub struct Handler {
44− tx: mpsc::UnboundedSender<Event>,
45−}
46−
47−impl Default for Handler {
48− fn default() -> Self {
49− Self::new()
50− }
51−}
52−
53−impl Handler {
54− pub fn new() -> Self {
55− let (tx, rx) = mpsc::unbounded_channel();
56− tokio::spawn(Self::run(rx));
57− Self { tx }
58− }
59−
60− pub fn register(
61− &self,
62− client_id: usize,
63− client: Weak<Client>,
64− registration_id: String,
65− options: lsp::DidChangeWatchedFilesRegistrationOptions,
66− ) {
67− let _ = self.tx.send(Event::Register {
68− client_id,
69− client,
70− registration_id,
71− options,
72− });
73− }
74−
75− pub fn unregister(&self, client_id: usize, registration_id: String) {
76− let _ = self.tx.send(Event::Unregister {
77− client_id,
78− registration_id,
79− });
80− }
81−
82− pub fn file_changed(&self, path: PathBuf) {
83− let _ = self.tx.send(Event::FileChanged { path });
84− }
85−
86− pub fn remove_client(&self, client_id: usize) {
87− let _ = self.tx.send(Event::RemoveClient { client_id });
88− }
89−
90− async fn run(mut rx: mpsc::UnboundedReceiver<Event>) {
91− let mut state: HashMap<usize, ClientState> = HashMap::new();
92− while let Some(event) = rx.recv().await {
93− match event {
94− Event::FileChanged { path } => {
95− log::debug!("Received file event for {:?}", &path);
96−
97− state.retain(|id, client_state| {
98− if !client_state
99− .registered
100− .values()
101− .any(|glob| glob.is_match(&path))
102− {
103− return true;
104− }
105− let Some(client) = client_state.client.upgrade() else {
106− log::warn!("LSP client was dropped: {id}");
107− return false;
108− };
109− let Ok(uri) = lsp::Url::from_file_path(&path) else {
110− return true;
111− };
112− log::debug!(
113− "Sending didChangeWatchedFiles notification to client '{}'",
114− client.name()
115− );
116− if let Err(err) = crate::block_on(client
117− .did_change_watched_files(vec![lsp::FileEvent {
118− uri,
119− // We currently always send the CHANGED state
120− // since we don't actually have more context at
121− // the moment.
122− typ: lsp::FileChangeType::CHANGED,
123− }]))
124− {
125− log::warn!("Failed to send didChangeWatchedFiles notification to client: {err}");
126− }
127− true
128− });
129− }
130− Event::Register {
131− client_id,
132− client,
133− registration_id,
134− options: ops,
135− } => {
136− log::debug!(
137− "Registering didChangeWatchedFiles for client '{}' with id '{}'",
138− client_id,
139− registration_id
140− );
141−
142− let entry = state.entry(client_id).or_insert_with(ClientState::default);
143− entry.client = client;
144−
145− let mut builder = GlobSetBuilder::new();
146− for watcher in ops.watchers {
147− if let lsp::GlobPattern::String(pattern) = watcher.glob_pattern {
148− if let Ok(glob) = GlobBuilder::new(&pattern).build() {
149− builder.add(glob);
150− }
151− }
152− }
153− match builder.build() {
154− Ok(globset) => {
155− entry.registered.insert(registration_id, globset);
156− }
157− Err(err) => {
158− // Remove any old state for that registration id and
159− // remove the entire client if it's now empty.
160− entry.registered.remove(&registration_id);
161− if entry.registered.is_empty() {
162− state.remove(&client_id);
163− }
164− log::warn!(
165− "Unable to build globset for LSP didChangeWatchedFiles {err}"
166− )
167− }
168− }
169− }
170− Event::Unregister {
171− client_id,
172− registration_id,
173− } => {
174− log::debug!(
175− "Unregistering didChangeWatchedFiles with id '{}' for client '{}'",
176− registration_id,
177− client_id
178− );
179− if let Some(client_state) = state.get_mut(&client_id) {
180− client_state.registered.remove(&registration_id);
181− if client_state.registered.is_empty() {
182− state.remove(&client_id);
183− }
184− }
185− }
186− Event::RemoveClient { client_id } => {
187− log::debug!("Removing LSP client: {client_id}");
188− state.remove(&client_id);
189− }
190− }
191− }
192− }
193−}
helix-lsp/src/lib.rs+30−45
@@ -1,5 +1,4 @@
1mod client;
1mod client;
2−pub mod file_event;
3pub mod jsonrpc;
2pub mod jsonrpc;
4pub mod snippet;
3pub mod snippet;
5mod transport;
4mod transport;
@@ -435,7 +434,7 @@ pub mod util {
435 }
434 }
436
435
437 let tabstops = tabstops.first().filter(|tabstops| !tabstops.is_empty());
436 let tabstops = tabstops.first().filter(|tabstops| !tabstops.is_empty());
438− let Some(tabstops) = tabstops else {
437+ let Some(tabstops) = tabstops else{
439 // no tabstop normal mapping
438 // no tabstop normal mapping
440 mapped_selection.push(range);
439 mapped_selection.push(range);
441 continue;
440 continue;
@@ -445,36 +444,36 @@ pub mod util {
445 // the tabstop closest to the range simply replaces `head` while anchor remains in place
444 // the tabstop closest to the range simply replaces `head` while anchor remains in place
446 // the remaining tabstops receive their own single-width cursor
445 // the remaining tabstops receive their own single-width cursor
447 if range.head < range.anchor {
446 if range.head < range.anchor {
448− let last_idx = tabstops.len() - 1;
449− let last_tabstop = tabstop_anchor + tabstops[last_idx].0;
447+ let first_tabstop = tabstop_anchor + tabstops[0].1;
450
448
451 // if selection is forward but was moved to the right it is
449 // if selection is forward but was moved to the right it is
452 // contained entirely in the replacement text, just do a point
450 // contained entirely in the replacement text, just do a point
453 // selection (fallback below)
451 // selection (fallback below)
454− if range.anchor > last_tabstop {
452+ if range.anchor >= first_tabstop {
455− let range = Range::new(range.anchor, last_tabstop);
453+ let range = Range::new(range.anchor, first_tabstop);
456 mapped_selection.push(range);
454 mapped_selection.push(range);
457− let rem_tabstops = tabstops[..last_idx]
455+ let rem_tabstops = tabstops[1..]
458 .iter()
456 .iter()
459− .map(|tabstop| Range::point(tabstop_anchor + tabstop.0));
457+ .map(|tabstop| Range::point(tabstop_anchor + tabstop.1));
460 mapped_selection.extend(rem_tabstops);
458 mapped_selection.extend(rem_tabstops);
461 continue;
459 continue;
462 }
460 }
463 } else {
461 } else {
462+ let last_idx = tabstops.len() - 1;
464− let first_tabstop = tabstop_anchor + tabstops[0].0;
463+ let last_tabstop = tabstop_anchor + tabstops[last_idx].1;
465
464
466 // if selection is forward but was moved to the right it is
465 // if selection is forward but was moved to the right it is
467 // contained entirely in the replacement text, just do a point
466 // contained entirely in the replacement text, just do a point
468 // selection (fallback below)
467 // selection (fallback below)
469− if range.anchor < first_tabstop {
468+ if range.anchor <= last_tabstop {
470 // we can't properly compute the the next grapheme
469 // we can't properly compute the the next grapheme
471 // here because the transaction hasn't been applied yet
470 // here because the transaction hasn't been applied yet
472 // that is not a problem because the range gets grapheme aligned anyway
471 // 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
472 // tough so just adding one will always cause head to be grapheme
474 // aligned correctly when applied to the document
473 // aligned correctly when applied to the document
475− let range = Range::new(range.anchor, first_tabstop + 1);
474+ let range = Range::new(range.anchor, last_tabstop + 1);
476 mapped_selection.push(range);
475 mapped_selection.push(range);
477− let rem_tabstops = tabstops[1..]
476+ let rem_tabstops = tabstops[..last_idx]
478 .iter()
477 .iter()
479 .map(|tabstop| Range::point(tabstop_anchor + tabstop.0));
478 .map(|tabstop| Range::point(tabstop_anchor + tabstop.0));
480 mapped_selection.extend(rem_tabstops);
479 mapped_selection.extend(rem_tabstops);
@@ -548,7 +547,6 @@ pub enum MethodCall {
548 WorkspaceFolders,
547 WorkspaceFolders,
549 WorkspaceConfiguration(lsp::ConfigurationParams),
548 WorkspaceConfiguration(lsp::ConfigurationParams),
550 RegisterCapability(lsp::RegistrationParams),
549 RegisterCapability(lsp::RegistrationParams),
551− UnregisterCapability(lsp::UnregistrationParams),
552}
550}
553
551
554impl MethodCall {
552impl MethodCall {
@@ -572,10 +570,6 @@ impl MethodCall {
572 let params: lsp::RegistrationParams = params.parse()?;
570 let params: lsp::RegistrationParams = params.parse()?;
573 Self::RegisterCapability(params)
571 Self::RegisterCapability(params)
574 }
572 }
575− lsp::request::UnregisterCapability::METHOD => {
576− let params: lsp::UnregistrationParams = params.parse()?;
577− Self::UnregisterCapability(params)
578− }
579 _ => {
573 _ => {
580 return Err(Error::Unhandled);
574 return Err(Error::Unhandled);
581 }
575 }
@@ -635,7 +629,6 @@ pub struct Registry {
635 syn_loader: Arc<helix_core::syntax::Loader>,
629 syn_loader: Arc<helix_core::syntax::Loader>,
636 counter: usize,
630 counter: usize,
637 pub incoming: SelectAll<UnboundedReceiverStream<(usize, Call)>>,
631 pub incoming: SelectAll<UnboundedReceiverStream<(usize, Call)>>,
638− pub file_event_handler: file_event::Handler,
639}
632}
640
633
641impl Registry {
634impl Registry {
@@ -645,7 +638,6 @@ impl Registry {
645 syn_loader,
638 syn_loader,
646 counter: 0,
639 counter: 0,
647 incoming: SelectAll::new(),
640 incoming: SelectAll::new(),
648− file_event_handler: file_event::Handler::new(),
649 }
641 }
650 }
642 }
651
643
@@ -658,7 +650,6 @@ impl Registry {
658 }
650 }
659
651
660 pub fn remove_by_id(&mut self, id: usize) {
652 pub fn remove_by_id(&mut self, id: usize) {
661− self.file_event_handler.remove_client(id);
662 self.inner.retain(|_, language_servers| {
653 self.inner.retain(|_, language_servers| {
663 language_servers.retain(|ls| id != ls.id());
654 language_servers.retain(|ls| id != ls.id());
664 !language_servers.is_empty()
655 !language_servers.is_empty()
@@ -724,7 +715,6 @@ impl Registry {
724 .unwrap();
715 .unwrap();
725
716
726 for old_client in old_clients {
717 for old_client in old_clients {
727− self.file_event_handler.remove_client(old_client.id());
728 tokio::spawn(async move {
718 tokio::spawn(async move {
729 let _ = old_client.force_shutdown().await;
719 let _ = old_client.force_shutdown().await;
730 });
720 });
@@ -741,7 +731,6 @@ impl Registry {
741 pub fn stop(&mut self, name: &str) {
731 pub fn stop(&mut self, name: &str) {
742 if let Some(clients) = self.inner.remove(name) {
732 if let Some(clients) = self.inner.remove(name) {
743 for client in clients {
733 for client in clients {
744− self.file_event_handler.remove_client(client.id());
745 tokio::spawn(async move {
734 tokio::spawn(async move {
746 let _ = client.force_shutdown().await;
735 let _ = client.force_shutdown().await;
747 });
736 });
@@ -749,40 +738,36 @@ impl Registry {
749 }
738 }
750 }
739 }
751
740
752− pub fn get<'a>(
741+ pub fn get(
753− &'a mut self,
742+ &mut self,
754− language_config: &'a LanguageConfiguration,
743+ language_config: &LanguageConfiguration,
755− doc_path: Option<&'a std::path::PathBuf>,
744+ doc_path: Option<&std::path::PathBuf>,
756− root_dirs: &'a [PathBuf],
745+ root_dirs: &[PathBuf],
757 enable_snippets: bool,
746 enable_snippets: bool,
758− ) -> impl Iterator<Item = (LanguageServerName, Result<Arc<Client>>)> + 'a {
747+ ) -> Result<HashMap<LanguageServerName, Arc<Client>>> {
748+ language_config
759− language_config.language_servers.iter().map(
749+ .language_servers
750+ .iter()
760− move |LanguageServerFeatures { name, .. }| {
751+ .map(|LanguageServerFeatures { name, .. }| {
761 if let Some(clients) = self.inner.get(name) {
752 if let Some(clients) = self.inner.get(name) {
762 if let Some((_, client)) = clients.iter().enumerate().find(|(i, client)| {
753 if let Some((_, client)) = clients.iter().enumerate().find(|(i, client)| {
763 client.try_add_doc(&language_config.roots, root_dirs, doc_path, *i == 0)
754 client.try_add_doc(&language_config.roots, root_dirs, doc_path, *i == 0)
764 }) {
755 }) {
765− return (name.to_owned(), Ok(client.clone()));
756+ return Ok((name.to_owned(), client.clone()));
766 }
757 }
767 }
758 }
768− match self.start_client(
759+ let client = self.start_client(
769 name.clone(),
760 name.clone(),
770 language_config,
761 language_config,
771 doc_path,
762 doc_path,
772 root_dirs,
763 root_dirs,
773 enable_snippets,
764 enable_snippets,
774− ) {
765+ )?;
775− Ok(client) => {
766+ let clients = self.inner.entry(name.clone()).or_default();
776− self.inner
777− .entry(name.to_owned())
778− .or_default()
779− .push(client.clone());
767+ clients.push(client.clone());
780− (name.clone(), Ok(client))
768+ Ok((name.clone(), client))
781− }
769+ })
782− Err(err) => (name.to_owned(), Err(err)),
770+ .collect()
783− }
784− },
785− )
786 }
771 }
787
772
788 pub fn iter_clients(&self) -> impl Iterator<Item = &Arc<Client>> {
773 pub fn iter_clients(&self) -> impl Iterator<Item = &Arc<Client>> {
@@ -946,7 +931,7 @@ pub fn find_lsp_workspace(
946 let mut file = if file.is_absolute() {
931 let mut file = if file.is_absolute() {
947 file.to_path_buf()
932 file.to_path_buf()
948 } else {
933 } else {
949− let current_dir = helix_loader::current_working_dir();
934+ let current_dir = std::env::current_dir().expect("unable to determine current directory");
950 current_dir.join(file)
935 current_dir.join(file)
951 };
936 };
952 file = path::get_normalized_path(&file);
937 file = path::get_normalized_path(&file);
helix-lsp/src/transport.rs+1−9
@@ -353,11 +353,6 @@ impl Transport {
353 }
353 }
354 }
354 }
355
355
356− fn is_shutdown(payload: &Payload) -> bool {
357− use lsp_types::request::{Request, Shutdown};
358− matches!(payload, Payload::Request { value: jsonrpc::MethodCall { method, .. }, .. } if method == Shutdown::METHOD)
359− }
360−
361 // TODO: events that use capabilities need to do the right thing
356 // TODO: events that use capabilities need to do the right thing
362
357
363 loop {
358 loop {
@@ -396,10 +391,7 @@ impl Transport {
396 }
391 }
397 msg = client_rx.recv() => {
392 msg = client_rx.recv() => {
398 if let Some(msg) = msg {
393 if let Some(msg) = msg {
399− if is_pending && is_shutdown(&msg) {
400− log::info!("Language server not initialized, shutting down");
401− break;
402− } else if is_pending && !is_initialize(&msg) {
394+ if is_pending && !is_initialize(&msg) {
403 // ignore notifications
395 // ignore notifications
404 if let Payload::Notification(_) = msg {
396 if let Payload::Notification(_) = msg {
405 continue;
397 continue;
helix-parsec/Cargo.toml+7−8
@@ -1,14 +1,13 @@
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"
3description = "Parser combinators for Helix"
7description = "Parser combinators for Helix"
8+categories = ["editor"]
9+repository = "https://github.com/helix-editor/helix"
10+homepage = "https://helix-editor.com"
4include = ["src/**/*", "README.md"]
11include = ["src/**/*", "README.md"]
5−version.workspace = true
6−authors.workspace = true
7−edition.workspace = true
8−license.workspace = true
9−rust-version.workspace = true
10−categories.workspace = true
11−repository.workspace = true
12−homepage.workspace = true
13
12
14[dependencies]
13[dependencies]
helix-term/Cargo.toml+25−33
@@ -1,16 +1,16 @@
1[package]
1[package]
2name = "helix-term"
2name = "helix-term"
3+version = "0.6.0"
3description = "A post-modern text editor."
4description = "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"
4include = ["src/**/*", "README.md"]
11include = ["src/**/*", "README.md"]
5default-run = "hx"
12default-run = "hx"
6−version.workspace = true
7−authors.workspace = true
8−edition.workspace = true
9−license.workspace = true
10−rust-version.workspace = true
13+rust-version = "1.65"
11−categories.workspace = true
12−repository.workspace = true
13−homepage.workspace = true
14
14
15[features]
15[features]
16default = ["git"]
16default = ["git"]
@@ -23,22 +23,21 @@ name = "hx"
23path = "src/main.rs"
23path = "src/main.rs"
24
24
25[dependencies]
25[dependencies]
26−helix-core = { path = "../helix-core" }
26+helix-core = { version = "0.6", path = "../helix-core" }
27−helix-event = { path = "../helix-event" }
28−helix-view = { path = "../helix-view" }
27+helix-view = { version = "0.6", path = "../helix-view" }
29−helix-lsp = { path = "../helix-lsp" }
28+helix-lsp = { version = "0.6", path = "../helix-lsp" }
30−helix-dap = { path = "../helix-dap" }
29+helix-dap = { version = "0.6", path = "../helix-dap" }
31−helix-vcs = { path = "../helix-vcs" }
30+helix-vcs = { version = "0.6", path = "../helix-vcs" }
32−helix-loader = { path = "../helix-loader" }
31+helix-loader = { version = "0.6", path = "../helix-loader" }
33
32
34anyhow = "1"
33anyhow = "1"
35−once_cell = "1.19"
34+once_cell = "1.18"
36
35
37−which = "5.0.0"
36+which = "4.4"
38
37
39tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot"] }
38tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot"] }
40tui = { path = "../helix-tui", package = "helix-tui", default-features = false, features = ["crossterm"] }
39tui = { path = "../helix-tui", package = "helix-tui", default-features = false, features = ["crossterm"] }
41−crossterm = { version = "0.27", features = ["event-stream"] }
40+crossterm = { version = "0.26", features = ["event-stream"] }
42signal-hook = "0.3"
41signal-hook = "0.3"
43tokio-stream = "0.1"
42tokio-stream = "0.1"
44futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
43futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
@@ -50,17 +49,13 @@ chrono = { version = "0.4", default-features = false, features = ["clock"] }
50log = "0.4"
49log = "0.4"
51
50
52# File picker
51# File picker
53−nucleo.workspace = true
52+fuzzy-matcher = "0.3"
54ignore = "0.4"
53ignore = "0.4"
55# markdown doc rendering
54# markdown doc rendering
56pulldown-cmark = { version = "0.9", default-features = false }
55pulldown-cmark = { version = "0.9", default-features = false }
57# file type detection
56# file type detection
58content_inspector = "0.2.4"
57content_inspector = "0.2.4"
59
58
60−# opening URLs
61−open = "5.0.1"
62−url = "2.5.0"
63−
64# config
59# config
65toml = "0.7"
60toml = "0.7"
66
61
@@ -68,20 +63,17 @@ serde_json = "1.0"
68serde = { version = "1.0", features = ["derive"] }
63serde = { version = "1.0", features = ["derive"] }
69
64
70# ripgrep for global search
65# ripgrep for global search
71−grep-regex = "0.1.12"
66+grep-regex = "0.1.11"
72−grep-searcher = "0.1.13"
67+grep-searcher = "0.1.11"
73
68
74[target.'cfg(not(windows))'.dependencies] # https://github.com/vorner/signal-hook/issues/100
69[target.'cfg(not(windows))'.dependencies] # https://github.com/vorner/signal-hook/issues/100
75signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
70signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
76−libc = "0.2.151"
71+libc = "0.2.146"
77−
78−[target.'cfg(target_os = "macos")'.dependencies]
79−crossterm = { version = "0.27", features = ["event-stream", "use-dev-tty"] }
80
72
81[build-dependencies]
73[build-dependencies]
82−helix-loader = { path = "../helix-loader" }
74+helix-loader = { version = "0.6", path = "../helix-loader" }
83
75
84[dev-dependencies]
76[dev-dependencies]
85−smallvec = "1.11"
77+smallvec = "1.10"
86−indoc = "2.0.4"
78+indoc = "2.0.1"
87−tempfile = "3.8.1"
79+tempfile = "3.6.0"
helix-term/src/application.rs+121−206
@@ -1,16 +1,11 @@
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,
5 diagnostic::{DiagnosticTag, NumberOrString},
4 diagnostic::{DiagnosticTag, NumberOrString},
6 path::get_relative_path,
5 path::get_relative_path,
7 pos_at_coords, syntax, Selection,
6 pos_at_coords, syntax, Selection,
8};
7};
9−use helix_lsp::{
10− lsp::{self, notification::Notification},
11− util::lsp_pos_to_pos,
8+use helix_lsp::{lsp, util::lsp_pos_to_pos, LspProgressMap};
12− LspProgressMap,
13−};
14use helix_view::{
9use helix_view::{
15 align_view,
10 align_view,
16 document::DocumentSavedEventResult,
11 document::DocumentSavedEventResult,
@@ -34,9 +29,13 @@ use crate::{
34};
29};
35
30
36use log::{debug, error, warn};
31use log::{debug, error, warn};
37−#[cfg(not(feature = "integration"))]
38−use std::io::stdout;
32+use std::{
39−use std::{collections::btree_map::Entry, io::stdin, path::Path, sync::Arc};
33+ collections::btree_map::Entry,
34+ io::{stdin, stdout},
35+ path::Path,
36+ sync::Arc,
37+ time::{Duration, Instant},
38+};
40
39
41use anyhow::{Context, Error};
40use anyhow::{Context, Error};
42
41
@@ -46,6 +45,8 @@ use {signal_hook::consts::signal, signal_hook_tokio::Signals};
46#[cfg(windows)]
45#[cfg(windows)]
47type Signals = futures_util::stream::Empty<()>;
46type Signals = futures_util::stream::Empty<()>;
48
47
48+const LSP_DEADLINE: Duration = Duration::from_millis(16);
49+
49#[cfg(not(feature = "integration"))]
50#[cfg(not(feature = "integration"))]
50use tui::backend::CrosstermBackend;
51use tui::backend::CrosstermBackend;
51
52
@@ -75,6 +76,7 @@ pub struct Application {
75 signals: Signals,
76 signals: Signals,
76 jobs: Jobs,
77 jobs: Jobs,
77 lsp_progress: LspProgressMap,
78 lsp_progress: LspProgressMap,
79+ last_render: Instant,
78}
80}
79
81
80#[cfg(feature = "integration")]
82#[cfg(feature = "integration")]
@@ -161,21 +163,17 @@ impl Application {
161 let path = helix_loader::runtime_file(Path::new("tutor"));
163 let path = helix_loader::runtime_file(Path::new("tutor"));
162 editor.open(&path, Action::VerticalSplit)?;
164 editor.open(&path, Action::VerticalSplit)?;
163 // Unset path to prevent accidentally saving to the original tutor file.
165 // Unset path to prevent accidentally saving to the original tutor file.
164− doc_mut!(editor).set_path(None);
166+ doc_mut!(editor).set_path(None)?;
165 } else if !args.files.is_empty() {
167 } else if !args.files.is_empty() {
166− let mut files_it = args.files.into_iter().peekable();
168+ let first = &args.files[0].0; // we know it's not empty
167−
168− // If the first file is a directory, skip it and open a picker
169− if let Some((first, _)) = files_it.next_if(|(p, _)| p.is_dir()) {
169+ if first.is_dir() {
170+ std::env::set_current_dir(first).context("set current dir")?;
171+ editor.new_file(Action::VerticalSplit);
170− let picker = ui::file_picker(first, &config.load().editor);
172+ let picker = ui::file_picker(".".into(), &config.load().editor);
171 compositor.push(Box::new(overlaid(picker)));
173 compositor.push(Box::new(overlaid(picker)));
172− }
174+ } else {
173−
174− // If there are any more files specified, open them
175− if files_it.peek().is_some() {
176− let mut nr_of_files = 0;
175+ let nr_of_files = args.files.len();
177− for (file, pos) in files_it {
176+ for (i, (file, pos)) in args.files.into_iter().enumerate() {
178− nr_of_files += 1;
179 if file.is_dir() {
177 if file.is_dir() {
180 return Err(anyhow::anyhow!(
178 return Err(anyhow::anyhow!(
181 "expected a path to file, found a directory. (to open a directory pass it as first argument)"
179 "expected a path to file, found a directory. (to open a directory pass it as first argument)"
@@ -187,7 +185,7 @@ impl Application {
187 // option. If neither of those two arguments are passed
185 // option. If neither of those two arguments are passed
188 // in, just load the files normally.
186 // in, just load the files normally.
189 let action = match args.split {
187 let action = match args.split {
190− _ if nr_of_files == 1 => Action::VerticalSplit,
188+ _ if i == 0 => Action::VerticalSplit,
191 Some(Layout::Vertical) => Action::VerticalSplit,
189 Some(Layout::Vertical) => Action::VerticalSplit,
192 Some(Layout::Horizontal) => Action::HorizontalSplit,
190 Some(Layout::Horizontal) => Action::HorizontalSplit,
193 None => Action::Load,
191 None => Action::Load,
@@ -214,11 +212,14 @@ impl Application {
214 // does not affect views without pos since it is at the top
212 // does not affect views without pos since it is at the top
215 let (view, doc) = current!(editor);
213 let (view, doc) = current!(editor);
216 align_view(doc, view, Align::Center);
214 align_view(doc, view, Align::Center);
217− } else {
218− editor.new_file(Action::VerticalSplit);
219 }
215 }
220 } else if stdin().is_tty() || cfg!(feature = "integration") {
216 } else if stdin().is_tty() || cfg!(feature = "integration") {
221 editor.new_file(Action::VerticalSplit);
217 editor.new_file(Action::VerticalSplit);
218+ } else if cfg!(target_os = "macos") {
219+ // On Linux and Windows, we allow the output of a command to be piped into the new buffer.
220+ // This doesn't currently work on macOS because of the following issue:
221+ // https://github.com/crossterm-rs/crossterm/issues/500
222+ anyhow::bail!("Piping into helix-term is currently not supported on macOS");
222 } else {
223 } else {
223 editor
224 editor
224 .new_file_from_stdin(Action::VerticalSplit)
225 .new_file_from_stdin(Action::VerticalSplit)
@@ -252,25 +253,29 @@ impl Application {
252 signals,
253 signals,
253 jobs: Jobs::new(),
254 jobs: Jobs::new(),
254 lsp_progress: LspProgressMap::new(),
255 lsp_progress: LspProgressMap::new(),
256+ last_render: Instant::now(),
255 };
257 };
256
258
257 Ok(app)
259 Ok(app)
258 }
260 }
259
261
260 async fn render(&mut self) {
262 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−
266 let mut cx = crate::compositor::Context {
263 let mut cx = crate::compositor::Context {
267 editor: &mut self.editor,
264 editor: &mut self.editor,
268 jobs: &mut self.jobs,
265 jobs: &mut self.jobs,
269 scroll: None,
266 scroll: None,
270 };
267 };
271
268
272− helix_event::start_frame();
269+ // Acquire mutable access to the redraw_handle lock
270+ // to ensure that there are no tasks running that want to block rendering
271+ drop(cx.editor.redraw_handle.1.write().await);
273 cx.editor.needs_redraw = false;
272 cx.editor.needs_redraw = false;
273+ {
274+ // exhaust any leftover redraw notifications
275+ let notify = cx.editor.redraw_handle.0.notified();
276+ tokio::pin!(notify);
277+ notify.enable();
278+ }
274
279
275 let area = self
280 let area = self
276 .terminal
281 .terminal
@@ -292,9 +297,10 @@ impl Application {
292
297
293 pub async fn event_loop<S>(&mut self, input_stream: &mut S)
298 pub async fn event_loop<S>(&mut self, input_stream: &mut S)
294 where
299 where
295− S: Stream<Item = std::io::Result<crossterm::event::Event>> + Unpin,
300+ S: Stream<Item = crossterm::Result<crossterm::event::Event>> + Unpin,
296 {
301 {
297 self.render().await;
302 self.render().await;
303+ self.last_render = Instant::now();
298
304
299 loop {
305 loop {
300 if !self.event_loop_until_idle(input_stream).await {
306 if !self.event_loop_until_idle(input_stream).await {
@@ -305,7 +311,7 @@ impl Application {
305
311
306 pub async fn event_loop_until_idle<S>(&mut self, input_stream: &mut S) -> bool
312 pub async fn event_loop_until_idle<S>(&mut self, input_stream: &mut S) -> bool
307 where
313 where
308− S: Stream<Item = std::io::Result<crossterm::event::Event>> + Unpin,
314+ S: Stream<Item = crossterm::Result<crossterm::event::Event>> + Unpin,
309 {
315 {
310 loop {
316 loop {
311 if self.editor.should_close() {
317 if self.editor.should_close() {
@@ -558,7 +564,16 @@ impl Application {
558 let bytes = doc_save_event.text.len_bytes();
564 let bytes = doc_save_event.text.len_bytes();
559
565
560 if doc.path() != Some(&doc_save_event.path) {
566 if doc.path() != Some(&doc_save_event.path) {
561− doc.set_path(Some(&doc_save_event.path));
567+ if let Err(err) = doc.set_path(Some(&doc_save_event.path)) {
568+ log::error!(
569+ "error setting path for doc '{:?}': {}",
570+ doc.path(),
571+ err.to_string(),
572+ );
573+
574+ self.editor.set_error(err.to_string());
575+ return;
576+ }
562
577
563 let loader = self.editor.syn_loader.clone();
578 let loader = self.editor.syn_loader.clone();
564
579
@@ -594,7 +609,12 @@ impl Application {
594 EditorEvent::LanguageServerMessage((id, call)) => {
609 EditorEvent::LanguageServerMessage((id, call)) => {
595 self.handle_language_server_message(call, id).await;
610 self.handle_language_server_message(call, id).await;
596 // limit render calls for fast language server messages
611 // limit render calls for fast language server messages
597− helix_event::request_redraw();
612+ let last = self.editor.language_servers.incoming.is_empty();
613+
614+ if last || self.last_render.elapsed() > LSP_DEADLINE {
615+ self.render().await;
616+ self.last_render = Instant::now();
617+ }
598 }
618 }
599 EditorEvent::DebuggerEvent(payload) => {
619 EditorEvent::DebuggerEvent(payload) => {
600 let needs_render = self.editor.handle_debugger_message(payload).await;
620 let needs_render = self.editor.handle_debugger_message(payload).await;
@@ -602,9 +622,6 @@ impl Application {
602 self.render().await;
622 self.render().await;
603 }
623 }
604 }
624 }
605− EditorEvent::Redraw => {
606− self.render().await;
607− }
608 EditorEvent::IdleTimer => {
625 EditorEvent::IdleTimer => {
609 self.editor.clear_idle_timer();
626 self.editor.clear_idle_timer();
610 self.handle_idle_timeout().await;
627 self.handle_idle_timeout().await;
@@ -619,7 +636,10 @@ impl Application {
619 false
636 false
620 }
637 }
621
638
622− pub async fn handle_terminal_events(&mut self, event: std::io::Result<CrosstermEvent>) {
639+ pub async fn handle_terminal_events(
640+ &mut self,
641+ event: Result<CrosstermEvent, crossterm::ErrorKind>,
642+ ) {
623 let mut cx = crate::compositor::Context {
643 let mut cx = crate::compositor::Context {
624 editor: &mut self.editor,
644 editor: &mut self.editor,
625 jobs: &mut self.jobs,
645 jobs: &mut self.jobs,
@@ -718,7 +738,7 @@ impl Application {
718 ));
738 ));
719 }
739 }
720 }
740 }
721− Notification::PublishDiagnostics(mut params) => {
741+ Notification::PublishDiagnostics(params) => {
722 let path = match params.uri.to_file_path() {
742 let path = match params.uri.to_file_path() {
723 Ok(path) => path,
743 Ok(path) => path,
724 Err(_) => {
744 Err(_) => {
@@ -726,75 +746,32 @@ impl Application {
726 return;
746 return;
727 }
747 }
728 };
748 };
729− let language_server = language_server!();
749+ let offset_encoding = language_server!().offset_encoding();
730− if !language_server.is_initialized() {
750+ let doc = self.editor.document_by_path_mut(&path).filter(|doc| {
731− log::error!("Discarding publishDiagnostic notification sent by an uninitialized server: {}", language_server.name());
732− return;
733− }
734− let offset_encoding = language_server.offset_encoding();
735− // have to inline the function because of borrow checking...
736− let doc = self.editor.documents.values_mut()
737− .find(|doc| doc.path().map(|p| p == &path).unwrap_or(false))
738− .filter(|doc| {
739− if let Some(version) = params.version {
751+ if let Some(version) = params.version {
740− if version != doc.version() {
752+ if version != doc.version() {
741− log::info!("Version ({version}) is out of date for {path:?} (expected ({}), dropping PublishDiagnostic notification", doc.version());
753+ log::info!("Version ({version}) is out of date for {path:?} (expected ({}), dropping PublishDiagnostic notification", doc.version());
742− return false;
754+ return false;
743− }
744 }
755 }
756+ }
757+
745− true
758+ true
746− });
759+ });
747
760
748 if let Some(doc) = doc {
761 if let Some(doc) = doc {
749− let lang_conf = doc.language.clone();
762+ let lang_conf = doc.language_config();
750− let text = doc.text().clone();
763+ let text = doc.text();
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− }
782
764
783− let unchaged_diag_sources = &unchaged_diag_sources_;
765+ let diagnostics = params
784− let diagnostics =
766+ .diagnostics
767+ .iter()
785− params.diagnostics.iter().filter_map(move |diagnostic| {
768+ .filter_map(|diagnostic| {
786 use helix_core::diagnostic::{Diagnostic, Range, Severity::*};
769 use helix_core::diagnostic::{Diagnostic, Range, Severity::*};
787 use lsp::DiagnosticSeverity;
770 use lsp::DiagnosticSeverity;
788
771
789− if diagnostic.source.as_ref().map_or(false, |source| {
790− unchaged_diag_sources.contains(source)
791− }) {
792− return None;
793− }
794−
795 // TODO: convert inside server
772 // TODO: convert inside server
796 let start = if let Some(start) = lsp_pos_to_pos(
773 let start = if let Some(start) = lsp_pos_to_pos(
797− &text,
774+ text,
798 diagnostic.range.start,
775 diagnostic.range.start,
799 offset_encoding,
776 offset_encoding,
800 ) {
777 ) {
@@ -805,13 +782,14 @@ impl Application {
805 };
782 };
806
783
807 let end = if let Some(end) =
784 let end = if let Some(end) =
808− lsp_pos_to_pos(&text, diagnostic.range.end, offset_encoding)
785+ lsp_pos_to_pos(text, diagnostic.range.end, offset_encoding)
809 {
786 {
810 end
787 end
811 } else {
788 } else {
812 log::warn!("lsp position out of bounds - {:?}", diagnostic);
789 log::warn!("lsp position out of bounds - {:?}", diagnostic);
813 return None;
790 return None;
814 };
791 };
792+
815 let severity =
793 let severity =
816 diagnostic.severity.map(|severity| match severity {
794 diagnostic.severity.map(|severity| match severity {
817 DiagnosticSeverity::ERROR => Error,
795 DiagnosticSeverity::ERROR => Error,
@@ -824,7 +802,7 @@ impl Application {
824 ),
802 ),
825 });
803 });
826
804
827− if let Some(lang_conf) = &lang_conf {
805+ if let Some(lang_conf) = lang_conf {
828 if let Some(severity) = severity {
806 if let Some(severity) = severity {
829 if severity < lang_conf.diagnostic_severity {
807 if severity < lang_conf.diagnostic_severity {
830 return None;
808 return None;
@@ -863,17 +841,8 @@ impl Application {
863 Vec::new()
841 Vec::new()
864 };
842 };
865
843
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−
872 Some(Diagnostic {
844 Some(Diagnostic {
873 range: Range { start, end },
845 range: Range { start, end },
874− ends_at_word,
875− starts_at_word,
876− zero_width: start == end,
877 line: diagnostic.range.start.line as usize,
846 line: diagnostic.range.start.line as usize,
878 message: diagnostic.message.clone(),
847 message: diagnostic.message.clone(),
879 severity,
848 severity,
@@ -883,33 +852,38 @@ impl Application {
883 data: diagnostic.data.clone(),
852 data: diagnostic.data.clone(),
884 language_server_id: server_id,
853 language_server_id: server_id,
885 })
854 })
886− });
855+ })
856+ .collect();
887
857
888− doc.replace_diagnostics(diagnostics, unchaged_diag_sources, server_id);
858+ doc.replace_diagnostics(diagnostics, server_id);
889 }
859 }
890
860
891− let diagnostics = params.diagnostics.into_iter().map(|d| (d, server_id));
861+ let mut diagnostics = params
862+ .diagnostics
863+ .into_iter()
864+ .map(|d| (d, server_id))
865+ .collect();
892
866
893 // Insert the original lsp::Diagnostics here because we may have no open document
867 // Insert the original lsp::Diagnostics here because we may have no open document
894 // for diagnosic message and so we can't calculate the exact position.
868 // for diagnosic message and so we can't calculate the exact position.
895 // When using them later in the diagnostics picker, we calculate them on-demand.
869 // When using them later in the diagnostics picker, we calculate them on-demand.
896− let diagnostics = match self.editor.diagnostics.entry(params.uri) {
870+ match self.editor.diagnostics.entry(params.uri) {
897 Entry::Occupied(o) => {
871 Entry::Occupied(o) => {
898 let current_diagnostics = o.into_mut();
872 let current_diagnostics = o.into_mut();
899 // there may entries of other language servers, which is why we can't overwrite the whole entry
873 // there may entries of other language servers, which is why we can't overwrite the whole entry
900 current_diagnostics.retain(|(_, lsp_id)| *lsp_id != server_id);
874 current_diagnostics.retain(|(_, lsp_id)| *lsp_id != server_id);
901− current_diagnostics.extend(diagnostics);
875+ current_diagnostics.append(&mut diagnostics);
902− current_diagnostics
903 // Sort diagnostics first by severity and then by line numbers.
876 // Sort diagnostics first by severity and then by line numbers.
877+ // Note: The `lsp::DiagnosticSeverity` enum is already defined in decreasing order
878+ current_diagnostics
879+ .sort_unstable_by_key(|(d, _)| (d.severity, d.range.start));
880+ }
881+ Entry::Vacant(v) => {
882+ diagnostics
883+ .sort_unstable_by_key(|(d, _)| (d.severity, d.range.start));
884+ v.insert(diagnostics);
904 }
885 }
905− Entry::Vacant(v) => v.insert(diagnostics.collect()),
906 };
886 };
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− });
913 }
887 }
914 Notification::ShowMessage(params) => {
888 Notification::ShowMessage(params) => {
915 log::warn!("unhandled window/showMessage: {:?}", params);
889 log::warn!("unhandled window/showMessage: {:?}", params);
@@ -1068,31 +1042,20 @@ impl Application {
1068 Ok(serde_json::Value::Null)
1042 Ok(serde_json::Value::Null)
1069 }
1043 }
1070 Ok(MethodCall::ApplyWorkspaceEdit(params)) => {
1044 Ok(MethodCall::ApplyWorkspaceEdit(params)) => {
1071− let language_server = language_server!();
1072− if language_server.is_initialized() {
1073− let offset_encoding = language_server.offset_encoding();
1074− let res = apply_workspace_edit(
1045+ let res = apply_workspace_edit(
1075− &mut self.editor,
1046+ &mut self.editor,
1076− offset_encoding,
1047+ helix_lsp::OffsetEncoding::Utf8,
1077− &params.edit,
1048+ &params.edit,
1078− );
1049+ );
1079−
1050+
1080− Ok(json!(lsp::ApplyWorkspaceEditResponse {
1051+ Ok(json!(lsp::ApplyWorkspaceEditResponse {
1081− applied: res.is_ok(),
1052+ applied: res.is_ok(),
1082− failure_reason: res.as_ref().err().map(|err| err.kind.to_string()),
1053+ failure_reason: res.as_ref().err().map(|err| err.kind.to_string()),
1083− failed_change: res
1054+ failed_change: res
1084− .as_ref()
1055+ .as_ref()
1085− .err()
1056+ .err()
1086− .map(|err| err.failed_change_idx as u32),
1057+ .map(|err| err.failed_change_idx as u32),
1087− }))
1088− } else {
1089− Err(helix_lsp::jsonrpc::Error {
1090− code: helix_lsp::jsonrpc::ErrorCode::InvalidRequest,
1091− message: "Server must be initialized to request workspace edits"
1092− .to_string(),
1093− data: None,
1094− })
1058+ }))
1095− }
1096 }
1059 }
1097 Ok(MethodCall::WorkspaceFolders) => {
1060 Ok(MethodCall::WorkspaceFolders) => {
1098 Ok(json!(&*language_server!().workspace_folders().await))
1061 Ok(json!(&*language_server!().workspace_folders().await))
@@ -1117,65 +1080,17 @@ impl Application {
1117 .collect();
1080 .collect();
1118 Ok(json!(result))
1081 Ok(json!(result))
1119 }
1082 }
1120− Ok(MethodCall::RegisterCapability(params)) => {
1083+ Ok(MethodCall::RegisterCapability(_params)) => {
1121− if let Some(client) = self
1084+ log::warn!("Ignoring a client/registerCapability request because dynamic capability registration is not enabled. Please report this upstream to the language server");
1122− .editor
1123− .language_servers
1124− .iter_clients()
1125− .find(|client| client.id() == server_id)
1126− {
1127− for reg in params.registrations {
1128− match reg.method.as_str() {
1129− lsp::notification::DidChangeWatchedFiles::METHOD => {
1130− let Some(options) = reg.register_options else {
1131− continue;
1132− };
1133− let ops: lsp::DidChangeWatchedFilesRegistrationOptions =
1134− match serde_json::from_value(options) {
1135− Ok(ops) => ops,
1136− Err(err) => {
1137− log::warn!("Failed to deserialize DidChangeWatchedFilesRegistrationOptions: {err}");
1138− continue;
1139− }
1140− };
1141− self.editor.language_servers.file_event_handler.register(
1142− client.id(),
1143− Arc::downgrade(client),
1144− reg.id,
1145− ops,
1146− )
1147− }
1148− _ => {
1149− // Language Servers based on the `vscode-languageserver-node` library often send
1085+ // Language Servers based on the `vscode-languageserver-node` library often send
1150− // client/registerCapability even though we do not enable dynamic registration
1086+ // client/registerCapability even though we do not enable dynamic registration
1151− // for most capabilities. We should send a MethodNotFound JSONRPC error in this
1087+ // for any capabilities. We should send a MethodNotFound JSONRPC error in this
1152− // case but that rejects the registration promise in the server which causes an
1088+ // case but that rejects the registration promise in the server which causes an
1153− // exit. So we work around this by ignoring the request and sending back an OK
1089+ // exit. So we work around this by ignoring the request and sending back an OK
1154− // response.
1090+ // response.
1155− log::warn!("Ignoring a client/registerCapability request because dynamic capability registration is not enabled. Please report this upstream to the language server");
1156− }
1157− }
1158− }
1159− }
1160
1091
1161 Ok(serde_json::Value::Null)
1092 Ok(serde_json::Value::Null)
1162 }
1093 }
1163− Ok(MethodCall::UnregisterCapability(params)) => {
1164− for unreg in params.unregisterations {
1165− match unreg.method.as_str() {
1166− lsp::notification::DidChangeWatchedFiles::METHOD => {
1167− self.editor
1168− .language_servers
1169− .file_event_handler
1170− .unregister(server_id, unreg.id);
1171− }
1172− _ => {
1173− log::warn!("Received unregistration request for unsupported method: {}", unreg.method);
1174− }
1175− }
1176− }
1177− Ok(serde_json::Value::Null)
1178− }
1179 };
1094 };
1180
1095
1181 tokio::spawn(language_server!().reply(id, reply));
1096 tokio::spawn(language_server!().reply(id, reply));
@@ -1201,7 +1116,7 @@ impl Application {
1201
1116
1202 pub async fn run<S>(&mut self, input_stream: &mut S) -> Result<i32, Error>
1117 pub async fn run<S>(&mut self, input_stream: &mut S) -> Result<i32, Error>
1203 where
1118 where
1204− S: Stream<Item = std::io::Result<crossterm::event::Event>> + Unpin,
1119+ S: Stream<Item = crossterm::Result<crossterm::event::Event>> + Unpin,
1205 {
1120 {
1206 self.claim_term().await?;
1121 self.claim_term().await?;
1207
1122
helix-term/src/args.rs−29
@@ -17,14 +17,12 @@ 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>,
21}
20}
22
21
23impl Args {
22impl Args {
24 pub fn parse_args() -> Result<Args> {
23 pub fn parse_args() -> Result<Args> {
25 let mut args = Args::default();
24 let mut args = Args::default();
26 let mut argv = std::env::args().peekable();
25 let mut argv = std::env::args().peekable();
27− let mut line_number = 0;
28
26
29 argv.next(); // skip the program, we don't care about that
27 argv.next(); // skip the program, we don't care about that
30
28
@@ -61,20 +59,6 @@ impl Args {
61 Some(path) => args.log_file = Some(path.into()),
59 Some(path) => args.log_file = Some(path.into()),
62 None => anyhow::bail!("--log must specify a path to write"),
60 None => anyhow::bail!("--log must specify a path to write"),
63 },
61 },
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− },
78 arg if arg.starts_with("--") => {
62 arg if arg.starts_with("--") => {
79 anyhow::bail!("unexpected double dash argument: {}", arg)
63 anyhow::bail!("unexpected double dash argument: {}", arg)
80 }
64 }
@@ -89,13 +73,6 @@ impl Args {
89 }
73 }
90 }
74 }
91 }
75 }
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− }
99 arg => args.files.push(parse_file(arg)),
76 arg => args.files.push(parse_file(arg)),
100 }
77 }
101 }
78 }
@@ -105,12 +82,6 @@ impl Args {
105 args.files.push(parse_file(&arg));
82 args.files.push(parse_file(&arg));
106 }
83 }
107
84
108− if let Some(file) = args.files.first_mut() {
109− if line_number != 0 {
110− file.1.row = line_number;
111− }
112− }
113−
114 Ok(args)
85 Ok(args)
115 }
86 }
116}
87}
helix-term/src/commands.rs+396−647
@@ -29,11 +29,12 @@ use helix_core::{
29 tree_sitter::Node,
29 tree_sitter::Node,
30 unicode::width::UnicodeWidthChar,
30 unicode::width::UnicodeWidthChar,
31 visual_offset_from_block, Deletion, LineEnding, Position, Range, Rope, RopeGraphemes,
31 visual_offset_from_block, Deletion, LineEnding, Position, Range, Rope, RopeGraphemes,
32− RopeReader, RopeSlice, Selection, SmallVec, Tendril, Transaction,
32+ RopeSlice, Selection, SmallVec, Tendril, Transaction,
33};
33};
34use helix_view::{
34use helix_view::{
35+ clipboard::ClipboardType,
35 document::{FormatterError, Mode, SCRATCH_BUFFER_NAME},
36 document::{FormatterError, Mode, SCRATCH_BUFFER_NAME},
36− editor::{Action, CompleteAction},
37+ editor::{Action, CompleteAction, Motion},
37 info::Info,
38 info::Info,
38 input::KeyEvent,
39 input::KeyEvent,
39 keyboard::KeyCode,
40 keyboard::KeyCode,
@@ -43,6 +44,7 @@ use helix_view::{
43};
44};
44
45
45use anyhow::{anyhow, bail, ensure, Context as _};
46use anyhow::{anyhow, bail, ensure, Context as _};
47+use fuzzy_matcher::FuzzyMatcher;
46use insert::*;
48use insert::*;
47use movement::Movement;
49use movement::Movement;
48
50
@@ -59,14 +61,9 @@ use crate::{
59};
61};
60
62
61use crate::job::{self, Jobs};
63use crate::job::{self, Jobs};
62−use futures_util::{stream::FuturesUnordered, TryStreamExt};
64+use futures_util::{stream::FuturesUnordered, StreamExt, TryStreamExt};
63−use std::{
64− collections::{HashMap, HashSet},
65+use std::{collections::HashMap, fmt, future::Future};
65− fmt,
66− future::Future,
67− io::Read,
68− num::NonZeroUsize,
66+use std::{collections::HashSet, num::NonZeroUsize};
69−};
70
67
71use std::{
68use std::{
72 borrow::Cow,
69 borrow::Cow,
@@ -75,11 +72,11 @@ use std::{
75
72
76use once_cell::sync::Lazy;
73use once_cell::sync::Lazy;
77use serde::de::{self, Deserialize, Deserializer};
74use serde::de::{self, Deserialize, Deserializer};
78−use url::Url;
79
75
80use grep_regex::RegexMatcherBuilder;
76use grep_regex::RegexMatcherBuilder;
81use grep_searcher::{sinks, BinaryDetection, SearcherBuilder};
77use grep_searcher::{sinks, BinaryDetection, SearcherBuilder};
82use ignore::{DirEntry, WalkBuilder, WalkState};
78use ignore::{DirEntry, WalkBuilder, WalkState};
79+use tokio_stream::wrappers::UnboundedReceiverStream;
83
80
84pub type OnKeyCallback = Box<dyn FnOnce(&mut Context, KeyEvent)>;
81pub type OnKeyCallback = Box<dyn FnOnce(&mut Context, KeyEvent)>;
85
82
@@ -251,8 +248,6 @@ impl MappableCommand {
251 move_prev_long_word_start, "Move to start of previous long word",
248 move_prev_long_word_start, "Move to start of previous long word",
252 move_next_long_word_end, "Move to end of next long word",
249 move_next_long_word_end, "Move to end of next long word",
253 move_prev_long_word_end, "Move to end of previous long word",
250 move_prev_long_word_end, "Move to end of previous long word",
254− move_parent_node_end, "Move to end of the parent node",
255− move_parent_node_start, "Move to beginning of the parent node",
256 extend_next_word_start, "Extend to start of next word",
251 extend_next_word_start, "Extend to start of next word",
257 extend_prev_word_start, "Extend to start of previous word",
252 extend_prev_word_start, "Extend to start of previous word",
258 extend_next_word_end, "Extend to end of next word",
253 extend_next_word_end, "Extend to end of next word",
@@ -261,8 +256,6 @@ impl MappableCommand {
261 extend_prev_long_word_start, "Extend to start of previous long word",
256 extend_prev_long_word_start, "Extend to start of previous long word",
262 extend_next_long_word_end, "Extend to end of next long word",
257 extend_next_long_word_end, "Extend to end of next long word",
263 extend_prev_long_word_end, "Extend to end of prev long word",
258 extend_prev_long_word_end, "Extend to end of prev long word",
264− extend_parent_node_end, "Extend to end of the parent node",
265− extend_parent_node_start, "Extend to beginning of the parent node",
266 find_till_char, "Move till next occurrence of char",
259 find_till_char, "Move till next occurrence of char",
267 find_next_char, "Move to next occurrence of char",
260 find_next_char, "Move to next occurrence of char",
268 extend_till_char, "Extend till next occurrence of char",
261 extend_till_char, "Extend till next occurrence of char",
@@ -337,7 +330,7 @@ impl MappableCommand {
337 goto_implementation, "Goto implementation",
330 goto_implementation, "Goto implementation",
338 goto_file_start, "Goto line number <n> else file start",
331 goto_file_start, "Goto line number <n> else file start",
339 goto_file_end, "Goto file end",
332 goto_file_end, "Goto file end",
340− goto_file, "Goto files/URLs in selection",
333+ goto_file, "Goto files in selection",
341 goto_file_hsplit, "Goto files in selection (hsplit)",
334 goto_file_hsplit, "Goto files in selection (hsplit)",
342 goto_file_vsplit, "Goto files in selection (vsplit)",
335 goto_file_vsplit, "Goto files in selection (vsplit)",
343 goto_reference, "Goto references",
336 goto_reference, "Goto references",
@@ -369,7 +362,6 @@ impl MappableCommand {
369 extend_to_line_end, "Extend to line end",
362 extend_to_line_end, "Extend to line end",
370 extend_to_line_end_newline, "Extend to line end",
363 extend_to_line_end_newline, "Extend to line end",
371 signature_help, "Show signature help",
364 signature_help, "Show signature help",
372− smart_tab, "Insert tab if all cursors have all whitespace to their left; otherwise, run a separate command.",
373 insert_tab, "Insert tab char",
365 insert_tab, "Insert tab char",
374 insert_newline, "Insert newline char",
366 insert_newline, "Insert newline char",
375 delete_char_backward, "Delete previous char",
367 delete_char_backward, "Delete previous char",
@@ -384,8 +376,6 @@ impl MappableCommand {
384 later, "Move forward in history",
376 later, "Move forward in history",
385 commit_undo_checkpoint, "Commit changes to new checkpoint",
377 commit_undo_checkpoint, "Commit changes to new checkpoint",
386 yank, "Yank selection",
378 yank, "Yank selection",
387− yank_to_clipboard, "Yank selections to clipboard",
388− yank_to_primary_clipboard, "Yank selections to primary clipboard",
389 yank_joined, "Join and yank selections",
379 yank_joined, "Join and yank selections",
390 yank_joined_to_clipboard, "Join and yank selections to clipboard",
380 yank_joined_to_clipboard, "Join and yank selections to clipboard",
391 yank_main_selection_to_clipboard, "Yank main selection to clipboard",
381 yank_main_selection_to_clipboard, "Yank main selection to clipboard",
@@ -990,7 +980,6 @@ fn align_selections(cx: &mut Context) {
990
980
991 let transaction = Transaction::change(doc.text(), changes.into_iter());
981 let transaction = Transaction::change(doc.text(), changes.into_iter());
992 doc.apply(&transaction, view.id);
982 doc.apply(&transaction, view.id);
993− exit_select_mode(cx);
994}
983}
995
984
996fn goto_window(cx: &mut Context, align: Align) {
985fn goto_window(cx: &mut Context, align: Align) {
@@ -1110,7 +1099,8 @@ where
1110 .transform(|range| move_fn(text, range, count, behavior));
1099 .transform(|range| move_fn(text, range, count, behavior));
1111 doc.set_selection(view.id, selection);
1100 doc.set_selection(view.id, selection);
1112 };
1101 };
1102+ motion(cx.editor);
1113− cx.editor.apply_motion(motion)
1103+ cx.editor.last_motion = Some(Motion(Box::new(motion)));
1114}
1104}
1115
1105
1116fn goto_prev_paragraph(cx: &mut Context) {
1106fn goto_prev_paragraph(cx: &mut Context) {
@@ -1165,10 +1155,6 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
1165 let (view, doc) = current_ref!(cx.editor);
1155 let (view, doc) = current_ref!(cx.editor);
1166 let text = doc.text();
1156 let text = doc.text();
1167 let selections = doc.selection(view.id);
1157 let selections = doc.selection(view.id);
1168− let rel_path = doc
1169− .relative_path()
1170− .map(|path| path.parent().unwrap().to_path_buf())
1171− .unwrap_or_default();
1172 let mut paths: Vec<_> = selections
1158 let mut paths: Vec<_> = selections
1173 .iter()
1159 .iter()
1174 .map(|r| text.slice(r.from()..r.to()).to_string())
1160 .map(|r| text.slice(r.from()..r.to()).to_string())
@@ -1196,80 +1182,16 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
1196 .to_string(),
1182 .to_string(),
1197 );
1183 );
1198 }
1184 }
1199−
1200 for sel in paths {
1185 for sel in paths {
1201 let p = sel.trim();
1186 let p = sel.trim();
1202− if p.is_empty() {
1187+ if !p.is_empty() {
1203− continue;
1204− }
1205−
1206− if let Ok(url) = Url::parse(p) {
1207− return open_url(cx, url, action);
1208− }
1209−
1210− let path = &rel_path.join(p);
1211− if path.is_dir() {
1212− let picker = ui::file_picker(path.into(), &cx.editor.config());
1213− cx.push_layer(Box::new(overlaid(picker)));
1214− } else if let Err(e) = cx.editor.open(path, action) {
1188+ if let Err(e) = cx.editor.open(&PathBuf::from(p), action) {
1215− cx.editor.set_error(format!("Open file failed: {:?}", e));
1216− }
1217− }
1218−}
1219−
1220−/// Opens the given url. If the URL points to a valid textual file it is open in helix.
1221−// Otherwise, the file is open using external program.
1222−fn open_url(cx: &mut Context, url: Url, action: Action) {
1223− let doc = doc!(cx.editor);
1224− let rel_path = doc
1225− .relative_path()
1226− .map(|path| path.parent().unwrap().to_path_buf())
1227− .unwrap_or_default();
1228−
1229− if url.scheme() != "file" {
1230− return open_external_url(cx, url);
1231− }
1232−
1233− let content_type = std::fs::File::open(url.path()).and_then(|file| {
1234− // Read up to 1kb to detect the content type
1235− let mut read_buffer = Vec::new();
1236− let n = file.take(1024).read_to_end(&mut read_buffer)?;
1237− Ok(content_inspector::inspect(&read_buffer[..n]))
1238− });
1239−
1240− // we attempt to open binary files - files that can't be open in helix - using external
1241− // program as well, e.g. pdf files or images
1242− match content_type {
1243− Ok(content_inspector::ContentType::BINARY) => open_external_url(cx, url),
1244− Ok(_) | Err(_) => {
1245− let path = &rel_path.join(url.path());
1246− if path.is_dir() {
1247− let picker = ui::file_picker(path.into(), &cx.editor.config());
1248− cx.push_layer(Box::new(overlaid(picker)));
1249− } else if let Err(e) = cx.editor.open(path, action) {
1250 cx.editor.set_error(format!("Open file failed: {:?}", e));
1189 cx.editor.set_error(format!("Open file failed: {:?}", e));
1251 }
1190 }
1252 }
1191 }
1253 }
1192 }
1254}
1193}
1255
1194
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−
1273fn extend_word_impl<F>(cx: &mut Context, extend_fn: F)
1195fn extend_word_impl<F>(cx: &mut Context, extend_fn: F)
1274where
1196where
1275 F: Fn(RopeSlice, Range, usize) -> Range,
1197 F: Fn(RopeSlice, Range, usize) -> Range,
@@ -1318,66 +1240,10 @@ fn extend_next_long_word_end(cx: &mut Context) {
1318 extend_word_impl(cx, movement::move_next_long_word_end)
1240 extend_word_impl(cx, movement::move_next_long_word_end)
1319}
1241}
1320
1242
1321−/// Separate branch to find_char designed only for `<ret>` char.
1243+fn will_find_char<F>(cx: &mut Context, search_fn: F, inclusive: bool, extend: bool)
1322−//
1244+where
1323−// This is necessary because the one document can have different line endings inside. And we
1245+ F: Fn(RopeSlice, char, usize, usize, bool) -> Option<usize> + 'static,
1324−// cannot predict what character to find when <ret> is pressed. On the current line it can be `lf`
1246+{
1325−// but on the next line it can be `crlf`. That's why [`find_char_impl`] cannot be applied here.
1326−fn find_char_line_ending(
1327− cx: &mut Context,
1328− count: usize,
1329− direction: Direction,
1330− inclusive: bool,
1331− extend: bool,
1332−) {
1333− let (view, doc) = current!(cx.editor);
1334− let text = doc.text().slice(..);
1335−
1336− let selection = doc.selection(view.id).clone().transform(|range| {
1337− let cursor = range.cursor(text);
1338− let cursor_line = range.cursor_line(text);
1339−
1340− // Finding the line where we're going to find <ret>. Depends mostly on
1341− // `count`, but also takes into account edge cases where we're already at the end
1342− // of a line or the beginning of a line
1343− let find_on_line = match direction {
1344− Direction::Forward => {
1345− let on_edge = line_end_char_index(&text, cursor_line) == cursor;
1346− let line = cursor_line + count - 1 + (on_edge as usize);
1347− if line >= text.len_lines() - 1 {
1348− return range;
1349− } else {
1350− line
1351− }
1352− }
1353− Direction::Backward => {
1354− let on_edge = text.line_to_char(cursor_line) == cursor && !inclusive;
1355− let line = cursor_line as isize - (count as isize - 1 + on_edge as isize);
1356− if line <= 0 {
1357− return range;
1358− } else {
1359− line as usize
1360− }
1361− }
1362− };
1363−
1364− let pos = match (direction, inclusive) {
1365− (Direction::Forward, true) => line_end_char_index(&text, find_on_line),
1366− (Direction::Forward, false) => line_end_char_index(&text, find_on_line) - 1,
1367− (Direction::Backward, true) => line_end_char_index(&text, find_on_line - 1),
1368− (Direction::Backward, false) => text.line_to_char(find_on_line),
1369− };
1370−
1371− if extend {
1372− range.put_cursor(text, pos, true)
1373− } else {
1374− Range::point(range.cursor(text)).put_cursor(text, pos, true)
1375− }
1376− });
1377− doc.set_selection(view.id, selection);
1378−}
1379−
1380−fn find_char(cx: &mut Context, direction: Direction, inclusive: bool, extend: bool) {
1381 // TODO: count is reset to 1 before next key so we move it into the closure here.
1247 // TODO: count is reset to 1 before next key so we move it into the closure here.
1382 // Would be nice to carry over.
1248 // Would be nice to carry over.
1383 let count = cx.count();
1249 let count = cx.count();
@@ -1390,9 +1256,13 @@ fn find_char(cx: &mut Context, direction: Direction, inclusive: bool, extend: bo
1390 KeyEvent {
1256 KeyEvent {
1391 code: KeyCode::Enter,
1257 code: KeyCode::Enter,
1392 ..
1258 ..
1393− } => {
1259+ } =>
1394− find_char_line_ending(cx, count, direction, inclusive, extend);
1260+ // TODO: this isn't quite correct when CRLF is involved.
1395− return;
1261+ // This hack will work in most cases, since documents don't
1262+ // usually mix line endings. But we should fix it eventually
1263+ // anyway.
1264+ {
1265+ doc!(cx.editor).line_ending.as_str().chars().next().unwrap()
1396 }
1266 }
1397
1267
1398 KeyEvent {
1268 KeyEvent {
@@ -1405,18 +1275,11 @@ fn find_char(cx: &mut Context, direction: Direction, inclusive: bool, extend: bo
1405 } => ch,
1275 } => ch,
1406 _ => return,
1276 _ => return,
1407 };
1277 };
1408− let motion = move |editor: &mut Editor| {
1409− match direction {
1410− Direction::Forward => {
1411− find_char_impl(editor, &find_next_char_impl, inclusive, extend, ch, count)
1412− }
1413− Direction::Backward => {
1414− find_char_impl(editor, &find_prev_char_impl, inclusive, extend, ch, count)
1415− }
1416− };
1417− };
1418
1278
1419− cx.editor.apply_motion(motion);
1279+ find_char_impl(cx.editor, &search_fn, inclusive, extend, ch, count);
1280+ cx.editor.last_motion = Some(Motion(Box::new(move |editor: &mut Editor| {
1281+ find_char_impl(editor, &search_fn, inclusive, extend, ch, 1);
1282+ })));
1420 })
1283 })
1421}
1284}
1422
1285
@@ -1495,39 +1358,46 @@ fn find_prev_char_impl(
1495}
1358}
1496
1359
1497fn find_till_char(cx: &mut Context) {
1360fn find_till_char(cx: &mut Context) {
1498− find_char(cx, Direction::Forward, false, false);
1361+ will_find_char(cx, find_next_char_impl, false, false)
1499}
1362}
1500
1363
1501fn find_next_char(cx: &mut Context) {
1364fn find_next_char(cx: &mut Context) {
1502− find_char(cx, Direction::Forward, true, false)
1365+ will_find_char(cx, find_next_char_impl, true, false)
1503}
1366}
1504
1367
1505fn extend_till_char(cx: &mut Context) {
1368fn extend_till_char(cx: &mut Context) {
1506− find_char(cx, Direction::Forward, false, true)
1369+ will_find_char(cx, find_next_char_impl, false, true)
1507}
1370}
1508
1371
1509fn extend_next_char(cx: &mut Context) {
1372fn extend_next_char(cx: &mut Context) {
1510− find_char(cx, Direction::Forward, true, true)
1373+ will_find_char(cx, find_next_char_impl, true, true)
1511}
1374}
1512
1375
1513fn till_prev_char(cx: &mut Context) {
1376fn till_prev_char(cx: &mut Context) {
1514− find_char(cx, Direction::Backward, false, false)
1377+ will_find_char(cx, find_prev_char_impl, false, false)
1515}
1378}
1516
1379
1517fn find_prev_char(cx: &mut Context) {
1380fn find_prev_char(cx: &mut Context) {
1518− find_char(cx, Direction::Backward, true, false)
1381+ will_find_char(cx, find_prev_char_impl, true, false)
1519}
1382}
1520
1383
1521fn extend_till_prev_char(cx: &mut Context) {
1384fn extend_till_prev_char(cx: &mut Context) {
1522− find_char(cx, Direction::Backward, false, true)
1385+ will_find_char(cx, find_prev_char_impl, false, true)
1523}
1386}
1524
1387
1525fn extend_prev_char(cx: &mut Context) {
1388fn extend_prev_char(cx: &mut Context) {
1526− find_char(cx, Direction::Backward, true, true)
1389+ will_find_char(cx, find_prev_char_impl, true, true)
1527}
1390}
1528
1391
1529fn repeat_last_motion(cx: &mut Context) {
1392fn repeat_last_motion(cx: &mut Context) {
1530− cx.editor.repeat_last_motion(cx.count())
1393+ let count = cx.count();
1394+ let last_motion = cx.editor.last_motion.take();
1395+ if let Some(m) = &last_motion {
1396+ for _ in 0..count {
1397+ m.run(cx.editor);
1398+ }
1399+ cx.editor.last_motion = last_motion;
1400+ }
1531}
1401}
1532
1402
1533fn replace(cx: &mut Context) {
1403fn replace(cx: &mut Context) {
@@ -1594,7 +1464,6 @@ where
1594 });
1464 });
1595
1465
1596 doc.apply(&transaction, view.id);
1466 doc.apply(&transaction, view.id);
1597− exit_select_mode(cx);
1598}
1467}
1599
1468
1600fn switch_case(cx: &mut Context) {
1469fn switch_case(cx: &mut Context) {
@@ -1836,8 +1705,8 @@ fn select_regex(cx: &mut Context) {
1836 "select:".into(),
1705 "select:".into(),
1837 Some(reg),
1706 Some(reg),
1838 ui::completers::none,
1707 ui::completers::none,
1839− move |cx, regex, event| {
1708+ move |editor, regex, event| {
1840− let (view, doc) = current!(cx.editor);
1709+ let (view, doc) = current!(editor);
1841 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
1710 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
1842 return;
1711 return;
1843 }
1712 }
@@ -1858,8 +1727,8 @@ fn split_selection(cx: &mut Context) {
1858 "split:".into(),
1727 "split:".into(),
1859 Some(reg),
1728 Some(reg),
1860 ui::completers::none,
1729 ui::completers::none,
1861− move |cx, regex, event| {
1730+ move |editor, regex, event| {
1862− let (view, doc) = current!(cx.editor);
1731+ let (view, doc) = current!(editor);
1863 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
1732 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
1864 return;
1733 return;
1865 }
1734 }
@@ -1982,11 +1851,11 @@ fn search_impl(
1982
1851
1983fn search_completions(cx: &mut Context, reg: Option<char>) -> Vec<String> {
1852fn search_completions(cx: &mut Context, reg: Option<char>) -> Vec<String> {
1984 let mut items = reg
1853 let mut items = reg
1985− .and_then(|reg| cx.editor.registers.read(reg, cx.editor))
1854+ .and_then(|reg| cx.editor.registers.get(reg))
1986− .map_or(Vec::new(), |reg| reg.take(200).collect());
1855+ .map_or(Vec::new(), |reg| reg.read().iter().take(200).collect());
1987 items.sort_unstable();
1856 items.sort_unstable();
1988 items.dedup();
1857 items.dedup();
1989− items.into_iter().map(|value| value.to_string()).collect()
1858+ items.into_iter().cloned().collect()
1990}
1859}
1991
1860
1992fn search(cx: &mut Context) {
1861fn search(cx: &mut Context) {
@@ -2023,14 +1892,12 @@ fn searcher(cx: &mut Context, direction: Direction) {
2023 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
1892 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
2024 .collect()
1893 .collect()
2025 },
1894 },
2026− move |cx, regex, event| {
1895+ move |editor, regex, event| {
2027− if event == PromptEvent::Validate {
1896+ if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
2028− cx.editor.registers.last_search_register = reg;
2029− } else if event != PromptEvent::Update {
2030 return;
1897 return;
2031 }
1898 }
2032 search_impl(
1899 search_impl(
2033− cx.editor,
1900+ editor,
2034 &contents,
1901 &contents,
2035 &regex,
1902 &regex,
2036 Movement::Move,
1903 Movement::Move,
@@ -2045,13 +1912,11 @@ fn searcher(cx: &mut Context, direction: Direction) {
2045
1912
2046fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Direction) {
1913fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Direction) {
2047 let count = cx.count();
1914 let count = cx.count();
2048− let register = cx
2049− .register
2050− .unwrap_or(cx.editor.registers.last_search_register);
2051 let config = cx.editor.config();
1915 let config = cx.editor.config();
2052 let scrolloff = config.scrolloff;
1916 let scrolloff = config.scrolloff;
2053− if let Some(query) = cx.editor.registers.first(register, cx.editor) {
1917+ let (_, doc) = current!(cx.editor);
2054− let doc = doc!(cx.editor);
1918+ let registers = &cx.editor.registers;
1919+ if let Some(query) = registers.read('/').and_then(|query| query.last()) {
2055 let contents = doc.text().slice(..).to_string();
1920 let contents = doc.text().slice(..).to_string();
2056 let search_config = &config.search;
1921 let search_config = &config.search;
2057 let case_insensitive = if search_config.smart_case {
1922 let case_insensitive = if search_config.smart_case {
@@ -2060,7 +1925,7 @@ fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Dir
2060 false
1925 false
2061 };
1926 };
2062 let wrap_around = search_config.wrap_around;
1927 let wrap_around = search_config.wrap_around;
2063− if let Ok(regex) = RegexBuilder::new(&query)
1928+ if let Ok(regex) = RegexBuilder::new(query)
2064 .case_insensitive(case_insensitive)
1929 .case_insensitive(case_insensitive)
2065 .multi_line(true)
1930 .multi_line(true)
2066 .build()
1931 .build()
@@ -2100,7 +1965,6 @@ fn extend_search_prev(cx: &mut Context) {
2100}
1965}
2101
1966
2102fn search_selection(cx: &mut Context) {
1967fn search_selection(cx: &mut Context) {
2103− let register = cx.register.unwrap_or('/');
2104 let (view, doc) = current!(cx.editor);
1968 let (view, doc) = current!(cx.editor);
2105 let contents = doc.text().slice(..);
1969 let contents = doc.text().slice(..);
2106
1970
@@ -2113,24 +1977,13 @@ fn search_selection(cx: &mut Context) {
2113 .collect::<Vec<_>>()
1977 .collect::<Vec<_>>()
2114 .join("|");
1978 .join("|");
2115
1979
2116− let msg = format!("register '{}' set to '{}'", register, &regex);
1980+ let msg = format!("register '{}' set to '{}'", '/', &regex);
2117− match cx.editor.registers.push(register, regex) {
1981+ cx.editor.registers.push('/', regex);
2118− Ok(_) => {
2119− cx.editor.registers.last_search_register = register;
2120− cx.editor.set_status(msg)
1982+ cx.editor.set_status(msg);
2121− }
2122− Err(err) => cx.editor.set_error(err.to_string()),
2123− }
2124}
1983}
2125
1984
2126fn make_search_word_bounded(cx: &mut Context) {
1985fn make_search_word_bounded(cx: &mut Context) {
2127− // Defaults to the active search register instead `/` to be more ergonomic assuming most people
2128− // would use this command following `search_selection`. This avoids selecting the register
2129− // twice.
2130− let register = cx
2131− .register
2132− .unwrap_or(cx.editor.registers.last_search_register);
2133− let regex = match cx.editor.registers.first(register, cx.editor) {
1986+ let regex = match cx.editor.registers.last('/') {
2134 Some(regex) => regex,
1987 Some(regex) => regex,
2135 None => return,
1988 None => return,
2136 };
1989 };
@@ -2148,19 +2001,14 @@ fn make_search_word_bounded(cx: &mut Context) {
2148 if !start_anchored {
2001 if !start_anchored {
2149 new_regex.push_str("\\b");
2002 new_regex.push_str("\\b");
2150 }
2003 }
2151− new_regex.push_str(&regex);
2004+ new_regex.push_str(regex);
2152 if !end_anchored {
2005 if !end_anchored {
2153 new_regex.push_str("\\b");
2006 new_regex.push_str("\\b");
2154 }
2007 }
2155
2008
2156− let msg = format!("register '{}' set to '{}'", register, &new_regex);
2009+ let msg = format!("register '{}' set to '{}'", '/', &new_regex);
2157− match cx.editor.registers.push(register, new_regex) {
2010+ cx.editor.registers.push('/', new_regex);
2158− Ok(_) => {
2159− cx.editor.registers.last_search_register = register;
2160− cx.editor.set_status(msg)
2011+ cx.editor.set_status(msg);
2161− }
2162− Err(err) => cx.editor.set_error(err.to_string()),
2163− }
2164}
2012}
2165
2013
2166fn global_search(cx: &mut Context) {
2014fn global_search(cx: &mut Context) {
@@ -2199,11 +2047,13 @@ fn global_search(cx: &mut Context) {
2199 }
2047 }
2200 }
2048 }
2201
2049
2050+ let (all_matches_sx, all_matches_rx) = tokio::sync::mpsc::unbounded_channel::<FileResult>();
2202 let config = cx.editor.config();
2051 let config = cx.editor.config();
2203 let smart_case = config.search.smart_case;
2052 let smart_case = config.search.smart_case;
2204 let file_picker_config = config.file_picker.clone();
2053 let file_picker_config = config.file_picker.clone();
2205
2054
2206 let reg = cx.register.unwrap_or('/');
2055 let reg = cx.register.unwrap_or('/');
2056+
2207 let completions = search_completions(cx, Some(reg));
2057 let completions = search_completions(cx, Some(reg));
2208 ui::regex_prompt(
2058 ui::regex_prompt(
2209 cx,
2059 cx,
@@ -2216,67 +2066,43 @@ fn global_search(cx: &mut Context) {
2216 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
2066 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
2217 .collect()
2067 .collect()
2218 },
2068 },
2219− move |cx, regex, event| {
2069+ move |_editor, regex, event| {
2220 if event != PromptEvent::Validate {
2070 if event != PromptEvent::Validate {
2221 return;
2071 return;
2222 }
2072 }
2223− cx.editor.registers.last_search_register = reg;
2224−
2225− let current_path = doc_mut!(cx.editor).path().cloned();
2226− let documents: Vec<_> = cx
2227− .editor
2228− .documents()
2229− .map(|doc| (doc.path().cloned(), doc.text().to_owned()))
2230− .collect();
2231
2073
2232 if let Ok(matcher) = RegexMatcherBuilder::new()
2074 if let Ok(matcher) = RegexMatcherBuilder::new()
2233 .case_smart(smart_case)
2075 .case_smart(smart_case)
2234 .build(regex.as_str())
2076 .build(regex.as_str())
2235 {
2077 {
2236− let search_root = helix_loader::current_working_dir();
2078+ let searcher = SearcherBuilder::new()
2237− if !search_root.exists() {
2079+ .binary_detection(BinaryDetection::quit(b'\x00'))
2238− cx.editor
2080+ .build();
2239− .set_error("Current working directory does not exist");
2240− return;
2241− }
2242−
2243− let (picker, injector) = Picker::stream(current_path);
2244
2081
2082+ let search_root = std::env::current_dir()
2083+ .expect("Global search error: Failed to get current dir");
2245 let dedup_symlinks = file_picker_config.deduplicate_links;
2084 let dedup_symlinks = file_picker_config.deduplicate_links;
2246 let absolute_root = search_root
2085 let absolute_root = search_root
2247 .canonicalize()
2086 .canonicalize()
2248 .unwrap_or_else(|_| search_root.clone());
2087 .unwrap_or_else(|_| search_root.clone());
2249− let injector_ = injector.clone();
2088+
2250−
2251− std::thread::spawn(move || {
2252− let searcher = SearcherBuilder::new()
2253− .binary_detection(BinaryDetection::quit(b'\x00'))
2254− .build();
2255−
2256− let mut walk_builder = WalkBuilder::new(search_root);
2089+ WalkBuilder::new(search_root)
2257−
2258− walk_builder
2259− .hidden(file_picker_config.hidden)
2090+ .hidden(file_picker_config.hidden)
2260− .parents(file_picker_config.parents)
2091+ .parents(file_picker_config.parents)
2261− .ignore(file_picker_config.ignore)
2092+ .ignore(file_picker_config.ignore)
2262− .follow_links(file_picker_config.follow_symlinks)
2093+ .follow_links(file_picker_config.follow_symlinks)
2263− .git_ignore(file_picker_config.git_ignore)
2094+ .git_ignore(file_picker_config.git_ignore)
2264− .git_global(file_picker_config.git_global)
2095+ .git_global(file_picker_config.git_global)
2265− .git_exclude(file_picker_config.git_exclude)
2096+ .git_exclude(file_picker_config.git_exclude)
2266− .max_depth(file_picker_config.max_depth)
2097+ .max_depth(file_picker_config.max_depth)
2267− .filter_entry(move |entry| {
2098+ .filter_entry(move |entry| {
2268− filter_picker_entry(entry, &absolute_root, dedup_symlinks)
2099+ filter_picker_entry(entry, &absolute_root, dedup_symlinks)
2269− });
2100+ })
2270−
2271− walk_builder
2272− .add_custom_ignore_filename(helix_loader::config_dir().join("ignore"));
2273− walk_builder.add_custom_ignore_filename(".helix/ignore");
2274−
2275− walk_builder.build_parallel().run(|| {
2101+ .build_parallel()
2102+ .run(|| {
2276 let mut searcher = searcher.clone();
2103 let mut searcher = searcher.clone();
2277 let matcher = matcher.clone();
2104 let matcher = matcher.clone();
2278− let injector = injector_.clone();
2105+ let all_matches_sx = all_matches_sx.clone();
2279− let documents = &documents;
2280 Box::new(move |entry: Result<DirEntry, ignore::Error>| -> WalkState {
2106 Box::new(move |entry: Result<DirEntry, ignore::Error>| -> WalkState {
2281 let entry = match entry {
2107 let entry = match entry {
2282 Ok(entry) => entry,
2108 Ok(entry) => entry,
@@ -2289,39 +2115,17 @@ fn global_search(cx: &mut Context) {
2289 _ => return WalkState::Continue,
2115 _ => return WalkState::Continue,
2290 };
2116 };
2291
2117
2292− let mut stop = false;
2118+ let result = searcher.search_path(
2119+ &matcher,
2120+ entry.path(),
2293− let sink = sinks::UTF8(|line_num, _| {
2121+ sinks::UTF8(|line_num, _| {
2294− stop = injector
2122+ all_matches_sx
2295− .push(FileResult::new(entry.path(), line_num as usize - 1))
2123+ .send(FileResult::new(entry.path(), line_num as usize - 1))
2296− .is_err();
2124+ .unwrap();
2297−
2125+
2298− Ok(!stop)
2126+ Ok(true)
2299− });
2127+ }),
2300− let doc = documents.iter().find(|&(doc_path, _)| {
2301− doc_path
2302− .as_ref()
2303− .map_or(false, |doc_path| doc_path == entry.path())
2304− });
2305−
2306− let result = if let Some((_, doc)) = doc {
2307− // there is already a buffer for this file
2308− // search the buffer instead of the file because it's faster
2309− // and captures new edits without requiring a save
2310− if searcher.multi_line_with_matcher(&matcher) {
2311− // in this case a continous buffer is required
2312− // convert the rope to a string
2313− let text = doc.to_string();
2314− searcher.search_slice(&matcher, text.as_bytes(), sink)
2315− } else {
2316− searcher.search_reader(
2317− &matcher,
2318− RopeReader::new(doc.slice(..)),
2319− sink,
2320− )
2321− }
2322− } else {
2323− searcher.search_path(&matcher, entry.path(), sink)
2324− };
2128+ );
2325
2129
2326 if let Err(err) = result {
2130 if let Err(err) = result {
2327 log::error!(
2131 log::error!(
@@ -2330,66 +2134,65 @@ fn global_search(cx: &mut Context) {
2330 err
2134 err
2331 );
2135 );
2332 }
2136 }
2333− if stop {
2334− WalkState::Quit
2335− } else {
2336− WalkState::Continue
2137+ WalkState::Continue
2337− }
2338 })
2138 })
2339 });
2139 });
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− })
2387 } else {
2140 } else {
2388 // Otherwise do nothing
2141 // Otherwise do nothing
2389 // log::warn!("Global Search Invalid Pattern")
2142 // log::warn!("Global Search Invalid Pattern")
2390 }
2143 }
2391 },
2144 },
2392 );
2145 );
2146+
2147+ let current_path = doc_mut!(cx.editor).path().cloned();
2148+
2149+ let show_picker = async move {
2150+ let all_matches: Vec<FileResult> =
2151+ UnboundedReceiverStream::new(all_matches_rx).collect().await;
2152+ let call: job::Callback = Callback::EditorCompositor(Box::new(
2153+ move |editor: &mut Editor, compositor: &mut Compositor| {
2154+ if all_matches.is_empty() {
2155+ editor.set_status("No matches found");
2156+ return;
2157+ }
2158+
2159+ let picker = Picker::new(
2160+ all_matches,
2161+ current_path,
2162+ move |cx, FileResult { path, line_num }, action| {
2163+ match cx.editor.open(path, action) {
2164+ Ok(_) => {}
2165+ Err(e) => {
2166+ cx.editor.set_error(format!(
2167+ "Failed to open file '{}': {}",
2168+ path.display(),
2169+ e
2170+ ));
2171+ return;
2172+ }
2173+ }
2174+
2175+ let line_num = *line_num;
2176+ let (view, doc) = current!(cx.editor);
2177+ let text = doc.text();
2178+ if line_num >= text.len_lines() {
2179+ cx.editor.set_error("The line you jumped to does not exist anymore because the file has changed.");
2180+ return;
2181+ }
2182+ let start = text.line_to_char(line_num);
2183+ let end = text.line_to_char((line_num + 1).min(text.len_lines()));
2184+
2185+ doc.set_selection(view.id, Selection::single(start, end));
2186+ align_view(doc, view, Align::Center);
2187+ }).with_preview(|_editor, FileResult { path, line_num }| {
2188+ Some((path.clone().into(), Some((*line_num, *line_num))))
2189+ });
2190+ compositor.push(Box::new(overlaid(picker)));
2191+ },
2192+ ));
2193+ Ok(call)
2194+ };
2195+ cx.jobs.callback(show_picker);
2393}
2196}
2394
2197
2395enum Extend {
2198enum Extend {
@@ -2512,35 +2315,17 @@ enum Operation {
2512 Change,
2315 Change,
2513}
2316}
2514
2317
2515−fn selection_is_linewise(selection: &Selection, text: &Rope) -> bool {
2516− selection.ranges().iter().all(|range| {
2517− let text = text.slice(..);
2518− if range.slice(text).len_lines() < 2 {
2519− return false;
2520− }
2521− // If the start of the selection is at the start of a line and the end at the end of a line.
2522− let (start_line, end_line) = range.line_range(text);
2523− let start = text.line_to_char(start_line);
2524− let end = text.line_to_char((end_line + 1).min(text.len_lines()));
2525− start == range.from() && end == range.to()
2526− })
2527−}
2528−
2529fn delete_selection_impl(cx: &mut Context, op: Operation) {
2318fn delete_selection_impl(cx: &mut Context, op: Operation) {
2530 let (view, doc) = current!(cx.editor);
2319 let (view, doc) = current!(cx.editor);
2531
2320
2532 let selection = doc.selection(view.id);
2321 let selection = doc.selection(view.id);
2533− let only_whole_lines = selection_is_linewise(selection, doc.text());
2534
2322
2535 if cx.register != Some('_') {
2323 if cx.register != Some('_') {
2536 // first yank the selection
2324 // first yank the selection
2537 let text = doc.text().slice(..);
2325 let text = doc.text().slice(..);
2538 let values: Vec<String> = selection.fragments(text).map(Cow::into_owned).collect();
2326 let values: Vec<String> = selection.fragments(text).map(Cow::into_owned).collect();
2539 let reg_name = cx.register.unwrap_or('"');
2327 let reg_name = cx.register.unwrap_or('"');
2540− if let Err(err) = cx.editor.registers.write(reg_name, values) {
2328+ cx.editor.registers.write(reg_name, values);
2541− cx.editor.set_error(err.to_string());
2542− return;
2543− }
2544 };
2329 };
2545
2330
2546 // then delete
2331 // then delete
@@ -2554,11 +2339,7 @@ fn delete_selection_impl(cx: &mut Context, op: Operation) {
2554 exit_select_mode(cx);
2339 exit_select_mode(cx);
2555 }
2340 }
2556 Operation::Change => {
2341 Operation::Change => {
2557− if only_whole_lines {
2558− open_above(cx);
2559− } else {
2560− enter_insert_mode(cx);
2342+ enter_insert_mode(cx);
2561− }
2562 }
2343 }
2563 }
2344 }
2564}
2345}
@@ -2680,10 +2461,6 @@ fn insert_mode(cx: &mut Context) {
2680 .transform(|range| Range::new(range.to(), range.from()));
2461 .transform(|range| Range::new(range.to(), range.from()));
2681
2462
2682 doc.set_selection(view.id, selection);
2463 doc.set_selection(view.id, selection);
2683−
2684− // [TODO] temporary workaround until we're not using the idle timer to
2685− // trigger auto completions any more
2686− cx.editor.clear_idle_timer();
2687}
2464}
2688
2465
2689// inserts at the end of each selection
2466// inserts at the end of each selection
@@ -2720,10 +2497,6 @@ fn append_mode(cx: &mut Context) {
2720
2497
2721fn file_picker(cx: &mut Context) {
2498fn file_picker(cx: &mut Context) {
2722 let root = find_workspace().0;
2499 let root = find_workspace().0;
2723− if !root.exists() {
2724− cx.editor.set_error("Workspace directory does not exist");
2725− return;
2726− }
2727 let picker = ui::file_picker(root, &cx.editor.config());
2500 let picker = ui::file_picker(root, &cx.editor.config());
2728 cx.push_layer(Box::new(overlaid(picker)));
2501 cx.push_layer(Box::new(overlaid(picker)));
2729}
2502}
@@ -2744,14 +2517,8 @@ fn file_picker_in_current_buffer_directory(cx: &mut Context) {
2744 let picker = ui::file_picker(path, &cx.editor.config());
2517 let picker = ui::file_picker(path, &cx.editor.config());
2745 cx.push_layer(Box::new(overlaid(picker)));
2518 cx.push_layer(Box::new(overlaid(picker)));
2746}
2519}
2747−
2748fn file_picker_in_current_directory(cx: &mut Context) {
2520fn file_picker_in_current_directory(cx: &mut Context) {
2749− let cwd = helix_loader::current_working_dir();
2521+ let cwd = std::env::current_dir().unwrap_or_else(|_| PathBuf::from("./"));
2750− if !cwd.exists() {
2751− cx.editor
2752− .set_error("Current working directory does not exist");
2753− return;
2754− }
2755 let picker = ui::file_picker(cwd, &cx.editor.config());
2522 let picker = ui::file_picker(cwd, &cx.editor.config());
2756 cx.push_layer(Box::new(overlaid(picker)));
2523 cx.push_layer(Box::new(overlaid(picker)));
2757}
2524}
@@ -2901,11 +2668,9 @@ fn jumplist_picker(cx: &mut Context) {
2901 |cx, meta, action| {
2668 |cx, meta, action| {
2902 cx.editor.switch(meta.id, action);
2669 cx.editor.switch(meta.id, action);
2903 let config = cx.editor.config();
2670 let config = cx.editor.config();
2904− let (view, doc) = (view_mut!(cx.editor), doc_mut!(cx.editor, &meta.id));
2671+ let (view, doc) = current!(cx.editor);
2905 doc.set_selection(view.id, meta.selection.clone());
2672 doc.set_selection(view.id, meta.selection.clone());
2906− if action.align_view(view, doc.id()) {
2907− view.ensure_cursor_in_view_center(doc, config.scrolloff);
2673+ view.ensure_cursor_in_view_center(doc, config.scrolloff);
2908− }
2909 },
2674 },
2910 )
2675 )
2911 .with_preview(|editor, meta| {
2676 .with_preview(|editor, meta| {
@@ -3053,7 +2818,6 @@ fn insert_with_indent(cx: &mut Context, cursor_fallback: IndentFallbackPos) {
3053 let indent = indent::indent_for_newline(
2818 let indent = indent::indent_for_newline(
3054 language_config,
2819 language_config,
3055 syntax,
2820 syntax,
3056− &doc.config.load().indent_heuristic,
3057 &doc.indent_style,
2821 &doc.indent_style,
3058 tab_width,
2822 tab_width,
3059 text,
2823 text,
@@ -3158,7 +2922,6 @@ fn open(cx: &mut Context, open: Open) {
3158 Open::Below => graphemes::prev_grapheme_boundary(text, range.to()),
2922 Open::Below => graphemes::prev_grapheme_boundary(text, range.to()),
3159 Open::Above => range.from(),
2923 Open::Above => range.from(),
3160 });
2924 });
3161−
3162 let new_line = match open {
2925 let new_line = match open {
3163 // adjust position to the end of the line (next line - 1)
2926 // adjust position to the end of the line (next line - 1)
3164 Open::Below => cursor_line + 1,
2927 Open::Below => cursor_line + 1,
@@ -3166,15 +2929,13 @@ fn open(cx: &mut Context, open: Open) {
3166 Open::Above => cursor_line,
2929 Open::Above => cursor_line,
3167 };
2930 };
3168
2931
3169− let line_num = new_line.saturating_sub(1);
3170−
3171 // Index to insert newlines after, as well as the char width
2932 // Index to insert newlines after, as well as the char width
3172 // to use to compensate for those inserted newlines.
2933 // to use to compensate for those inserted newlines.
3173 let (line_end_index, line_end_offset_width) = if new_line == 0 {
2934 let (line_end_index, line_end_offset_width) = if new_line == 0 {
3174 (0, 0)
2935 (0, 0)
3175 } else {
2936 } else {
3176 (
2937 (
3177− line_end_char_index(&text, line_num),
2938+ line_end_char_index(&doc.text().slice(..), new_line.saturating_sub(1)),
3178 doc.line_ending.len_chars(),
2939 doc.line_ending.len_chars(),
3179 )
2940 )
3180 };
2941 };
@@ -3182,15 +2943,13 @@ fn open(cx: &mut Context, open: Open) {
3182 let indent = indent::indent_for_newline(
2943 let indent = indent::indent_for_newline(
3183 doc.language_config(),
2944 doc.language_config(),
3184 doc.syntax(),
2945 doc.syntax(),
3185− &doc.config.load().indent_heuristic,
3186 &doc.indent_style,
2946 &doc.indent_style,
3187 doc.tab_width(),
2947 doc.tab_width(),
3188 text,
2948 text,
3189− line_num,
2949+ new_line.saturating_sub(1),
3190 line_end_index,
2950 line_end_index,
3191 cursor_line,
2951 cursor_line,
3192 );
2952 );
3193−
3194 let indent_len = indent.len();
2953 let indent_len = indent.len();
3195 let mut text = String::with_capacity(1 + indent_len);
2954 let mut text = String::with_capacity(1 + indent_len);
3196 text.push_str(doc.line_ending.as_str());
2955 text.push_str(doc.line_ending.as_str());
@@ -3489,7 +3248,8 @@ fn goto_next_change_impl(cx: &mut Context, direction: Direction) {
3489
3248
3490 doc.set_selection(view.id, selection)
3249 doc.set_selection(view.id, selection)
3491 };
3250 };
3251+ motion(cx.editor);
3492− cx.editor.apply_motion(motion);
3252+ cx.editor.last_motion = Some(Motion(Box::new(motion)));
3493}
3253}
3494
3254
3495/// Returns the [Range] for a [Hunk] in the given text.
3255/// Returns the [Range] for a [Hunk] in the given text.
@@ -3616,7 +3376,6 @@ pub mod insert {
3616 }
3376 }
3617
3377
3618 use helix_core::auto_pairs;
3378 use helix_core::auto_pairs;
3619− use helix_view::editor::SmartTabConfig;
3620
3379
3621 pub fn insert_char(cx: &mut Context, c: char) {
3380 pub fn insert_char(cx: &mut Context, c: char) {
3622 let (view, doc) = current_ref!(cx.editor);
3381 let (view, doc) = current_ref!(cx.editor);
@@ -3642,31 +3401,6 @@ pub mod insert {
3642 }
3401 }
3643 }
3402 }
3644
3403
3645− pub fn smart_tab(cx: &mut Context) {
3646− let (view, doc) = current_ref!(cx.editor);
3647− let view_id = view.id;
3648−
3649− if matches!(
3650− cx.editor.config().smart_tab,
3651− Some(SmartTabConfig { enable: true, .. })
3652− ) {
3653− let cursors_after_whitespace = doc.selection(view_id).ranges().iter().all(|range| {
3654− let cursor = range.cursor(doc.text().slice(..));
3655− let current_line_num = doc.text().char_to_line(cursor);
3656− let current_line_start = doc.text().line_to_char(current_line_num);
3657− let left = doc.text().slice(current_line_start..cursor);
3658− left.chars().all(|c| c.is_whitespace())
3659− });
3660−
3661− if !cursors_after_whitespace {
3662− move_parent_node_end(cx);
3663− return;
3664− }
3665− }
3666−
3667− insert_tab(cx);
3668− }
3669−
3670 pub fn insert_tab(cx: &mut Context) {
3404 pub fn insert_tab(cx: &mut Context) {
3671 let (view, doc) = current!(cx.editor);
3405 let (view, doc) = current!(cx.editor);
3672 // TODO: round out to nearest indentation level (for example a line with 3 spaces should
3406 // TODO: round out to nearest indentation level (for example a line with 3 spaces should
@@ -3722,7 +3456,6 @@ pub mod insert {
3722 let indent = indent::indent_for_newline(
3456 let indent = indent::indent_for_newline(
3723 doc.language_config(),
3457 doc.language_config(),
3724 doc.syntax(),
3458 doc.syntax(),
3725− &doc.config.load().indent_heuristic,
3726 &doc.indent_style,
3459 &doc.indent_style,
3727 doc.tab_width(),
3460 doc.tab_width(),
3728 text,
3461 text,
@@ -3963,22 +3696,7 @@ fn commit_undo_checkpoint(cx: &mut Context) {
3963// Yank / Paste
3696// Yank / Paste
3964
3697
3965fn yank(cx: &mut Context) {
3698fn yank(cx: &mut Context) {
3966− yank_impl(cx.editor, cx.register.unwrap_or('"'));
3967− exit_select_mode(cx);
3968−}
3969−
3970−fn yank_to_clipboard(cx: &mut Context) {
3971− yank_impl(cx.editor, '+');
3972− exit_select_mode(cx);
3973−}
3974−
3975−fn yank_to_primary_clipboard(cx: &mut Context) {
3976− yank_impl(cx.editor, '*');
3977− exit_select_mode(cx);
3978−}
3979−
3980−fn yank_impl(editor: &mut Editor, register: char) {
3981− let (view, doc) = current!(editor);
3699+ let (view, doc) = current!(cx.editor);
3982 let text = doc.text().slice(..);
3700 let text = doc.text().slice(..);
3983
3701
3984 let values: Vec<String> = doc
3702 let values: Vec<String> = doc
@@ -3986,15 +3704,19 @@ fn yank_impl(editor: &mut Editor, register: char) {
3986 .fragments(text)
3704 .fragments(text)
3987 .map(Cow::into_owned)
3705 .map(Cow::into_owned)
3988 .collect();
3706 .collect();
3989− let selections = values.len();
3990
3707
3991− match editor.registers.write(register, values) {
3708+ let msg = format!(
3992− Ok(_) => editor.set_status(format!(
3993− "yanked {selections} selection{} to register {register}",
3709+ "yanked {} selection(s) to register {}",
3994− if selections == 1 { "" } else { "s" }
3710+ values.len(),
3995− )),
3711+ cx.register.unwrap_or('"')
3996− Err(err) => editor.set_error(err.to_string()),
3712+ );
3997− }
3713+
3714+ cx.editor
3715+ .registers
3716+ .write(cx.register.unwrap_or('"'), values);
3717+
3718+ cx.editor.set_status(msg);
3719+ exit_select_mode(cx);
3998}
3720}
3999
3721
4000fn yank_joined_impl(editor: &mut Editor, separator: &str, register: char) {
3722fn yank_joined_impl(editor: &mut Editor, separator: &str, register: char) {
@@ -4002,7 +3724,6 @@ fn yank_joined_impl(editor: &mut Editor, separator: &str, register: char) {
4002 let text = doc.text().slice(..);
3724 let text = doc.text().slice(..);
4003
3725
4004 let selection = doc.selection(view.id);
3726 let selection = doc.selection(view.id);
4005− let selections = selection.len();
4006 let joined = selection
3727 let joined = selection
4007 .fragments(text)
3728 .fragments(text)
4008 .fold(String::new(), |mut acc, fragment| {
3729 .fold(String::new(), |mut acc, fragment| {
@@ -4013,52 +3734,104 @@ fn yank_joined_impl(editor: &mut Editor, separator: &str, register: char) {
4013 acc
3734 acc
4014 });
3735 });
4015
3736
3737+ let msg = format!(
3738+ "joined and yanked {} selection(s) to register {}",
3739+ selection.len(),
3740+ register,
3741+ );
3742+
4016− match editor.registers.write(register, vec![joined]) {
3743+ editor.registers.write(register, vec![joined]);
4017− Ok(_) => editor.set_status(format!(
3744+ editor.set_status(msg);
4018− "joined and yanked {selections} selection{} to register {register}",
4019− if selections == 1 { "" } else { "s" }
4020− )),
4021− Err(err) => editor.set_error(err.to_string()),
4022− }
4023}
3745}
4024
3746
4025fn yank_joined(cx: &mut Context) {
3747fn yank_joined(cx: &mut Context) {
4026− let separator = doc!(cx.editor).line_ending.as_str();
3748+ let line_ending = doc!(cx.editor).line_ending;
4027− yank_joined_impl(cx.editor, separator, cx.register.unwrap_or('"'));
3749+ let register = cx.register.unwrap_or('"');
3750+ yank_joined_impl(cx.editor, line_ending.as_str(), register);
4028 exit_select_mode(cx);
3751 exit_select_mode(cx);
4029}
3752}
4030
3753
4031−fn yank_joined_to_clipboard(cx: &mut Context) {
3754+fn yank_joined_to_clipboard_impl(
4032− let line_ending = doc!(cx.editor).line_ending;
3755+ editor: &mut Editor,
4033− yank_joined_impl(cx.editor, line_ending.as_str(), '+');
3756+ separator: &str,
4034− exit_select_mode(cx);
3757+ clipboard_type: ClipboardType,
3758+) -> anyhow::Result<()> {
3759+ let (view, doc) = current!(editor);
3760+ let text = doc.text().slice(..);
3761+
3762+ let values: Vec<String> = doc
3763+ .selection(view.id)
3764+ .fragments(text)
3765+ .map(Cow::into_owned)
3766+ .collect();
3767+
3768+ let clipboard_text = match clipboard_type {
3769+ ClipboardType::Clipboard => "system clipboard",
3770+ ClipboardType::Selection => "primary clipboard",
3771+ };
3772+
3773+ let msg = format!(
3774+ "joined and yanked {} selection(s) to {}",
3775+ values.len(),
3776+ clipboard_text,
3777+ );
3778+
3779+ let joined = values.join(separator);
3780+
3781+ editor
3782+ .clipboard_provider
3783+ .set_contents(joined, clipboard_type)
3784+ .context("Couldn't set system clipboard content")?;
3785+
3786+ editor.set_status(msg);
3787+
3788+ Ok(())
4035}
3789}
4036
3790
4037−fn yank_joined_to_primary_clipboard(cx: &mut Context) {
3791+fn yank_joined_to_clipboard(cx: &mut Context) {
4038 let line_ending = doc!(cx.editor).line_ending;
3792 let line_ending = doc!(cx.editor).line_ending;
3793+ let _ =
4039− yank_joined_impl(cx.editor, line_ending.as_str(), '*');
3794+ yank_joined_to_clipboard_impl(cx.editor, line_ending.as_str(), ClipboardType::Clipboard);
4040 exit_select_mode(cx);
3795 exit_select_mode(cx);
4041}
3796}
4042
3797
3798+fn yank_main_selection_to_clipboard_impl(
4043−fn yank_primary_selection_impl(editor: &mut Editor, register: char) {
3799+ editor: &mut Editor,
3800+ clipboard_type: ClipboardType,
3801+) -> anyhow::Result<()> {
4044 let (view, doc) = current!(editor);
3802 let (view, doc) = current!(editor);
4045 let text = doc.text().slice(..);
3803 let text = doc.text().slice(..);
4046
3804
3805+ let message_text = match clipboard_type {
3806+ ClipboardType::Clipboard => "yanked main selection to system clipboard",
3807+ ClipboardType::Selection => "yanked main selection to primary clipboard",
3808+ };
3809+
4047− let selection = doc.selection(view.id).primary().fragment(text).to_string();
3810+ let value = doc.selection(view.id).primary().fragment(text);
4048
3811
4049− match editor.registers.write(register, vec![selection]) {
3812+ if let Err(e) = editor
4050− Ok(_) => editor.set_status(format!("yanked primary selection to register {register}",)),
3813+ .clipboard_provider
4051− Err(err) => editor.set_error(err.to_string()),
3814+ .set_contents(value.into_owned(), clipboard_type)
3815+ {
3816+ bail!("Couldn't set system clipboard content: {}", e);
4052 }
3817 }
3818+
3819+ editor.set_status(message_text);
3820+ Ok(())
4053}
3821}
4054
3822
4055fn yank_main_selection_to_clipboard(cx: &mut Context) {
3823fn yank_main_selection_to_clipboard(cx: &mut Context) {
4056− yank_primary_selection_impl(cx.editor, '+');
3824+ let _ = yank_main_selection_to_clipboard_impl(cx.editor, ClipboardType::Clipboard);
4057− exit_select_mode(cx);
3825+}
3826+
3827+fn yank_joined_to_primary_clipboard(cx: &mut Context) {
3828+ let line_ending = doc!(cx.editor).line_ending;
3829+ let _ =
3830+ yank_joined_to_clipboard_impl(cx.editor, line_ending.as_str(), ClipboardType::Selection);
4058}
3831}
4059
3832
4060fn yank_main_selection_to_primary_clipboard(cx: &mut Context) {
3833fn yank_main_selection_to_primary_clipboard(cx: &mut Context) {
4061− yank_primary_selection_impl(cx.editor, '*');
3834+ let _ = yank_main_selection_to_clipboard_impl(cx.editor, ClipboardType::Selection);
4062 exit_select_mode(cx);
3835 exit_select_mode(cx);
4063}
3836}
4064
3837
@@ -4156,99 +3929,146 @@ pub(crate) fn paste_bracketed_value(cx: &mut Context, contents: String) {
4156 };
3929 };
4157 let (view, doc) = current!(cx.editor);
3930 let (view, doc) = current!(cx.editor);
4158 paste_impl(&[contents], doc, view, paste, count, cx.editor.mode);
3931 paste_impl(&[contents], doc, view, paste, count, cx.editor.mode);
4159− exit_select_mode(cx);
3932+}
3933+
3934+fn paste_clipboard_impl(
3935+ editor: &mut Editor,
3936+ action: Paste,
3937+ clipboard_type: ClipboardType,
3938+ count: usize,
3939+) -> anyhow::Result<()> {
3940+ let (view, doc) = current!(editor);
3941+ match editor.clipboard_provider.get_contents(clipboard_type) {
3942+ Ok(contents) => {
3943+ paste_impl(&[contents], doc, view, action, count, editor.mode);
3944+ Ok(())
3945+ }
3946+ Err(e) => Err(e.context("Couldn't get system clipboard contents")),
3947+ }
4160}
3948}
4161
3949
4162fn paste_clipboard_after(cx: &mut Context) {
3950fn paste_clipboard_after(cx: &mut Context) {
3951+ let _ = paste_clipboard_impl(
3952+ cx.editor,
4163− paste(cx.editor, '+', Paste::After, cx.count());
3953+ Paste::After,
4164− exit_select_mode(cx);
3954+ ClipboardType::Clipboard,
3955+ cx.count(),
3956+ );
4165}
3957}
4166
3958
4167fn paste_clipboard_before(cx: &mut Context) {
3959fn paste_clipboard_before(cx: &mut Context) {
3960+ let _ = paste_clipboard_impl(
3961+ cx.editor,
4168− paste(cx.editor, '+', Paste::Before, cx.count());
3962+ Paste::Before,
4169− exit_select_mode(cx);
3963+ ClipboardType::Clipboard,
3964+ cx.count(),
3965+ );
4170}
3966}
4171
3967
4172fn paste_primary_clipboard_after(cx: &mut Context) {
3968fn paste_primary_clipboard_after(cx: &mut Context) {
3969+ let _ = paste_clipboard_impl(
3970+ cx.editor,
4173− paste(cx.editor, '*', Paste::After, cx.count());
3971+ Paste::After,
4174− exit_select_mode(cx);
3972+ ClipboardType::Selection,
3973+ cx.count(),
3974+ );
4175}
3975}
4176
3976
4177fn paste_primary_clipboard_before(cx: &mut Context) {
3977fn paste_primary_clipboard_before(cx: &mut Context) {
3978+ let _ = paste_clipboard_impl(
3979+ cx.editor,
4178− paste(cx.editor, '*', Paste::Before, cx.count());
3980+ Paste::Before,
4179− exit_select_mode(cx);
3981+ ClipboardType::Selection,
3982+ cx.count(),
3983+ );
4180}
3984}
4181
3985
4182fn replace_with_yanked(cx: &mut Context) {
3986fn replace_with_yanked(cx: &mut Context) {
3987+ let count = cx.count();
4183− replace_with_yanked_impl(cx.editor, cx.register.unwrap_or('"'), cx.count());
3988+ let reg_name = cx.register.unwrap_or('"');
3989+ let (view, doc) = current!(cx.editor);
3990+ let registers = &mut cx.editor.registers;
3991+
3992+ if let Some(values) = registers.read(reg_name) {
3993+ if !values.is_empty() {
3994+ let repeat = std::iter::repeat(
3995+ values
3996+ .last()
3997+ .map(|value| Tendril::from(&value.repeat(count)))
3998+ .unwrap(),
3999+ );
4000+ let mut values = values
4001+ .iter()
4002+ .map(|value| Tendril::from(&value.repeat(count)))
4003+ .chain(repeat);
4004+ let selection = doc.selection(view.id);
4005+ let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
4006+ if !range.is_empty() {
4007+ (range.from(), range.to(), Some(values.next().unwrap()))
4008+ } else {
4009+ (range.from(), range.to(), None)
4010+ }
4011+ });
4012+
4013+ doc.apply(&transaction, view.id);
4184− exit_select_mode(cx);
4014+ exit_select_mode(cx);
4015+ }
4016+ }
4185}
4017}
4186
4018
4187−fn replace_with_yanked_impl(editor: &mut Editor, register: char, count: usize) {
4019+fn replace_selections_with_clipboard_impl(
4188− let Some(values) = editor.registers
4020+ cx: &mut Context,
4189− .read(register, editor)
4021+ clipboard_type: ClipboardType,
4190− .filter(|values| values.len() > 0) else { return };
4022+) -> anyhow::Result<()> {
4191− let values: Vec<_> = values.map(|value| value.to_string()).collect();
4023+ let count = cx.count();
4024+ let (view, doc) = current!(cx.editor);
4192
4025
4193− let (view, doc) = current!(editor);
4026+ match cx.editor.clipboard_provider.get_contents(clipboard_type) {
4194− let repeat = std::iter::repeat(
4027+ Ok(contents) => {
4195− values
4196− .last()
4197− .map(|value| Tendril::from(&value.repeat(count)))
4198− .unwrap(),
4199− );
4200− let mut values = values
4201− .iter()
4202− .map(|value| Tendril::from(&value.repeat(count)))
4203− .chain(repeat);
4204− let selection = doc.selection(view.id);
4028+ let selection = doc.selection(view.id);
4205− let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
4029+ let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
4206− if !range.is_empty() {
4030+ (
4207− (range.from(), range.to(), Some(values.next().unwrap()))
4031+ range.from(),
4208− } else {
4032+ range.to(),
4209− (range.from(), range.to(), None)
4033+ Some(contents.repeat(count).as_str().into()),
4034+ )
4035+ });
4036+
4037+ doc.apply(&transaction, view.id);
4038+ doc.append_changes_to_history(view);
4210 }
4039 }
4040+ Err(e) => return Err(e.context("Couldn't get system clipboard contents")),
4211− });
4041+ }
4212
4042
4213− doc.apply(&transaction, view.id);
4043+ exit_select_mode(cx);
4044+ Ok(())
4214}
4045}
4215
4046
4216fn replace_selections_with_clipboard(cx: &mut Context) {
4047fn replace_selections_with_clipboard(cx: &mut Context) {
4217− replace_with_yanked_impl(cx.editor, '+', cx.count());
4048+ let _ = replace_selections_with_clipboard_impl(cx, ClipboardType::Clipboard);
4218− exit_select_mode(cx);
4219}
4049}
4220
4050
4221fn replace_selections_with_primary_clipboard(cx: &mut Context) {
4051fn replace_selections_with_primary_clipboard(cx: &mut Context) {
4222− replace_with_yanked_impl(cx.editor, '*', cx.count());
4052+ let _ = replace_selections_with_clipboard_impl(cx, ClipboardType::Selection);
4223− exit_select_mode(cx);
4224}
4053}
4225
4054
4226−fn paste(editor: &mut Editor, register: char, pos: Paste, count: usize) {
4055+fn paste(cx: &mut Context, pos: Paste) {
4227− let Some(values) = editor.registers.read(register, editor) else { return };
4056+ let count = cx.count();
4228− let values: Vec<_> = values.map(|value| value.to_string()).collect();
4057+ let reg_name = cx.register.unwrap_or('"');
4058+ let (view, doc) = current!(cx.editor);
4059+ let registers = &mut cx.editor.registers;
4229
4060
4230− let (view, doc) = current!(editor);
4061+ if let Some(values) = registers.read(reg_name) {
4231− paste_impl(&values, doc, view, pos, count, editor.mode);
4062+ paste_impl(values, doc, view, pos, count, cx.editor.mode);
4063+ }
4232}
4064}
4233
4065
4234fn paste_after(cx: &mut Context) {
4066fn paste_after(cx: &mut Context) {
4235− paste(
4236− cx.editor,
4237− cx.register.unwrap_or('"'),
4238− Paste::After,
4067+ paste(cx, Paste::After)
4239− cx.count(),
4240− );
4241− exit_select_mode(cx);
4242}
4068}
4243
4069
4244fn paste_before(cx: &mut Context) {
4070fn paste_before(cx: &mut Context) {
4245− paste(
4246− cx.editor,
4247− cx.register.unwrap_or('"'),
4248− Paste::Before,
4071+ paste(cx, Paste::Before)
4249− cx.count(),
4250− );
4251− exit_select_mode(cx);
4252}
4072}
4253
4073
4254fn get_lines(doc: &Document, view_id: ViewId) -> Vec<usize> {
4074fn get_lines(doc: &Document, view_id: ViewId) -> Vec<usize> {
@@ -4287,7 +4107,6 @@ fn indent(cx: &mut Context) {
4287 }),
4107 }),
4288 );
4108 );
4289 doc.apply(&transaction, view.id);
4109 doc.apply(&transaction, view.id);
4290− exit_select_mode(cx);
4291}
4110}
4292
4111
4293fn unindent(cx: &mut Context) {
4112fn unindent(cx: &mut Context) {
@@ -4327,7 +4146,6 @@ fn unindent(cx: &mut Context) {
4327 let transaction = Transaction::change(doc.text(), changes.into_iter());
4146 let transaction = Transaction::change(doc.text(), changes.into_iter());
4328
4147
4329 doc.apply(&transaction, view.id);
4148 doc.apply(&transaction, view.id);
4330− exit_select_mode(cx);
4331}
4149}
4332
4150
4333fn format_selections(cx: &mut Context) {
4151fn format_selections(cx: &mut Context) {
@@ -4357,7 +4175,7 @@ fn format_selections(cx: &mut Context) {
4357 })
4175 })
4358 else {
4176 else {
4359 cx.editor
4177 cx.editor
4360− .set_error("No configured language server supports range formatting");
4178+ .set_error("No configured language server does not support range formatting");
4361 return;
4179 return;
4362 };
4180 };
4363
4181
@@ -4394,9 +4212,10 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
4394 use movement::skip_while;
4212 use movement::skip_while;
4395 let (view, doc) = current!(cx.editor);
4213 let (view, doc) = current!(cx.editor);
4396 let text = doc.text();
4214 let text = doc.text();
4397− let slice = text.slice(..);
4215+ let slice = doc.text().slice(..);
4398
4216
4399 let mut changes = Vec::new();
4217 let mut changes = Vec::new();
4218+ let fragment = Tendril::from(" ");
4400
4219
4401 for selection in doc.selection(view.id) {
4220 for selection in doc.selection(view.id) {
4402 let (start, mut end) = selection.line_range(slice);
4221 let (start, mut end) = selection.line_range(slice);
@@ -4412,13 +4231,9 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
4412 let mut end = text.line_to_char(line + 1);
4231 let mut end = text.line_to_char(line + 1);
4413 end = skip_while(slice, end, |ch| matches!(ch, ' ' | '\t')).unwrap_or(end);
4232 end = skip_while(slice, end, |ch| matches!(ch, ' ' | '\t')).unwrap_or(end);
4414
4233
4415− let separator = if end == line_end_char_index(&slice, line + 1) {
4234+ // need to skip from start, not end
4416− // the joining line contains only space-characters => don't include a whitespace when joining
4235+ let change = (start, end, Some(fragment.clone()));
4417− None
4418− } else {
4419− Some(Tendril::from(" "))
4420− };
4421− changes.push((start, end, separator));
4236+ changes.push(change);
4422 }
4237 }
4423 }
4238 }
4424
4239
@@ -4430,6 +4245,9 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
4430 changes.sort_unstable_by_key(|(from, _to, _text)| *from);
4245 changes.sort_unstable_by_key(|(from, _to, _text)| *from);
4431 changes.dedup();
4246 changes.dedup();
4432
4247
4248+ // TODO: joining multiple empty lines should be replaced by a single space.
4249+ // need to merge change ranges that touch
4250+
4433 // select inserted spaces
4251 // select inserted spaces
4434 let transaction = if select_space {
4252 let transaction = if select_space {
4435 let ranges: SmallVec<_> = changes
4253 let ranges: SmallVec<_> = changes
@@ -4441,9 +4259,9 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
4441 })
4259 })
4442 .collect();
4260 .collect();
4443 let selection = Selection::new(ranges, 0);
4261 let selection = Selection::new(ranges, 0);
4444− Transaction::change(text, changes.into_iter()).with_selection(selection)
4262+ Transaction::change(doc.text(), changes.into_iter()).with_selection(selection)
4445 } else {
4263 } else {
4446− Transaction::change(text, changes.into_iter())
4264+ Transaction::change(doc.text(), changes.into_iter())
4447 };
4265 };
4448
4266
4449 doc.apply(&transaction, view.id);
4267 doc.apply(&transaction, view.id);
@@ -4457,8 +4275,8 @@ fn keep_or_remove_selections_impl(cx: &mut Context, remove: bool) {
4457 if remove { "remove:" } else { "keep:" }.into(),
4275 if remove { "remove:" } else { "keep:" }.into(),
4458 Some(reg),
4276 Some(reg),
4459 ui::completers::none,
4277 ui::completers::none,
4460− move |cx, regex, event| {
4278+ move |editor, regex, event| {
4461− let (view, doc) = current!(cx.editor);
4279+ let (view, doc) = current!(editor);
4462 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
4280 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
4463 return;
4281 return;
4464 }
4282 }
@@ -4766,7 +4584,8 @@ fn expand_selection(cx: &mut Context) {
4766 }
4584 }
4767 }
4585 }
4768 };
4586 };
4587+ motion(cx.editor);
4769− cx.editor.apply_motion(motion);
4588+ cx.editor.last_motion = Some(Motion(Box::new(motion)));
4770}
4589}
4771
4590
4772fn shrink_selection(cx: &mut Context) {
4591fn shrink_selection(cx: &mut Context) {
@@ -4790,7 +4609,8 @@ fn shrink_selection(cx: &mut Context) {
4790 doc.set_selection(view.id, selection);
4609 doc.set_selection(view.id, selection);
4791 }
4610 }
4792 };
4611 };
4612+ motion(cx.editor);
4793− cx.editor.apply_motion(motion);
4613+ cx.editor.last_motion = Some(Motion(Box::new(motion)));
4794}
4614}
4795
4615
4796fn select_sibling_impl<F>(cx: &mut Context, sibling_fn: &'static F)
4616fn select_sibling_impl<F>(cx: &mut Context, sibling_fn: &'static F)
@@ -4808,7 +4628,8 @@ where
4808 doc.set_selection(view.id, selection);
4628 doc.set_selection(view.id, selection);
4809 }
4629 }
4810 };
4630 };
4631+ motion(cx.editor);
4811− cx.editor.apply_motion(motion);
4632+ cx.editor.last_motion = Some(Motion(Box::new(motion)));
4812}
4633}
4813
4634
4814fn select_next_sibling(cx: &mut Context) {
4635fn select_next_sibling(cx: &mut Context) {
@@ -4819,49 +4640,6 @@ fn select_prev_sibling(cx: &mut Context) {
4819 select_sibling_impl(cx, &|node| Node::prev_sibling(&node))
4640 select_sibling_impl(cx, &|node| Node::prev_sibling(&node))
4820}
4641}
4821
4642
4822−fn move_node_bound_impl(cx: &mut Context, dir: Direction, movement: Movement) {
4823− let motion = move |editor: &mut Editor| {
4824− let (view, doc) = current!(editor);
4825−
4826− if let Some(syntax) = doc.syntax() {
4827− let text = doc.text().slice(..);
4828− let current_selection = doc.selection(view.id);
4829−
4830− let selection = movement::move_parent_node_end(
4831− syntax,
4832− text,
4833− current_selection.clone(),
4834− dir,
4835− movement,
4836− );
4837−
4838− doc.set_selection(view.id, selection);
4839−
4840− // [TODO] temporary workaround until we're not using the idle timer to
4841− // trigger auto completions any more
4842− editor.clear_idle_timer();
4843− }
4844− };
4845−
4846− cx.editor.apply_motion(motion);
4847−}
4848−
4849−pub fn move_parent_node_end(cx: &mut Context) {
4850− move_node_bound_impl(cx, Direction::Forward, Movement::Move)
4851−}
4852−
4853−pub fn move_parent_node_start(cx: &mut Context) {
4854− move_node_bound_impl(cx, Direction::Backward, Movement::Move)
4855−}
4856−
4857−pub fn extend_parent_node_end(cx: &mut Context) {
4858− move_node_bound_impl(cx, Direction::Forward, Movement::Extend)
4859−}
4860−
4861−pub fn extend_parent_node_start(cx: &mut Context) {
4862− move_node_bound_impl(cx, Direction::Backward, Movement::Extend)
4863−}
4864−
4865fn match_brackets(cx: &mut Context) {
4643fn match_brackets(cx: &mut Context) {
4866 let (view, doc) = current!(cx.editor);
4644 let (view, doc) = current!(cx.editor);
4867 let is_select = cx.editor.mode == Mode::Select;
4645 let is_select = cx.editor.mode == Mode::Select;
@@ -4975,19 +4753,17 @@ fn transpose_view(cx: &mut Context) {
4975 cx.editor.transpose_view()
4753 cx.editor.transpose_view()
4976}
4754}
4977
4755
4978−/// Open a new split in the given direction specified by the action.
4756+// split helper, clear it later
4979−///
4980−/// Maintain the current view (both the cursor's position and view in document).
4981−fn split(editor: &mut Editor, action: Action) {
4757+fn split(cx: &mut Context, action: Action) {
4982− let (view, doc) = current!(editor);
4758+ let (view, doc) = current!(cx.editor);
4983 let id = doc.id();
4759 let id = doc.id();
4984 let selection = doc.selection(view.id).clone();
4760 let selection = doc.selection(view.id).clone();
4985 let offset = view.offset;
4761 let offset = view.offset;
4986
4762
4987− editor.switch(id, action);
4763+ cx.editor.switch(id, action);
4988
4764
4989 // match the selection in the previous view
4765 // match the selection in the previous view
4990− let (view, doc) = current!(editor);
4766+ let (view, doc) = current!(cx.editor);
4991 doc.set_selection(view.id, selection);
4767 doc.set_selection(view.id, selection);
4992 // match the view scroll offset (switch doesn't handle this fully
4768 // match the view scroll offset (switch doesn't handle this fully
4993 // since the selection is only matched after the split)
4769 // since the selection is only matched after the split)
@@ -4995,7 +4771,7 @@ fn split(editor: &mut Editor, action: Action) {
4995}
4771}
4996
4772
4997fn hsplit(cx: &mut Context) {
4773fn hsplit(cx: &mut Context) {
4998− split(cx.editor, Action::HorizontalSplit);
4774+ split(cx, Action::HorizontalSplit);
4999}
4775}
5000
4776
5001fn hsplit_new(cx: &mut Context) {
4777fn hsplit_new(cx: &mut Context) {
@@ -5003,7 +4779,7 @@ fn hsplit_new(cx: &mut Context) {
5003}
4779}
5004
4780
5005fn vsplit(cx: &mut Context) {
4781fn vsplit(cx: &mut Context) {
5006− split(cx.editor, Action::VerticalSplit);
4782+ split(cx, Action::VerticalSplit);
5007}
4783}
5008
4784
5009fn vsplit_new(cx: &mut Context) {
4785fn vsplit_new(cx: &mut Context) {
@@ -5052,12 +4828,7 @@ fn insert_register(cx: &mut Context) {
5052 if let Some(ch) = event.char() {
4828 if let Some(ch) = event.char() {
5053 cx.editor.autoinfo = None;
4829 cx.editor.autoinfo = None;
5054 cx.register = Some(ch);
4830 cx.register = Some(ch);
5055− paste(
5056− cx.editor,
5057− cx.register.unwrap_or('"'),
5058− Paste::Cursor,
4831+ paste(cx, Paste::Cursor);
5059− cx.count(),
5060− );
5061 }
4832 }
5062 })
4833 })
5063}
4834}
@@ -5141,7 +4912,8 @@ fn goto_ts_object_impl(cx: &mut Context, object: &'static str, direction: Direct
5141 editor.set_status("Syntax-tree is not available in current buffer");
4912 editor.set_status("Syntax-tree is not available in current buffer");
5142 }
4913 }
5143 };
4914 };
4915+ motion(cx.editor);
5144− cx.editor.apply_motion(motion);
4916+ cx.editor.last_motion = Some(Motion(Box::new(motion)));
5145}
4917}
5146
4918
5147fn goto_next_function(cx: &mut Context) {
4919fn goto_next_function(cx: &mut Context) {
@@ -5262,7 +5034,8 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
5262 });
5034 });
5263 doc.set_selection(view.id, selection);
5035 doc.set_selection(view.id, selection);
5264 };
5036 };
5037+ textobject(cx.editor);
5265− cx.editor.apply_motion(textobject);
5038+ cx.editor.last_motion = Some(Motion(Box::new(textobject)));
5266 }
5039 }
5267 });
5040 });
5268
5041
@@ -5352,18 +5125,11 @@ fn surround_replace(cx: &mut Context) {
5352 }
5125 }
5353 };
5126 };
5354
5127
5355− let selection = selection.clone();
5356− let ranges: SmallVec<[Range; 1]> = change_pos.iter().map(|&p| Range::point(p)).collect();
5357− doc.set_selection(
5358− view.id,
5359− Selection::new(ranges, selection.primary_index() * 2),
5360− );
5361−
5362 cx.on_next_key(move |cx, event| {
5128 cx.on_next_key(move |cx, event| {
5363 let (view, doc) = current!(cx.editor);
5129 let (view, doc) = current!(cx.editor);
5364 let to = match event.char() {
5130 let to = match event.char() {
5365 Some(to) => to,
5131 Some(to) => to,
5366− None => return doc.set_selection(view.id, selection),
5132+ None => return,
5367 };
5133 };
5368 let (open, close) = surround::get_pair(to);
5134 let (open, close) = surround::get_pair(to);
5369 let transaction = Transaction::change(
5135 let transaction = Transaction::change(
@@ -5374,7 +5140,6 @@ fn surround_replace(cx: &mut Context) {
5374 (pos, pos + 1, Some(t))
5140 (pos, pos + 1, Some(t))
5375 }),
5141 }),
5376 );
5142 );
5377− doc.set_selection(view.id, selection);
5378 doc.apply(&transaction, view.id);
5143 doc.apply(&transaction, view.id);
5379 exit_select_mode(cx);
5144 exit_select_mode(cx);
5380 });
5145 });
@@ -5609,18 +5374,12 @@ fn shell(cx: &mut compositor::Context, cmd: &str, behavior: &ShellBehavior) {
5609 };
5374 };
5610
5375
5611 // These `usize`s cannot underflow because selection ranges cannot overlap.
5376 // These `usize`s cannot underflow because selection ranges cannot overlap.
5612− let anchor = to
5377+ // Once the MSRV is 1.66.0 (mixed_integer_ops is stabilized), we can use checked
5613− .checked_add_signed(offset)
5378+ // arithmetic to assert this.
5614− .expect("Selection ranges cannot overlap")
5379+ let anchor = (to as isize + offset - deleted_len as isize) as usize;
5615− .checked_sub(deleted_len)
5616− .expect("Selection ranges cannot overlap");
5617 let new_range = Range::new(anchor, anchor + output_len).with_direction(range.direction());
5380 let new_range = Range::new(anchor, anchor + output_len).with_direction(range.direction());
5618 ranges.push(new_range);
5381 ranges.push(new_range);
5619− offset = offset
5382+ offset = offset + output_len as isize - deleted_len as isize;
5620− .checked_add_unsigned(output_len)
5621− .expect("Selection ranges cannot overlap")
5622− .checked_sub_unsigned(deleted_len)
5623− .expect("Selection ranges cannot overlap");
5624
5383
5625 changes.push((from, to, Some(output)));
5384 changes.push((from, to, Some(output)));
5626 }
5385 }
@@ -5642,7 +5401,7 @@ fn shell_prompt(cx: &mut Context, prompt: Cow<'static, str>, behavior: ShellBeha
5642 cx,
5401 cx,
5643 prompt,
5402 prompt,
5644 Some('|'),
5403 Some('|'),
5645− ui::completers::filename,
5404+ ui::completers::none,
5646 move |cx, input: &str, event: PromptEvent| {
5405 move |cx, input: &str, event: PromptEvent| {
5647 if event != PromptEvent::Validate {
5406 if event != PromptEvent::Validate {
5648 return;
5407 return;
@@ -5759,7 +5518,6 @@ fn increment_impl(cx: &mut Context, increment_direction: IncrementDirection) {
5759 let transaction = Transaction::change(doc.text(), changes.into_iter());
5518 let transaction = Transaction::change(doc.text(), changes.into_iter());
5760 let transaction = transaction.with_selection(new_selection);
5519 let transaction = transaction.with_selection(new_selection);
5761 doc.apply(&transaction, view.id);
5520 doc.apply(&transaction, view.id);
5762− exit_select_mode(cx);
5763 }
5521 }
5764}
5522}
5765
5523
@@ -5778,12 +5536,9 @@ fn record_macro(cx: &mut Context) {
5778 }
5536 }
5779 })
5537 })
5780 .collect::<String>();
5538 .collect::<String>();
5781− match cx.editor.registers.write(reg, vec![s]) {
5539+ cx.editor.registers.write(reg, vec![s]);
5782− Ok(_) => cx
5783− .editor
5540+ cx.editor
5784− .set_status(format!("Recorded to register [{}]", reg)),
5541+ .set_status(format!("Recorded to register [{}]", reg));
5785− Err(err) => cx.editor.set_error(err.to_string()),
5786− }
5787 } else {
5542 } else {
5788 let reg = cx.register.take().unwrap_or('@');
5543 let reg = cx.register.take().unwrap_or('@');
5789 cx.editor.macro_recording = Some((reg, Vec::new()));
5544 cx.editor.macro_recording = Some((reg, Vec::new()));
@@ -5803,14 +5558,8 @@ fn replay_macro(cx: &mut Context) {
5803 return;
5558 return;
5804 }
5559 }
5805
5560
5806− let keys: Vec<KeyEvent> = if let Some(keys) = cx
5561+ let keys: Vec<KeyEvent> = if let Some([keys_str]) = cx.editor.registers.read(reg) {
5807− .editor
5808− .registers
5809− .read(reg, cx.editor)
5810− .filter(|values| values.len() == 1)
5811− .map(|mut values| values.next().unwrap())
5812− {
5813− match helix_view::input::parse_macro(&keys) {
5562+ match helix_view::input::parse_macro(keys_str) {
5814 Ok(keys) => keys,
5563 Ok(keys) => keys,
5815 Err(err) => {
5564 Err(err) => {
5816 cx.editor.set_error(format!("Invalid macro: {}", err));
5565 cx.editor.set_error(format!("Invalid macro: {}", err));
helix-term/src/commands/dap.rs+5−14
@@ -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, graphics::Margin};
11+use helix_view::editor::Breakpoint;
12
12
13use serde_json::{to_value, Value};
13use serde_json::{to_value, Value};
14use tokio_stream::wrappers::UnboundedReceiverStream;
14use tokio_stream::wrappers::UnboundedReceiverStream;
@@ -217,7 +217,7 @@ pub fn dap_start_impl(
217 }
217 }
218 }
218 }
219
219
220− args.insert("cwd", to_value(helix_loader::current_working_dir())?);
220+ args.insert("cwd", to_value(std::env::current_dir().unwrap())?);
221
221
222 let args = to_value(args).unwrap();
222 let args = to_value(args).unwrap();
223
223
@@ -339,12 +339,8 @@ fn debug_parameter_prompt(
339 .to_owned();
339 .to_owned();
340
340
341 let completer = match field_type {
341 let completer = match field_type {
342− "filename" => |editor: &Editor, input: &str| {
342+ "filename" => ui::completers::filename,
343− ui::completers::filename_with_git_ignore(editor, input, false)
343+ "directory" => ui::completers::directory,
344− },
345− "directory" => |editor: &Editor, input: &str| {
346− ui::completers::directory_with_git_ignore(editor, input, false)
347− },
348 _ => ui::completers::none,
344 _ => ui::completers::none,
349 };
345 };
350
346
@@ -581,12 +577,7 @@ pub fn dap_variables(cx: &mut Context) {
581 }
577 }
582
578
583 let contents = Text::from(tui::text::Text::from(variables));
579 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− };
589− let popup = Popup::new("dap-variables", contents).margin(margin);
580+ let popup = Popup::new("dap-variables", contents);
590 cx.replace_or_push_layer("dap-variables", popup);
581 cx.replace_or_push_layer("dap-variables", popup);
591}
582}
592
583
helix-term/src/commands/lsp.rs+62−60
@@ -23,7 +23,6 @@ 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,
27 theme::Style,
26 theme::Style,
28 Document, View,
27 Document, View,
29};
28};
@@ -50,7 +49,7 @@ use std::{
50/// If there is no configured language server that supports the feature, this displays a status message.
49/// If there is no configured language server that supports the feature, this displays a status message.
51/// Using this macro in a context where the editor automatically queries the LSP
50/// Using this macro in a context where the editor automatically queries the LSP
52/// (instead of when the user explicitly does so via a keybind like `gd`)
51/// (instead of when the user explicitly does so via a keybind like `gd`)
53−/// will spam the "No configured language server supports \<feature>" status message confusingly.
52+/// will spam the "No configured language server supports <feature>" status message confusingly.
54#[macro_export]
53#[macro_export]
55macro_rules! language_server_with_feature {
54macro_rules! language_server_with_feature {
56 ($editor:expr, $doc:expr, $feature:expr) => {{
55 ($editor:expr, $doc:expr, $feature:expr) => {{
@@ -196,6 +195,7 @@ fn location_to_file_location(location: &lsp::Location) -> FileLocation {
196 (path.into(), line)
195 (path.into(), line)
197}
196}
198
197
198+// TODO: share with symbol picker(symbol.location)
199fn jump_to_location(
199fn jump_to_location(
200 editor: &mut Editor,
200 editor: &mut Editor,
201 location: &lsp::Location,
201 location: &lsp::Location,
@@ -213,16 +213,15 @@ fn jump_to_location(
213 return;
213 return;
214 }
214 }
215 };
215 };
216−
217− let doc = match editor.open(&path, action) {
216+ match editor.open(&path, action) {
218− Ok(id) => doc_mut!(editor, &id),
217+ Ok(_) => (),
219 Err(err) => {
218 Err(err) => {
220 let err = format!("failed to open path: {:?}: {:?}", location.uri, err);
219 let err = format!("failed to open path: {:?}: {:?}", location.uri, err);
221 editor.set_error(err);
220 editor.set_error(err);
222 return;
221 return;
223 }
222 }
224− };
223+ }
225− let view = view_mut!(editor);
224+ let (view, doc) = current!(editor);
226 // TODO: convert inside server
225 // TODO: convert inside server
227 let new_range =
226 let new_range =
228 if let Some(new_range) = lsp_range_to_range(doc.text(), location.range, offset_encoding) {
227 if let Some(new_range) = lsp_range_to_range(doc.text(), location.range, offset_encoding) {
@@ -234,22 +233,45 @@ fn jump_to_location(
234 // we flip the range so that the cursor sits on the start of the symbol
233 // we flip the range so that the cursor sits on the start of the symbol
235 // (for example start of the function).
234 // (for example start of the function).
236 doc.set_selection(view.id, Selection::single(new_range.head, new_range.anchor));
235 doc.set_selection(view.id, Selection::single(new_range.head, new_range.anchor));
237− if action.align_view(view, doc.id()) {
238− align_view(doc, view, Align::Center);
236+ align_view(doc, view, Align::Center);
239− }
240}
237}
241
238
242type SymbolPicker = Picker<SymbolInformationItem>;
239type SymbolPicker = Picker<SymbolInformationItem>;
243
240
244fn sym_picker(symbols: Vec<SymbolInformationItem>, current_path: Option<lsp::Url>) -> SymbolPicker {
241fn sym_picker(symbols: Vec<SymbolInformationItem>, current_path: Option<lsp::Url>) -> SymbolPicker {
245 // TODO: drop current_path comparison and instead use workspace: bool flag?
242 // TODO: drop current_path comparison and instead use workspace: bool flag?
246− Picker::new(symbols, current_path, move |cx, item, action| {
243+ Picker::new(symbols, current_path.clone(), move |cx, item, action| {
247− jump_to_location(
248− cx.editor,
244+ let (view, doc) = current!(cx.editor);
245+ push_jump(view, doc);
246+
247+ if current_path.as_ref() != Some(&item.symbol.location.uri) {
249− &item.symbol.location,
248+ let uri = &item.symbol.location.uri;
249+ let path = match uri.to_file_path() {
250+ Ok(path) => path,
251+ Err(_) => {
252+ let err = format!("unable to convert URI to filepath: {}", uri);
253+ cx.editor.set_error(err);
254+ return;
255+ }
256+ };
257+ if let Err(err) = cx.editor.open(&path, action) {
258+ let err = format!("failed to open document: {}: {}", uri, err);
259+ log::error!("{}", err);
260+ cx.editor.set_error(err);
261+ return;
262+ }
263+ }
264+
265+ let (view, doc) = current!(cx.editor);
266+
267+ if let Some(range) =
250− item.offset_encoding,
268+ lsp_range_to_range(doc.text(), item.symbol.location.range, item.offset_encoding)
251− action,
269+ {
252− );
270+ // we flip the range so that the cursor sits on the start of the symbol
271+ // (for example start of the function).
272+ doc.set_selection(view.id, Selection::single(range.head, range.anchor));
273+ align_view(doc, view, Align::Center);
274+ }
253 })
275 })
254 .with_preview(move |_editor, item| Some(location_to_file_location(&item.symbol.location)))
276 .with_preview(move |_editor, item| Some(location_to_file_location(&item.symbol.location)))
255 .truncate_start(false)
277 .truncate_start(false)
@@ -264,7 +286,7 @@ enum DiagnosticsFormat {
264fn diag_picker(
286fn diag_picker(
265 cx: &Context,
287 cx: &Context,
266 diagnostics: BTreeMap<lsp::Url, Vec<(lsp::Diagnostic, usize)>>,
288 diagnostics: BTreeMap<lsp::Url, Vec<(lsp::Diagnostic, usize)>>,
267− _current_path: Option<lsp::Url>,
289+ current_path: Option<lsp::Url>,
268 format: DiagnosticsFormat,
290 format: DiagnosticsFormat,
269) -> Picker<PickerDiagnostic> {
291) -> Picker<PickerDiagnostic> {
270 // TODO: drop current_path comparison and instead use workspace: bool flag?
292 // TODO: drop current_path comparison and instead use workspace: bool flag?
@@ -302,12 +324,22 @@ fn diag_picker(
302 offset_encoding,
324 offset_encoding,
303 },
325 },
304 action| {
326 action| {
305− jump_to_location(
327+ if current_path.as_ref() == Some(url) {
306− cx.editor,
328+ let (view, doc) = current!(cx.editor);
307− &lsp::Location::new(url.clone(), diag.range),
329+ push_jump(view, doc);
308− *offset_encoding,
330+ } else {
309− action,
331+ let path = url.to_file_path().unwrap();
310− )
332+ cx.editor.open(&path, action).expect("editor.open failed");
333+ }
334+
335+ let (view, doc) = current!(cx.editor);
336+
337+ if let Some(range) = lsp_range_to_range(doc.text(), diag.range, *offset_encoding) {
338+ // we flip the range so that the cursor sits on the start of the symbol
339+ // (for example start of the function).
340+ doc.set_selection(view.id, Selection::single(range.head, range.anchor));
341+ align_view(doc, view, Align::Center);
342+ }
311 },
343 },
312 )
344 )
313 .with_preview(move |_editor, PickerDiagnostic { url, diag, .. }| {
345 .with_preview(move |_editor, PickerDiagnostic { url, diag, .. }| {
@@ -698,8 +730,7 @@ pub fn code_action(cx: &mut Context) {
698
730
699 // always present here
731 // always present here
700 let action = action.unwrap();
732 let action = action.unwrap();
701− let Some(language_server) = editor.language_server_by_id(action.language_server_id)
733+ let Some(language_server) = editor.language_server_by_id(action.language_server_id) else {
702− else {
703 editor.set_error("Language Server disappeared");
734 editor.set_error("Language Server disappeared");
704 return;
735 return;
705 };
736 };
@@ -712,25 +743,7 @@ pub fn code_action(cx: &mut Context) {
712 }
743 }
713 lsp::CodeActionOrCommand::CodeAction(code_action) => {
744 lsp::CodeActionOrCommand::CodeAction(code_action) => {
714 log::debug!("code action: {:?}", code_action);
745 log::debug!("code action: {:?}", code_action);
715− // we support lsp "codeAction/resolve" for `edit` and `command` fields
716− let mut resolved_code_action = None;
717− if code_action.edit.is_none() || code_action.command.is_none() {
718− if let Some(future) =
719− language_server.resolve_code_action(code_action.clone())
720− {
721− if let Ok(response) = helix_lsp::block_on(future) {
722− if let Ok(code_action) =
723− serde_json::from_value::<CodeAction>(response)
724− {
725− resolved_code_action = Some(code_action);
726− }
727− }
728− }
729− }
730− let resolved_code_action =
731− resolved_code_action.as_ref().unwrap_or(code_action);
732−
733− if let Some(ref workspace_edit) = resolved_code_action.edit {
746+ if let Some(ref workspace_edit) = code_action.edit {
734 log::debug!("edit: {:?}", workspace_edit);
747 log::debug!("edit: {:?}", workspace_edit);
735 let _ = apply_workspace_edit(editor, offset_encoding, workspace_edit);
748 let _ = apply_workspace_edit(editor, offset_encoding, workspace_edit);
736 }
749 }
@@ -745,16 +758,7 @@ pub fn code_action(cx: &mut Context) {
745 });
758 });
746 picker.move_down(); // pre-select the first item
759 picker.move_down(); // pre-select the first item
747
760
748− let margin = if editor.menu_border() {
749− Margin::vertical(1)
750− } else {
751− Margin::none()
752− };
753−
754− let popup = Popup::new("code-action", picker)
761+ let popup = Popup::new("code-action", picker).with_scrollbar(false);
755− .with_scrollbar(false)
756− .margin(margin);
757−
758 compositor.replace_or_push("code-action", popup);
762 compositor.replace_or_push("code-action", popup);
759 };
763 };
760
764
@@ -1029,7 +1033,7 @@ fn goto_impl(
1029 locations: Vec<lsp::Location>,
1033 locations: Vec<lsp::Location>,
1030 offset_encoding: OffsetEncoding,
1034 offset_encoding: OffsetEncoding,
1031) {
1035) {
1032− let cwdir = helix_loader::current_working_dir();
1036+ let cwdir = std::env::current_dir().unwrap_or_default();
1033
1037
1034 match locations.as_slice() {
1038 match locations.as_slice() {
1035 [location] => {
1039 [location] => {
@@ -1169,8 +1173,7 @@ pub fn signature_help_impl(cx: &mut Context, invoked: SignatureHelpInvoked) {
1169 // Do not show the message if signature help was invoked
1173 // Do not show the message if signature help was invoked
1170 // automatically on backspace, trigger characters, etc.
1174 // automatically on backspace, trigger characters, etc.
1171 if invoked == SignatureHelpInvoked::Manual {
1175 if invoked == SignatureHelpInvoked::Manual {
1172− cx.editor
1173− .set_error("No configured language server supports signature-help");
1176+ cx.editor.set_error("No configured language server supports signature-help");
1174 }
1177 }
1175 return;
1178 return;
1176 };
1179 };
@@ -1395,8 +1398,7 @@ pub fn rename_symbol(cx: &mut Context) {
1395 .language_servers_with_feature(LanguageServerFeature::RenameSymbol)
1398 .language_servers_with_feature(LanguageServerFeature::RenameSymbol)
1396 .find(|ls| language_server_id.map_or(true, |id| id == ls.id()))
1399 .find(|ls| language_server_id.map_or(true, |id| id == ls.id()))
1397 else {
1400 else {
1398− cx.editor
1399− .set_error("No configured language server supports symbol renaming");
1401+ cx.editor.set_error("No configured language server supports symbol renaming");
1400 return;
1402 return;
1401 };
1403 };
1402
1404
helix-term/src/commands/typed.rs+699−927
@@ -5,10 +5,7 @@ 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;
10−use helix_core::{encoding, line_ending, path::get_canonicalized_path, shellwords::Shellwords};
8+use helix_core::{encoding, shellwords::Shellwords};
11−use helix_lsp::{OffsetEncoding, Url};
12use helix_view::document::DEFAULT_LANGUAGE_NAME;
9use helix_view::document::DEFAULT_LANGUAGE_NAME;
13use helix_view::editor::{Action, CloseError, ConfigEvent};
10use helix_view::editor::{Action, CloseError, ConfigEvent};
14use serde_json::Value;
11use serde_json::Value;
@@ -332,16 +329,12 @@ fn write_impl(
332 path: Option<&Cow<str>>,
329 path: Option<&Cow<str>>,
333 force: bool,
330 force: bool,
334) -> anyhow::Result<()> {
331) -> anyhow::Result<()> {
335− let config = cx.editor.config();
332+ let editor_auto_fmt = cx.editor.config().auto_format;
336 let jobs = &mut cx.jobs;
333 let jobs = &mut cx.jobs;
337 let (view, doc) = current!(cx.editor);
334 let (view, doc) = current!(cx.editor);
338 let path = path.map(AsRef::as_ref);
335 let path = path.map(AsRef::as_ref);
339
336
340− if config.insert_final_newline {
337+ let fmt = if editor_auto_fmt {
341− insert_final_newline(doc, view);
342− }
343−
344− let fmt = if config.auto_format {
345 doc.auto_format().map(|fmt| {
338 doc.auto_format().map(|fmt| {
346 let callback = make_format_callback(
339 let callback = make_format_callback(
347 doc.id(),
340 doc.id(),
@@ -365,16 +358,6 @@ fn write_impl(
365 Ok(())
358 Ok(())
366}
359}
367
360
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−
378fn write(
361fn write(
379 cx: &mut compositor::Context,
362 cx: &mut compositor::Context,
380 args: &[Cow<str>],
363 args: &[Cow<str>],
@@ -477,7 +460,8 @@ fn set_indent_style(
477 cx.editor.set_status(match style {
460 cx.editor.set_status(match style {
478 Tabs => "tabs".to_owned(),
461 Tabs => "tabs".to_owned(),
479 Spaces(1) => "1 space".to_owned(),
462 Spaces(1) => "1 space".to_owned(),
480− Spaces(n) => format!("{} spaces", n),
463+ Spaces(n) if (2..=8).contains(&n) => format!("{} spaces", n),
464+ _ => unreachable!(), // Shouldn't happen.
481 });
465 });
482 return Ok(());
466 return Ok(());
483 }
467 }
@@ -489,7 +473,7 @@ fn set_indent_style(
489 Some(arg) => arg
473 Some(arg) => arg
490 .parse::<u8>()
474 .parse::<u8>()
491 .ok()
475 .ok()
492− .filter(|n| (1..=MAX_INDENT).contains(n))
476+ .filter(|n| (1..=8).contains(n))
493 .map(Spaces),
477 .map(Spaces),
494 _ => None,
478 _ => None,
495 };
479 };
@@ -574,6 +558,7 @@ fn set_line_ending(
574
558
575 Ok(())
559 Ok(())
576}
560}
561+
577fn earlier(
562fn earlier(
578 cx: &mut compositor::Context,
563 cx: &mut compositor::Context,
579 args: &[Cow<str>],
564 args: &[Cow<str>],
@@ -672,10 +657,11 @@ pub fn write_all_impl(
672 write_scratch: bool,
657 write_scratch: bool,
673) -> anyhow::Result<()> {
658) -> anyhow::Result<()> {
674 let mut errors: Vec<&'static str> = Vec::new();
659 let mut errors: Vec<&'static str> = Vec::new();
675− let config = cx.editor.config();
660+ let auto_format = cx.editor.config().auto_format;
676 let jobs = &mut cx.jobs;
661 let jobs = &mut cx.jobs;
677 let current_view = view!(cx.editor);
662 let current_view = view!(cx.editor);
678
663
664+ // save all documents
679 let saves: Vec<_> = cx
665 let saves: Vec<_> = cx
680 .editor
666 .editor
681 .documents
667 .documents
@@ -686,7 +672,7 @@ pub fn write_all_impl(
686 }
672 }
687 if doc.path().is_none() {
673 if doc.path().is_none() {
688 if write_scratch {
674 if write_scratch {
689− errors.push("cannot write a buffer without a filename");
675+ errors.push("cannot write a buffer without a filename\n");
690 }
676 }
691 return None;
677 return None;
692 }
678 }
@@ -706,35 +692,32 @@ pub fn write_all_impl(
706 current_view.id
692 current_view.id
707 };
693 };
708
694
709− Some((doc.id(), target_view))
695+ let fmt = if auto_format {
696+ doc.auto_format().map(|fmt| {
697+ let callback = make_format_callback(
698+ doc.id(),
699+ doc.version(),
700+ target_view,
701+ fmt,
702+ Some((None, force)),
710− })
703+ );
711− .collect();
704+ jobs.add(Job::with_callback(callback).wait_before_exiting());
712−
705+ })
713− for (doc_id, target_view) in saves {
706+ } else {
714− let doc = doc_mut!(cx.editor, &doc_id);
707+ None
708+ };
715
709
716− if config.insert_final_newline {
710+ if fmt.is_none() {
717− insert_final_newline(doc, view_mut!(cx.editor, target_view));
711+ return Some(doc.id());
718− }
712+ }
719
713
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 {
732 None
714 None
733− };
715+ })
716+ .collect();
734
717
735− if fmt.is_none() {
718+ // manually call save for the rest of docs that don't have a formatter
719+ for id in saves {
736− cx.editor.save::<PathBuf>(doc_id, None, force)?;
720+ cx.editor.save::<PathBuf>(id, None, force)?;
737− }
738 }
721 }
739
722
740 if !errors.is_empty() && !force {
723 if !errors.is_empty() && !force {
@@ -756,18 +739,6 @@ fn write_all(
756 write_all_impl(cx, false, true)
739 write_all_impl(cx, false, true)
757}
740}
758
741
759−fn force_write_all(
760− cx: &mut compositor::Context,
761− _args: &[Cow<str>],
762− event: PromptEvent,
763−) -> anyhow::Result<()> {
764− if event != PromptEvent::Validate {
765− return Ok(());
766− }
767−
768− write_all_impl(cx, true, true)
769−}
770−
771fn write_all_quit(
742fn write_all_quit(
772 cx: &mut compositor::Context,
743 cx: &mut compositor::Context,
773 _args: &[Cow<str>],
744 _args: &[Cow<str>],
@@ -921,8 +892,7 @@ fn yank_main_selection_to_clipboard(
921 return Ok(());
892 return Ok(());
922 }
893 }
923
894
924− yank_primary_selection_impl(cx.editor, '+');
895+ yank_main_selection_to_clipboard_impl(cx.editor, ClipboardType::Clipboard)
925− Ok(())
926}
896}
927
897
928fn yank_joined(
898fn yank_joined(
@@ -956,8 +926,7 @@ fn yank_joined_to_clipboard(
956 let doc = doc!(cx.editor);
926 let doc = doc!(cx.editor);
957 let default_sep = Cow::Borrowed(doc.line_ending.as_str());
927 let default_sep = Cow::Borrowed(doc.line_ending.as_str());
958 let separator = args.first().unwrap_or(&default_sep);
928 let separator = args.first().unwrap_or(&default_sep);
959− yank_joined_impl(cx.editor, separator, '+');
929+ yank_joined_to_clipboard_impl(cx.editor, separator, ClipboardType::Clipboard)
960− Ok(())
961}
930}
962
931
963fn yank_main_selection_to_primary_clipboard(
932fn yank_main_selection_to_primary_clipboard(
@@ -969,8 +938,7 @@ fn yank_main_selection_to_primary_clipboard(
969 return Ok(());
938 return Ok(());
970 }
939 }
971
940
972− yank_primary_selection_impl(cx.editor, '*');
941+ yank_main_selection_to_clipboard_impl(cx.editor, ClipboardType::Selection)
973− Ok(())
974}
942}
975
943
976fn yank_joined_to_primary_clipboard(
944fn yank_joined_to_primary_clipboard(
@@ -985,8 +953,7 @@ fn yank_joined_to_primary_clipboard(
985 let doc = doc!(cx.editor);
953 let doc = doc!(cx.editor);
986 let default_sep = Cow::Borrowed(doc.line_ending.as_str());
954 let default_sep = Cow::Borrowed(doc.line_ending.as_str());
987 let separator = args.first().unwrap_or(&default_sep);
955 let separator = args.first().unwrap_or(&default_sep);
988− yank_joined_impl(cx.editor, separator, '*');
956+ yank_joined_to_clipboard_impl(cx.editor, separator, ClipboardType::Selection)
989− Ok(())
990}
957}
991
958
992fn paste_clipboard_after(
959fn paste_clipboard_after(
@@ -998,8 +965,7 @@ fn paste_clipboard_after(
998 return Ok(());
965 return Ok(());
999 }
966 }
1000
967
1001− paste(cx.editor, '+', Paste::After, 1);
968+ paste_clipboard_impl(cx.editor, Paste::After, ClipboardType::Clipboard, 1)
1002− Ok(())
1003}
969}
1004
970
1005fn paste_clipboard_before(
971fn paste_clipboard_before(
@@ -1011,8 +977,7 @@ fn paste_clipboard_before(
1011 return Ok(());
977 return Ok(());
1012 }
978 }
1013
979
1014− paste(cx.editor, '+', Paste::Before, 1);
980+ paste_clipboard_impl(cx.editor, Paste::Before, ClipboardType::Clipboard, 1)
1015− Ok(())
1016}
981}
1017
982
1018fn paste_primary_clipboard_after(
983fn paste_primary_clipboard_after(
@@ -1024,8 +989,7 @@ fn paste_primary_clipboard_after(
1024 return Ok(());
989 return Ok(());
1025 }
990 }
1026
991
1027− paste(cx.editor, '*', Paste::After, 1);
992+ paste_clipboard_impl(cx.editor, Paste::After, ClipboardType::Selection, 1)
1028− Ok(())
1029}
993}
1030
994
1031fn paste_primary_clipboard_before(
995fn paste_primary_clipboard_before(
@@ -1037,8 +1001,30 @@ fn paste_primary_clipboard_before(
1037 return Ok(());
1001 return Ok(());
1038 }
1002 }
1039
1003
1040− paste(cx.editor, '*', Paste::Before, 1);
1004+ paste_clipboard_impl(cx.editor, Paste::Before, ClipboardType::Selection, 1)
1041− Ok(())
1005+}
1006+
1007+fn replace_selections_with_clipboard_impl(
1008+ cx: &mut compositor::Context,
1009+ clipboard_type: ClipboardType,
1010+) -> anyhow::Result<()> {
1011+ let scrolloff = cx.editor.config().scrolloff;
1012+ let (view, doc) = current!(cx.editor);
1013+
1014+ match cx.editor.clipboard_provider.get_contents(clipboard_type) {
1015+ Ok(contents) => {
1016+ let selection = doc.selection(view.id);
1017+ let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
1018+ (range.from(), range.to(), Some(contents.as_str().into()))
1019+ });
1020+
1021+ doc.apply(&transaction, view.id);
1022+ doc.append_changes_to_history(view);
1023+ view.ensure_cursor_in_view(doc, scrolloff);
1024+ Ok(())
1025+ }
1026+ Err(e) => Err(e.context("Couldn't get system clipboard contents")),
1027+ }
1042}
1028}
1043
1029
1044fn replace_selections_with_clipboard(
1030fn replace_selections_with_clipboard(
@@ -1050,8 +1036,7 @@ fn replace_selections_with_clipboard(
1050 return Ok(());
1036 return Ok(());
1051 }
1037 }
1052
1038
1053− replace_with_yanked_impl(cx.editor, '+', 1);
1039+ replace_selections_with_clipboard_impl(cx, ClipboardType::Clipboard)
1054− Ok(())
1055}
1040}
1056
1041
1057fn replace_selections_with_primary_clipboard(
1042fn replace_selections_with_primary_clipboard(
@@ -1063,8 +1048,7 @@ fn replace_selections_with_primary_clipboard(
1063 return Ok(());
1048 return Ok(());
1064 }
1049 }
1065
1050
1066− replace_with_yanked_impl(cx.editor, '*', 1);
1051+ replace_selections_with_clipboard_impl(cx, ClipboardType::Selection)
1067− Ok(())
1068}
1052}
1069
1053
1070fn show_clipboard_provider(
1054fn show_clipboard_provider(
@@ -1077,7 +1061,7 @@ fn show_clipboard_provider(
1077 }
1061 }
1078
1062
1079 cx.editor
1063 cx.editor
1080− .set_status(cx.editor.registers.clipboard_provider_name().to_string());
1064+ .set_status(cx.editor.clipboard_provider.name().to_string());
1081 Ok(())
1065 Ok(())
1082}
1066}
1083
1067
@@ -1097,11 +1081,14 @@ fn change_current_directory(
1097 .as_ref(),
1081 .as_ref(),
1098 );
1082 );
1099
1083
1100− helix_loader::set_current_working_dir(dir)?;
1084+ if let Err(e) = std::env::set_current_dir(dir) {
1085+ bail!("Couldn't change the current working directory: {}", e);
1086+ }
1101
1087
1088+ let cwd = std::env::current_dir().context("Couldn't get the new working directory")?;
1102 cx.editor.set_status(format!(
1089 cx.editor.set_status(format!(
1103 "Current working directory is now {}",
1090 "Current working directory is now {}",
1104− helix_loader::current_working_dir().display()
1091+ cwd.display()
1105 ));
1092 ));
1106 Ok(())
1093 Ok(())
1107}
1094}
@@ -1115,14 +1102,9 @@ fn show_current_directory(
1115 return Ok(());
1102 return Ok(());
1116 }
1103 }
1117
1104
1118− let cwd = helix_loader::current_working_dir();
1105+ let cwd = std::env::current_dir().context("Couldn't get the new working directory")?;
1106+ cx.editor
1119− let message = format!("Current working directory is {}", cwd.display());
1107+ .set_status(format!("Current working directory is {}", cwd.display()));
1120−
1121− if cwd.exists() {
1122− cx.editor.set_status(message);
1123− } else {
1124− cx.editor.set_error(format!("{} (deleted)", message));
1125− }
1126 Ok(())
1108 Ok(())
1127}
1109}
1128
1110
@@ -1282,17 +1264,12 @@ fn reload(
1282 }
1264 }
1283
1265
1284 let scrolloff = cx.editor.config().scrolloff;
1266 let scrolloff = cx.editor.config().scrolloff;
1267+ let redraw_handle = cx.editor.redraw_handle.clone();
1285 let (view, doc) = current!(cx.editor);
1268 let (view, doc) = current!(cx.editor);
1286− doc.reload(view, &cx.editor.diff_providers).map(|_| {
1269+ doc.reload(view, &cx.editor.diff_providers, redraw_handle)
1270+ .map(|_| {
1287− view.ensure_cursor_in_view(doc, scrolloff);
1271+ view.ensure_cursor_in_view(doc, scrolloff);
1288− })?;
1289− if let Some(path) = doc.path() {
1290− cx.editor
1291− .language_servers
1292− .file_event_handler
1293− .file_changed(path.clone());
1294− }
1272+ })
1295− Ok(())
1296}
1273}
1297
1274
1298fn reload_all(
1275fn reload_all(
@@ -1331,13 +1308,8 @@ fn reload_all(
1331 // Ensure that the view is synced with the document's history.
1308 // Ensure that the view is synced with the document's history.
1332 view.sync_changes(doc);
1309 view.sync_changes(doc);
1333
1310
1311+ let redraw_handle = cx.editor.redraw_handle.clone();
1334− doc.reload(view, &cx.editor.diff_providers)?;
1312+ doc.reload(view, &cx.editor.diff_providers, redraw_handle)?;
1335− if let Some(path) = doc.path() {
1336− cx.editor
1337− .language_servers
1338− .file_event_handler
1339− .file_changed(path.clone());
1340− }
1341
1313
1342 for view_id in view_ids {
1314 for view_id in view_ids {
1343 let view = view_mut!(cx.editor, view_id);
1315 let view = view_mut!(cx.editor, view_id);
@@ -1386,8 +1358,9 @@ fn lsp_workspace_command(
1386 .map(|options| (ls.id(), options))
1358 .map(|options| (ls.id(), options))
1387 })
1359 })
1388 else {
1360 else {
1389− cx.editor
1361+ cx.editor.set_status(
1390− .set_status("No active language servers for this document support workspace commands");
1362+ "No active language servers for this document support workspace commands",
1363+ );
1391 return Ok(());
1364 return Ok(());
1392 };
1365 };
1393
1366
@@ -1543,84 +1516,6 @@ fn tree_sitter_scopes(
1543 Ok(())
1516 Ok(())
1544}
1517}
1545
1518
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−
1624fn vsplit(
1519fn vsplit(
1625 cx: &mut compositor::Context,
1520 cx: &mut compositor::Context,
1626 args: &[Cow<str>],
1521 args: &[Cow<str>],
@@ -1630,8 +1525,10 @@ fn vsplit(
1630 return Ok(());
1525 return Ok(());
1631 }
1526 }
1632
1527
1528+ let id = view!(cx.editor).doc;
1529+
1633 if args.is_empty() {
1530 if args.is_empty() {
1634− split(cx.editor, Action::VerticalSplit);
1531+ cx.editor.switch(id, Action::VerticalSplit);
1635 } else {
1532 } else {
1636 for arg in args {
1533 for arg in args {
1637 cx.editor
1534 cx.editor
@@ -1651,8 +1548,10 @@ fn hsplit(
1651 return Ok(());
1548 return Ok(());
1652 }
1549 }
1653
1550
1551+ let id = view!(cx.editor).doc;
1552+
1654 if args.is_empty() {
1553 if args.is_empty() {
1655− split(cx.editor, Action::HorizontalSplit);
1554+ cx.editor.switch(id, Action::HorizontalSplit);
1656 } else {
1555 } else {
1657 for arg in args {
1556 for arg in args {
1658 cx.editor
1557 cx.editor
@@ -1767,7 +1666,7 @@ fn tutor(
1767 let path = helix_loader::runtime_file(Path::new("tutor"));
1666 let path = helix_loader::runtime_file(Path::new("tutor"));
1768 cx.editor.open(&path, Action::Replace)?;
1667 cx.editor.open(&path, Action::Replace)?;
1769 // Unset path to prevent accidentally saving to the original tutor file.
1668 // Unset path to prevent accidentally saving to the original tutor file.
1770− doc_mut!(cx.editor).set_path(None);
1669+ doc_mut!(cx.editor).set_path(None)?;
1771 Ok(())
1670 Ok(())
1772}
1671}
1773
1672
@@ -1944,29 +1843,14 @@ fn toggle_option(
1944 .to_string(),
1843 .to_string(),
1945 )
1844 )
1946 }
1845 }
1947− Value::Number(ref value) => {
1948− ensure!(
1949− args.len() > 2,
1950− "Bad arguments. For number configurations use: `:toggle key val1 val2 ...`",
1951− );
1952−
1953− Value::Number(
1954− args[1..]
1955− .iter()
1956− .skip_while(|&e| value.to_string() != *e.to_string())
1957− .nth(1)
1958− .unwrap_or_else(|| &args[1])
1959− .parse()?,
1960− )
1961− }
1962− Value::Null | Value::Object(_) | Value::Array(_) => {
1846+ Value::Null | Value::Object(_) | Value::Array(_) | Value::Number(_) => {
1963 anyhow::bail!("Configuration {key} does not support toggle yet")
1847 anyhow::bail!("Configuration {key} does not support toggle yet")
1964 }
1848 }
1965 };
1849 };
1966
1850
1967 let status = format!("'{key}' is now set to {value}");
1851 let status = format!("'{key}' is now set to {value}");
1968 let config = serde_json::from_value(config)
1852 let config = serde_json::from_value(config)
1969− .map_err(|err| anyhow::anyhow!("Cannot parse `{:?}`, {}", &args, err))?;
1853+ .map_err(|_| anyhow::anyhow!("Could not parse field: `{:?}`", &args))?;
1970
1854
1971 cx.editor
1855 cx.editor
1972 .config_events
1856 .config_events
@@ -2375,721 +2259,599 @@ fn clear_register(
2375 format!("Invalid register {}", args[0])
2259 format!("Invalid register {}", args[0])
2376 );
2260 );
2377 let register = args[0].chars().next().unwrap_or_default();
2261 let register = args[0].chars().next().unwrap_or_default();
2378− if cx.editor.registers.remove(register) {
2262+ match cx.editor.registers.remove(register) {
2263+ Some(_) => cx
2379− cx.editor
2264+ .editor
2380− .set_status(format!("Register {} cleared", register));
2265+ .set_status(format!("Register {} cleared", register)),
2381− } else {
2266+ None => cx
2382− cx.editor
2267+ .editor
2383− .set_error(format!("Register {} not found", register));
2268+ .set_error(format!("Register {} not found", register)),
2384 }
2269 }
2385 Ok(())
2270 Ok(())
2386}
2271}
2387
2272
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−
2485pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
2273pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
2486− TypableCommand {
2274+ TypableCommand {
2487− name: "quit",
2275+ name: "quit",
2488− aliases: &["q"],
2276+ aliases: &["q"],
2489− doc: "Close the current view.",
2277+ doc: "Close the current view.",
2490− fun: quit,
2278+ fun: quit,
2491− signature: CommandSignature::none(),
2279+ signature: CommandSignature::none(),
2492− },
2280+ },
2493− TypableCommand {
2281+ TypableCommand {
2494− name: "quit!",
2282+ name: "quit!",
2495− aliases: &["q!"],
2283+ aliases: &["q!"],
2496− doc: "Force close the current view, ignoring unsaved changes.",
2284+ doc: "Force close the current view, ignoring unsaved changes.",
2497− fun: force_quit,
2285+ fun: force_quit,
2498− signature: CommandSignature::none(),
2286+ signature: CommandSignature::none(),
2499− },
2287+ },
2500− TypableCommand {
2288+ TypableCommand {
2501− name: "open",
2289+ name: "open",
2502− aliases: &["o"],
2290+ aliases: &["o"],
2503− doc: "Open a file from disk into the current view.",
2291+ doc: "Open a file from disk into the current view.",
2504− fun: open,
2292+ fun: open,
2505− signature: CommandSignature::all(completers::filename),
2293+ signature: CommandSignature::all(completers::filename),
2506− },
2294+ },
2507− TypableCommand {
2295+ TypableCommand {
2508− name: "buffer-close",
2296+ name: "buffer-close",
2509− aliases: &["bc", "bclose"],
2297+ aliases: &["bc", "bclose"],
2510− doc: "Close the current buffer.",
2298+ doc: "Close the current buffer.",
2511− fun: buffer_close,
2299+ fun: buffer_close,
2512− signature: CommandSignature::all(completers::buffer),
2300+ signature: CommandSignature::all(completers::buffer),
2513− },
2301+ },
2514− TypableCommand {
2302+ TypableCommand {
2515− name: "buffer-close!",
2303+ name: "buffer-close!",
2516− aliases: &["bc!", "bclose!"],
2304+ aliases: &["bc!", "bclose!"],
2517− doc: "Close the current buffer forcefully, ignoring unsaved changes.",
2305+ doc: "Close the current buffer forcefully, ignoring unsaved changes.",
2518− fun: force_buffer_close,
2306+ fun: force_buffer_close,
2519− signature: CommandSignature::all(completers::buffer)
2307+ signature: CommandSignature::all(completers::buffer)
2520− },
2308+ },
2521− TypableCommand {
2309+ TypableCommand {
2522− name: "buffer-close-others",
2310+ name: "buffer-close-others",
2523− aliases: &["bco", "bcloseother"],
2311+ aliases: &["bco", "bcloseother"],
2524− doc: "Close all buffers but the currently focused one.",
2312+ doc: "Close all buffers but the currently focused one.",
2525− fun: buffer_close_others,
2313+ fun: buffer_close_others,
2526− signature: CommandSignature::none(),
2314+ signature: CommandSignature::none(),
2527− },
2315+ },
2528− TypableCommand {
2316+ TypableCommand {
2529− name: "buffer-close-others!",
2317+ name: "buffer-close-others!",
2530− aliases: &["bco!", "bcloseother!"],
2318+ aliases: &["bco!", "bcloseother!"],
2531− doc: "Force close all buffers but the currently focused one.",
2319+ doc: "Force close all buffers but the currently focused one.",
2532− fun: force_buffer_close_others,
2320+ fun: force_buffer_close_others,
2533− signature: CommandSignature::none(),
2321+ signature: CommandSignature::none(),
2534− },
2322+ },
2535− TypableCommand {
2323+ TypableCommand {
2536− name: "buffer-close-all",
2324+ name: "buffer-close-all",
2537− aliases: &["bca", "bcloseall"],
2325+ aliases: &["bca", "bcloseall"],
2538− doc: "Close all buffers without quitting.",
2326+ doc: "Close all buffers without quitting.",
2539− fun: buffer_close_all,
2327+ fun: buffer_close_all,
2540− signature: CommandSignature::none(),
2328+ signature: CommandSignature::none(),
2541− },
2329+ },
2542− TypableCommand {
2330+ TypableCommand {
2543− name: "buffer-close-all!",
2331+ name: "buffer-close-all!",
2544− aliases: &["bca!", "bcloseall!"],
2332+ aliases: &["bca!", "bcloseall!"],
2545− doc: "Force close all buffers ignoring unsaved changes without quitting.",
2333+ doc: "Force close all buffers ignoring unsaved changes without quitting.",
2546− fun: force_buffer_close_all,
2334+ fun: force_buffer_close_all,
2547− signature: CommandSignature::none(),
2335+ signature: CommandSignature::none(),
2548− },
2336+ },
2549− TypableCommand {
2337+ TypableCommand {
2550− name: "buffer-next",
2338+ name: "buffer-next",
2551− aliases: &["bn", "bnext"],
2339+ aliases: &["bn", "bnext"],
2552− doc: "Goto next buffer.",
2340+ doc: "Goto next buffer.",
2553− fun: buffer_next,
2341+ fun: buffer_next,
2554− signature: CommandSignature::none(),
2342+ signature: CommandSignature::none(),
2555− },
2343+ },
2556− TypableCommand {
2344+ TypableCommand {
2557− name: "buffer-previous",
2345+ name: "buffer-previous",
2558− aliases: &["bp", "bprev"],
2346+ aliases: &["bp", "bprev"],
2559− doc: "Goto previous buffer.",
2347+ doc: "Goto previous buffer.",
2560− fun: buffer_previous,
2348+ fun: buffer_previous,
2561− signature: CommandSignature::none(),
2349+ signature: CommandSignature::none(),
2562− },
2350+ },
2563− TypableCommand {
2351+ TypableCommand {
2564− name: "write",
2352+ name: "write",
2565− aliases: &["w"],
2353+ aliases: &["w"],
2566− doc: "Write changes to disk. Accepts an optional path (:write some/path.txt)",
2354+ doc: "Write changes to disk. Accepts an optional path (:write some/path.txt)",
2567− fun: write,
2355+ fun: write,
2568− signature: CommandSignature::positional(&[completers::filename]),
2356+ signature: CommandSignature::positional(&[completers::filename]),
2569− },
2357+ },
2570− TypableCommand {
2358+ TypableCommand {
2571− name: "write!",
2359+ name: "write!",
2572− aliases: &["w!"],
2360+ aliases: &["w!"],
2573− doc: "Force write changes to disk creating necessary subdirectories. Accepts an optional path (:write! some/path.txt)",
2361+ doc: "Force write changes to disk creating necessary subdirectories. Accepts an optional path (:write! some/path.txt)",
2574− fun: force_write,
2362+ fun: force_write,
2575− signature: CommandSignature::positional(&[completers::filename]),
2363+ signature: CommandSignature::positional(&[completers::filename]),
2576− },
2364+ },
2577− TypableCommand {
2365+ TypableCommand {
2578− name: "write-buffer-close",
2366+ name: "write-buffer-close",
2579− aliases: &["wbc"],
2367+ aliases: &["wbc"],
2580− doc: "Write changes to disk and closes the buffer. Accepts an optional path (:write-buffer-close some/path.txt)",
2368+ doc: "Write changes to disk and closes the buffer. Accepts an optional path (:write-buffer-close some/path.txt)",
2581− fun: write_buffer_close,
2369+ fun: write_buffer_close,
2582− signature: CommandSignature::positional(&[completers::filename]),
2370+ signature: CommandSignature::positional(&[completers::filename]),
2583− },
2371+ },
2584− TypableCommand {
2372+ TypableCommand {
2585− name: "write-buffer-close!",
2373+ name: "write-buffer-close!",
2586− aliases: &["wbc!"],
2374+ aliases: &["wbc!"],
2587− doc: "Force write changes to disk creating necessary subdirectories and closes the buffer. Accepts an optional path (:write-buffer-close! some/path.txt)",
2375+ doc: "Force write changes to disk creating necessary subdirectories and closes the buffer. Accepts an optional path (:write-buffer-close! some/path.txt)",
2588− fun: force_write_buffer_close,
2376+ fun: force_write_buffer_close,
2589− signature: CommandSignature::positional(&[completers::filename]),
2377+ signature: CommandSignature::positional(&[completers::filename]),
2590− },
2378+ },
2591− TypableCommand {
2379+ TypableCommand {
2592− name: "new",
2380+ name: "new",
2593− aliases: &["n"],
2381+ aliases: &["n"],
2594− doc: "Create a new scratch buffer.",
2382+ doc: "Create a new scratch buffer.",
2595− fun: new_file,
2383+ fun: new_file,
2596− signature: CommandSignature::none(),
2384+ // TODO: This seems to complete with a filename, but doesn't use that filename to
2597− },
2385+ // set the path of the newly created buffer.
2598− TypableCommand {
2386+ signature: CommandSignature::positional(&[completers::filename]),
2599− name: "format",
2387+ },
2600− aliases: &["fmt"],
2388+ TypableCommand {
2601− doc: "Format the file using the LSP formatter.",
2389+ name: "format",
2602− fun: format,
2390+ aliases: &["fmt"],
2603− signature: CommandSignature::none(),
2391+ doc: "Format the file using the LSP formatter.",
2604− },
2392+ fun: format,
2605− TypableCommand {
2393+ signature: CommandSignature::none(),
2606− name: "indent-style",
2394+ },
2607− aliases: &[],
2395+ TypableCommand {
2608− doc: "Set the indentation style for editing. ('t' for tabs or 1-16 for number of spaces.)",
2396+ name: "indent-style",
2609− fun: set_indent_style,
2397+ aliases: &[],
2610− signature: CommandSignature::none(),
2398+ doc: "Set the indentation style for editing. ('t' for tabs or 1-8 for number of spaces.)",
2611− },
2399+ fun: set_indent_style,
2612− TypableCommand {
2400+ signature: CommandSignature::none(),
2613− name: "line-ending",
2401+ },
2614− aliases: &[],
2402+ TypableCommand {
2615− #[cfg(not(feature = "unicode-lines"))]
2403+ name: "line-ending",
2616− doc: "Set the document's default line ending. Options: crlf, lf.",
2404+ aliases: &[],
2617− #[cfg(feature = "unicode-lines")]
2405+ #[cfg(not(feature = "unicode-lines"))]
2618− doc: "Set the document's default line ending. Options: crlf, lf, cr, ff, nel.",
2406+ doc: "Set the document's default line ending. Options: crlf, lf.",
2619− fun: set_line_ending,
2407+ #[cfg(feature = "unicode-lines")]
2620− signature: CommandSignature::none(),
2408+ doc: "Set the document's default line ending. Options: crlf, lf, cr, ff, nel.",
2621− },
2409+ fun: set_line_ending,
2622− TypableCommand {
2410+ signature: CommandSignature::none(),
2623− name: "earlier",
2411+ },
2624− aliases: &["ear"],
2412+ TypableCommand {
2625− doc: "Jump back to an earlier point in edit history. Accepts a number of steps or a time span.",
2413+ name: "earlier",
2626− fun: earlier,
2414+ aliases: &["ear"],
2627− signature: CommandSignature::none(),
2415+ doc: "Jump back to an earlier point in edit history. Accepts a number of steps or a time span.",
2628− },
2416+ fun: earlier,
2629− TypableCommand {
2417+ signature: CommandSignature::none(),
2630− name: "later",
2418+ },
2631− aliases: &["lat"],
2419+ TypableCommand {
2632− doc: "Jump to a later point in edit history. Accepts a number of steps or a time span.",
2420+ name: "later",
2633− fun: later,
2421+ aliases: &["lat"],
2634− signature: CommandSignature::none(),
2422+ doc: "Jump to a later point in edit history. Accepts a number of steps or a time span.",
2635− },
2423+ fun: later,
2636− TypableCommand {
2424+ signature: CommandSignature::none(),
2637− name: "write-quit",
2425+ },
2638− aliases: &["wq", "x"],
2426+ TypableCommand {
2639− doc: "Write changes to disk and close the current view. Accepts an optional path (:wq some/path.txt)",
2427+ name: "write-quit",
2640− fun: write_quit,
2428+ aliases: &["wq", "x"],
2641− signature: CommandSignature::positional(&[completers::filename]),
2429+ doc: "Write changes to disk and close the current view. Accepts an optional path (:wq some/path.txt)",
2642− },
2430+ fun: write_quit,
2643− TypableCommand {
2431+ signature: CommandSignature::positional(&[completers::filename]),
2644− name: "write-quit!",
2432+ },
2645− aliases: &["wq!", "x!"],
2433+ TypableCommand {
2646− doc: "Write changes to disk and close the current view forcefully. Accepts an optional path (:wq! some/path.txt)",
2434+ name: "write-quit!",
2647− fun: force_write_quit,
2435+ aliases: &["wq!", "x!"],
2648− signature: CommandSignature::positional(&[completers::filename]),
2436+ doc: "Write changes to disk and close the current view forcefully. Accepts an optional path (:wq! some/path.txt)",
2649− },
2437+ fun: force_write_quit,
2650− TypableCommand {
2438+ signature: CommandSignature::positional(&[completers::filename]),
2651− name: "write-all",
2439+ },
2652− aliases: &["wa"],
2440+ TypableCommand {
2653− doc: "Write changes from all buffers to disk.",
2441+ name: "write-all",
2654− fun: write_all,
2442+ aliases: &["wa"],
2655− signature: CommandSignature::none(),
2443+ doc: "Write changes from all buffers to disk.",
2656− },
2444+ fun: write_all,
2657− TypableCommand {
2445+ signature: CommandSignature::none(),
2658− name: "write-all!",
2446+ },
2659− aliases: &["wa!"],
2447+ TypableCommand {
2660− doc: "Forcefully write changes from all buffers to disk creating necessary subdirectories.",
2448+ name: "write-quit-all",
2661− fun: force_write_all,
2449+ aliases: &["wqa", "xa"],
2662− signature: CommandSignature::none(),
2450+ doc: "Write changes from all buffers to disk and close all views.",
2663− },
2451+ fun: write_all_quit,
2664− TypableCommand {
2452+ signature: CommandSignature::none(),
2665− name: "write-quit-all",
2453+ },
2666− aliases: &["wqa", "xa"],
2454+ TypableCommand {
2667− doc: "Write changes from all buffers to disk and close all views.",
2455+ name: "write-quit-all!",
2668− fun: write_all_quit,
2456+ aliases: &["wqa!", "xa!"],
2669− signature: CommandSignature::none(),
2457+ doc: "Write changes from all buffers to disk and close all views forcefully (ignoring unsaved changes).",
2670− },
2458+ fun: force_write_all_quit,
2671− TypableCommand {
2459+ signature: CommandSignature::none(),
2672− name: "write-quit-all!",
2460+ },
2673− aliases: &["wqa!", "xa!"],
2461+ TypableCommand {
2674− doc: "Write changes from all buffers to disk and close all views forcefully (ignoring unsaved changes).",
2462+ name: "quit-all",
2675− fun: force_write_all_quit,
2463+ aliases: &["qa"],
2676− signature: CommandSignature::none(),
2464+ doc: "Close all views.",
2677− },
2465+ fun: quit_all,
2678− TypableCommand {
2466+ signature: CommandSignature::none(),
2679− name: "quit-all",
2467+ },
2680− aliases: &["qa"],
2468+ TypableCommand {
2681− doc: "Close all views.",
2469+ name: "quit-all!",
2682− fun: quit_all,
2470+ aliases: &["qa!"],
2683− signature: CommandSignature::none(),
2471+ doc: "Force close all views ignoring unsaved changes.",
2684− },
2472+ fun: force_quit_all,
2685− TypableCommand {
2473+ signature: CommandSignature::none(),
2686− name: "quit-all!",
2474+ },
2687− aliases: &["qa!"],
2475+ TypableCommand {
2688− doc: "Force close all views ignoring unsaved changes.",
2476+ name: "cquit",
2689− fun: force_quit_all,
2477+ aliases: &["cq"],
2690− signature: CommandSignature::none(),
2478+ doc: "Quit with exit code (default 1). Accepts an optional integer exit code (:cq 2).",
2691− },
2479+ fun: cquit,
2692− TypableCommand {
2480+ signature: CommandSignature::none(),
2693− name: "cquit",
2481+ },
2694− aliases: &["cq"],
2482+ TypableCommand {
2695− doc: "Quit with exit code (default 1). Accepts an optional integer exit code (:cq 2).",
2483+ name: "cquit!",
2696− fun: cquit,
2484+ aliases: &["cq!"],
2697− signature: CommandSignature::none(),
2485+ doc: "Force quit with exit code (default 1) ignoring unsaved changes. Accepts an optional integer exit code (:cq! 2).",
2698− },
2486+ fun: force_cquit,
2699− TypableCommand {
2487+ signature: CommandSignature::none(),
2700− name: "cquit!",
2488+ },
2701− aliases: &["cq!"],
2489+ TypableCommand {
2702− doc: "Force quit with exit code (default 1) ignoring unsaved changes. Accepts an optional integer exit code (:cq! 2).",
2490+ name: "theme",
2703− fun: force_cquit,
2491+ aliases: &[],
2704− signature: CommandSignature::none(),
2492+ doc: "Change the editor theme (show current theme if no name specified).",
2705− },
2493+ fun: theme,
2706− TypableCommand {
2494+ signature: CommandSignature::positional(&[completers::theme]),
2707− name: "theme",
2495+ },
2708− aliases: &[],
2496+ TypableCommand {
2709− doc: "Change the editor theme (show current theme if no name specified).",
2497+ name: "yank-join",
2710− fun: theme,
2498+ aliases: &[],
2711− signature: CommandSignature::positional(&[completers::theme]),
2499+ doc: "Yank joined selections. A separator can be provided as first argument. Default value is newline.",
2712− },
2500+ fun: yank_joined,
2713− TypableCommand {
2501+ signature: CommandSignature::none(),
2714− name: "yank-join",
2502+ },
2715− aliases: &[],
2503+ TypableCommand {
2716− doc: "Yank joined selections. A separator can be provided as first argument. Default value is newline.",
2504+ name: "clipboard-yank",
2717− fun: yank_joined,
2505+ aliases: &[],
2718− signature: CommandSignature::none(),
2506+ doc: "Yank main selection into system clipboard.",
2719− },
2507+ fun: yank_main_selection_to_clipboard,
2720− TypableCommand {
2508+ signature: CommandSignature::none(),
2721− name: "clipboard-yank",
2509+ },
2722− aliases: &[],
2510+ TypableCommand {
2723− doc: "Yank main selection into system clipboard.",
2511+ name: "clipboard-yank-join",
2724− fun: yank_main_selection_to_clipboard,
2512+ aliases: &[],
2725− signature: CommandSignature::none(),
2513+ doc: "Yank joined selections into system clipboard. A separator can be provided as first argument. Default value is newline.", // FIXME: current UI can't display long doc.
2726− },
2514+ fun: yank_joined_to_clipboard,
2727− TypableCommand {
2515+ signature: CommandSignature::none(),
2728− name: "clipboard-yank-join",
2516+ },
2729− aliases: &[],
2517+ TypableCommand {
2730− doc: "Yank joined selections into system clipboard. A separator can be provided as first argument. Default value is newline.", // FIXME: current UI can't display long doc.
2518+ name: "primary-clipboard-yank",
2731− fun: yank_joined_to_clipboard,
2519+ aliases: &[],
2732− signature: CommandSignature::none(),
2520+ doc: "Yank main selection into system primary clipboard.",
2733− },
2521+ fun: yank_main_selection_to_primary_clipboard,
2734− TypableCommand {
2522+ signature: CommandSignature::none(),
2735− name: "primary-clipboard-yank",
2523+ },
2736− aliases: &[],
2524+ TypableCommand {
2737− doc: "Yank main selection into system primary clipboard.",
2525+ name: "primary-clipboard-yank-join",
2738− fun: yank_main_selection_to_primary_clipboard,
2526+ aliases: &[],
2739− signature: CommandSignature::none(),
2527+ doc: "Yank joined selections into system primary clipboard. A separator can be provided as first argument. Default value is newline.", // FIXME: current UI can't display long doc.
2740− },
2528+ fun: yank_joined_to_primary_clipboard,
2741− TypableCommand {
2529+ signature: CommandSignature::none(),
2742− name: "primary-clipboard-yank-join",
2530+ },
2743− aliases: &[],
2531+ TypableCommand {
2744− doc: "Yank joined selections into system primary clipboard. A separator can be provided as first argument. Default value is newline.", // FIXME: current UI can't display long doc.
2532+ name: "clipboard-paste-after",
2745− fun: yank_joined_to_primary_clipboard,
2533+ aliases: &[],
2746− signature: CommandSignature::none(),
2534+ doc: "Paste system clipboard after selections.",
2747− },
2535+ fun: paste_clipboard_after,
2748− TypableCommand {
2536+ signature: CommandSignature::none(),
2749− name: "clipboard-paste-after",
2537+ },
2750− aliases: &[],
2538+ TypableCommand {
2751− doc: "Paste system clipboard after selections.",
2539+ name: "clipboard-paste-before",
2752− fun: paste_clipboard_after,
2540+ aliases: &[],
2753− signature: CommandSignature::none(),
2541+ doc: "Paste system clipboard before selections.",
2754− },
2542+ fun: paste_clipboard_before,
2755− TypableCommand {
2543+ signature: CommandSignature::none(),
2756− name: "clipboard-paste-before",
2544+ },
2757− aliases: &[],
2545+ TypableCommand {
2758− doc: "Paste system clipboard before selections.",
2546+ name: "clipboard-paste-replace",
2759− fun: paste_clipboard_before,
2547+ aliases: &[],
2760− signature: CommandSignature::none(),
2548+ doc: "Replace selections with content of system clipboard.",
2761− },
2549+ fun: replace_selections_with_clipboard,
2762− TypableCommand {
2550+ signature: CommandSignature::none(),
2763− name: "clipboard-paste-replace",
2551+ },
2764− aliases: &[],
2552+ TypableCommand {
2765− doc: "Replace selections with content of system clipboard.",
2553+ name: "primary-clipboard-paste-after",
2766− fun: replace_selections_with_clipboard,
2554+ aliases: &[],
2767− signature: CommandSignature::none(),
2555+ doc: "Paste primary clipboard after selections.",
2768− },
2556+ fun: paste_primary_clipboard_after,
2769− TypableCommand {
2557+ signature: CommandSignature::none(),
2770− name: "primary-clipboard-paste-after",
2558+ },
2771− aliases: &[],
2559+ TypableCommand {
2772− doc: "Paste primary clipboard after selections.",
2560+ name: "primary-clipboard-paste-before",
2773− fun: paste_primary_clipboard_after,
2561+ aliases: &[],
2774− signature: CommandSignature::none(),
2562+ doc: "Paste primary clipboard before selections.",
2775− },
2563+ fun: paste_primary_clipboard_before,
2776− TypableCommand {
2564+ signature: CommandSignature::none(),
2777− name: "primary-clipboard-paste-before",
2565+ },
2778− aliases: &[],
2566+ TypableCommand {
2779− doc: "Paste primary clipboard before selections.",
2567+ name: "primary-clipboard-paste-replace",
2780− fun: paste_primary_clipboard_before,
2568+ aliases: &[],
2781− signature: CommandSignature::none(),
2569+ doc: "Replace selections with content of system primary clipboard.",
2782− },
2570+ fun: replace_selections_with_primary_clipboard,
2783− TypableCommand {
2571+ signature: CommandSignature::none(),
2784− name: "primary-clipboard-paste-replace",
2572+ },
2785− aliases: &[],
2573+ TypableCommand {
2786− doc: "Replace selections with content of system primary clipboard.",
2574+ name: "show-clipboard-provider",
2787− fun: replace_selections_with_primary_clipboard,
2575+ aliases: &[],
2788− signature: CommandSignature::none(),
2576+ doc: "Show clipboard provider name in status bar.",
2789− },
2577+ fun: show_clipboard_provider,
2790− TypableCommand {
2578+ signature: CommandSignature::none(),
2791− name: "show-clipboard-provider",
2579+ },
2792− aliases: &[],
2580+ TypableCommand {
2793− doc: "Show clipboard provider name in status bar.",
2581+ name: "change-current-directory",
2794− fun: show_clipboard_provider,
2582+ aliases: &["cd"],
2795− signature: CommandSignature::none(),
2583+ doc: "Change the current working directory.",
2796− },
2584+ fun: change_current_directory,
2797− TypableCommand {
2585+ signature: CommandSignature::positional(&[completers::directory]),
2798− name: "change-current-directory",
2586+ },
2799− aliases: &["cd"],
2587+ TypableCommand {
2800− doc: "Change the current working directory.",
2588+ name: "show-directory",
2801− fun: change_current_directory,
2589+ aliases: &["pwd"],
2802− signature: CommandSignature::positional(&[completers::directory]),
2590+ doc: "Show the current working directory.",
2803− },
2591+ fun: show_current_directory,
2804− TypableCommand {
2592+ signature: CommandSignature::none(),
2805− name: "show-directory",
2593+ },
2806− aliases: &["pwd"],
2594+ TypableCommand {
2807− doc: "Show the current working directory.",
2595+ name: "encoding",
2808− fun: show_current_directory,
2596+ aliases: &[],
2809− signature: CommandSignature::none(),
2597+ doc: "Set encoding. Based on `https://encoding.spec.whatwg.org`.",
2810− },
2598+ fun: set_encoding,
2811− TypableCommand {
2599+ signature: CommandSignature::none(),
2812− name: "encoding",
2600+ },
2813− aliases: &[],
2601+ TypableCommand {
2814− doc: "Set encoding. Based on `https://encoding.spec.whatwg.org`.",
2602+ name: "character-info",
2815− fun: set_encoding,
2603+ aliases: &["char"],
2816− signature: CommandSignature::none(),
2604+ doc: "Get info about the character under the primary cursor.",
2817− },
2605+ fun: get_character_info,
2818− TypableCommand {
2606+ signature: CommandSignature::none(),
2819− name: "character-info",
2607+ },
2820− aliases: &["char"],
2608+ TypableCommand {
2821− doc: "Get info about the character under the primary cursor.",
2609+ name: "reload",
2822− fun: get_character_info,
2610+ aliases: &["rl"],
2823− signature: CommandSignature::none(),
2611+ doc: "Discard changes and reload from the source file.",
2824− },
2612+ fun: reload,
2825− TypableCommand {
2613+ signature: CommandSignature::none(),
2826− name: "reload",
2614+ },
2827− aliases: &["rl"],
2615+ TypableCommand {
2828− doc: "Discard changes and reload from the source file.",
2616+ name: "reload-all",
2829− fun: reload,
2617+ aliases: &["rla"],
2830− signature: CommandSignature::none(),
2618+ doc: "Discard changes and reload all documents from the source files.",
2831− },
2619+ fun: reload_all,
2832− TypableCommand {
2620+ signature: CommandSignature::none(),
2833− name: "reload-all",
2621+ },
2834− aliases: &["rla"],
2622+ TypableCommand {
2835− doc: "Discard changes and reload all documents from the source files.",
2623+ name: "update",
2836− fun: reload_all,
2624+ aliases: &["u"],
2837− signature: CommandSignature::none(),
2625+ doc: "Write changes only if the file has been modified.",
2838− },
2626+ fun: update,
2839− TypableCommand {
2627+ signature: CommandSignature::none(),
2840− name: "update",
2628+ },
2841− aliases: &["u"],
2629+ TypableCommand {
2842− doc: "Write changes only if the file has been modified.",
2630+ name: "lsp-workspace-command",
2843− fun: update,
2631+ aliases: &[],
2844− signature: CommandSignature::none(),
2632+ doc: "Open workspace command picker",
2845− },
2633+ fun: lsp_workspace_command,
2846− TypableCommand {
2634+ signature: CommandSignature::positional(&[completers::lsp_workspace_command]),
2847− name: "lsp-workspace-command",
2635+ },
2848− aliases: &[],
2636+ TypableCommand {
2849− doc: "Open workspace command picker",
2637+ name: "lsp-restart",
2850− fun: lsp_workspace_command,
2638+ aliases: &[],
2851− signature: CommandSignature::positional(&[completers::lsp_workspace_command]),
2639+ doc: "Restarts the language servers used by the current doc",
2852− },
2640+ fun: lsp_restart,
2853− TypableCommand {
2641+ signature: CommandSignature::none(),
2854− name: "lsp-restart",
2642+ },
2855− aliases: &[],
2643+ TypableCommand {
2856− doc: "Restarts the language servers used by the current doc",
2644+ name: "lsp-stop",
2857− fun: lsp_restart,
2645+ aliases: &[],
2858− signature: CommandSignature::none(),
2646+ doc: "Stops the language servers that are used by the current doc",
2859− },
2647+ fun: lsp_stop,
2860− TypableCommand {
2648+ signature: CommandSignature::none(),
2861− name: "lsp-stop",
2649+ },
2862− aliases: &[],
2650+ TypableCommand {
2863− doc: "Stops the language servers that are used by the current doc",
2651+ name: "tree-sitter-scopes",
2864− fun: lsp_stop,
2652+ aliases: &[],
2865− signature: CommandSignature::none(),
2653+ doc: "Display tree sitter scopes, primarily for theming and development.",
2866− },
2654+ fun: tree_sitter_scopes,
2867− TypableCommand {
2655+ signature: CommandSignature::none(),
2868− name: "tree-sitter-scopes",
2656+ },
2869− aliases: &[],
2657+ TypableCommand {
2870− doc: "Display tree sitter scopes, primarily for theming and development.",
2658+ name: "debug-start",
2871− fun: tree_sitter_scopes,
2659+ aliases: &["dbg"],
2872− signature: CommandSignature::none(),
2660+ doc: "Start a debug session from a given template with given parameters.",
2873− },
2661+ fun: debug_start,
2874− TypableCommand {
2662+ signature: CommandSignature::none(),
2875− name: "tree-sitter-highlight-name",
2663+ },
2876− aliases: &[],
2664+ TypableCommand {
2877− doc: "Display name of tree-sitter highlight scope under the cursor.",
2665+ name: "debug-remote",
2878− fun: tree_sitter_highlight_name,
2666+ aliases: &["dbg-tcp"],
2879− signature: CommandSignature::none(),
2667+ doc: "Connect to a debug adapter by TCP address and start a debugging session from a given template with given parameters.",
2880− },
2668+ fun: debug_remote,
2881− TypableCommand {
2669+ signature: CommandSignature::none(),
2882− name: "debug-start",
2670+ },
2883− aliases: &["dbg"],
2671+ TypableCommand {
2884− doc: "Start a debug session from a given template with given parameters.",
2672+ name: "debug-eval",
2885− fun: debug_start,
2673+ aliases: &[],
2886− signature: CommandSignature::none(),
2674+ doc: "Evaluate expression in current debug context.",
2887− },
2675+ fun: debug_eval,
2888− TypableCommand {
2676+ signature: CommandSignature::none(),
2889− name: "debug-remote",
2677+ },
2890− aliases: &["dbg-tcp"],
2678+ TypableCommand {
2891− doc: "Connect to a debug adapter by TCP address and start a debugging session from a given template with given parameters.",
2679+ name: "vsplit",
2892− fun: debug_remote,
2680+ aliases: &["vs"],
2893− signature: CommandSignature::none(),
2681+ doc: "Open the file in a vertical split.",
2894− },
2682+ fun: vsplit,
2895− TypableCommand {
2683+ signature: CommandSignature::all(completers::filename)
2896− name: "debug-eval",
2684+ },
2897− aliases: &[],
2685+ TypableCommand {
2898− doc: "Evaluate expression in current debug context.",
2686+ name: "vsplit-new",
2899− fun: debug_eval,
2687+ aliases: &["vnew"],
2900− signature: CommandSignature::none(),
2688+ doc: "Open a scratch buffer in a vertical split.",
2901− },
2689+ fun: vsplit_new,
2902− TypableCommand {
2690+ signature: CommandSignature::none(),
2903− name: "vsplit",
2691+ },
2904− aliases: &["vs"],
2692+ TypableCommand {
2905− doc: "Open the file in a vertical split.",
2693+ name: "hsplit",
2906− fun: vsplit,
2694+ aliases: &["hs", "sp"],
2907− signature: CommandSignature::all(completers::filename)
2695+ doc: "Open the file in a horizontal split.",
2908− },
2696+ fun: hsplit,
2909− TypableCommand {
2697+ signature: CommandSignature::all(completers::filename)
2910− name: "vsplit-new",
2698+ },
2911− aliases: &["vnew"],
2699+ TypableCommand {
2912− doc: "Open a scratch buffer in a vertical split.",
2700+ name: "hsplit-new",
2913− fun: vsplit_new,
2701+ aliases: &["hnew"],
2914− signature: CommandSignature::none(),
2702+ doc: "Open a scratch buffer in a horizontal split.",
2915− },
2703+ fun: hsplit_new,
2916− TypableCommand {
2704+ signature: CommandSignature::none(),
2917− name: "hsplit",
2705+ },
2918− aliases: &["hs", "sp"],
2706+ TypableCommand {
2919− doc: "Open the file in a horizontal split.",
2707+ name: "tutor",
2920− fun: hsplit,
2708+ aliases: &[],
2921− signature: CommandSignature::all(completers::filename)
2709+ doc: "Open the tutorial.",
2922− },
2710+ fun: tutor,
2923− TypableCommand {
2711+ signature: CommandSignature::none(),
2924− name: "hsplit-new",
2712+ },
2925− aliases: &["hnew"],
2713+ TypableCommand {
2926− doc: "Open a scratch buffer in a horizontal split.",
2714+ name: "goto",
2927− fun: hsplit_new,
2715+ aliases: &["g"],
2928− signature: CommandSignature::none(),
2716+ doc: "Goto line number.",
2929− },
2717+ fun: goto_line_number,
2930− TypableCommand {
2718+ signature: CommandSignature::none(),
2931− name: "tutor",
2719+ },
2932− aliases: &[],
2720+ TypableCommand {
2933− doc: "Open the tutorial.",
2721+ name: "set-language",
2934− fun: tutor,
2722+ aliases: &["lang"],
2935− signature: CommandSignature::none(),
2723+ doc: "Set the language of current buffer (show current language if no value specified).",
2936− },
2724+ fun: language,
2937− TypableCommand {
2725+ signature: CommandSignature::positional(&[completers::language]),
2938− name: "goto",
2726+ },
2939− aliases: &["g"],
2727+ TypableCommand {
2940− doc: "Goto line number.",
2728+ name: "set-option",
2941− fun: goto_line_number,
2729+ aliases: &["set"],
2942− signature: CommandSignature::none(),
2730+ doc: "Set a config option at runtime.\nFor example to disable smart case search, use `:set search.smart-case false`.",
2943− },
2731+ fun: set_option,
2944− TypableCommand {
2732+ // TODO: Add support for completion of the options value(s), when appropriate.
2945− name: "set-language",
2733+ signature: CommandSignature::positional(&[completers::setting]),
2946− aliases: &["lang"],
2734+ },
2947− doc: "Set the language of current buffer (show current language if no value specified).",
2735+ TypableCommand {
2948− fun: language,
2736+ name: "toggle-option",
2949− signature: CommandSignature::positional(&[completers::language]),
2737+ aliases: &["toggle"],
2950− },
2738+ doc: "Toggle a boolean config option at runtime.\nFor example to toggle smart case search, use `:toggle search.smart-case`.",
2951− TypableCommand {
2739+ fun: toggle_option,
2952− name: "set-option",
2740+ signature: CommandSignature::positional(&[completers::setting]),
2953− aliases: &["set"],
2741+ },
2954− doc: "Set a config option at runtime.\nFor example to disable smart case search, use `:set search.smart-case false`.",
2742+ TypableCommand {
2955− fun: set_option,
2743+ name: "get-option",
2956− // TODO: Add support for completion of the options value(s), when appropriate.
2744+ aliases: &["get"],
2957− signature: CommandSignature::positional(&[completers::setting]),
2745+ doc: "Get the current value of a config option.",
2958− },
2746+ fun: get_option,
2959− TypableCommand {
2747+ signature: CommandSignature::positional(&[completers::setting]),
2960− name: "toggle-option",
2748+ },
2961− aliases: &["toggle"],
2749+ TypableCommand {
2962− doc: "Toggle a boolean config option at runtime.\nFor example to toggle smart case search, use `:toggle search.smart-case`.",
2750+ name: "sort",
2963− fun: toggle_option,
2751+ aliases: &[],
2964− signature: CommandSignature::positional(&[completers::setting]),
2752+ doc: "Sort ranges in selection.",
2965− },
2753+ fun: sort,
2966− TypableCommand {
2754+ signature: CommandSignature::none(),
2967− name: "get-option",
2755+ },
2968− aliases: &["get"],
2756+ TypableCommand {
2969− doc: "Get the current value of a config option.",
2757+ name: "rsort",
2970− fun: get_option,
2758+ aliases: &[],
2971− signature: CommandSignature::positional(&[completers::setting]),
2759+ doc: "Sort ranges in selection in reverse order.",
2972− },
2760+ fun: sort_reverse,
2973− TypableCommand {
2761+ signature: CommandSignature::none(),
2974− name: "sort",
2762+ },
2975− aliases: &[],
2763+ TypableCommand {
2976− doc: "Sort ranges in selection.",
2764+ name: "reflow",
2977− fun: sort,
2765+ aliases: &[],
2978− signature: CommandSignature::none(),
2766+ doc: "Hard-wrap the current selection of lines to a given width.",
2979− },
2767+ fun: reflow,
2980− TypableCommand {
2768+ signature: CommandSignature::none(),
2981− name: "rsort",
2769+ },
2982− aliases: &[],
2770+ TypableCommand {
2983− doc: "Sort ranges in selection in reverse order.",
2771+ name: "tree-sitter-subtree",
2984− fun: sort_reverse,
2772+ aliases: &["ts-subtree"],
2985− signature: CommandSignature::none(),
2773+ doc: "Display tree sitter subtree under cursor, primarily for debugging queries.",
2986− },
2774+ fun: tree_sitter_subtree,
2987− TypableCommand {
2775+ signature: CommandSignature::none(),
2988− name: "reflow",
2776+ },
2989− aliases: &[],
2777+ TypableCommand {
2990− doc: "Hard-wrap the current selection of lines to a given width.",
2778+ name: "config-reload",
2991− fun: reflow,
2779+ aliases: &[],
2992− signature: CommandSignature::none(),
2780+ doc: "Refresh user config.",
2993− },
2781+ fun: refresh_config,
2994− TypableCommand {
2782+ signature: CommandSignature::none(),
2995− name: "tree-sitter-subtree",
2783+ },
2996− aliases: &["ts-subtree"],
2784+ TypableCommand {
2997− doc: "Display tree sitter subtree under cursor, primarily for debugging queries.",
2785+ name: "config-open",
2998− fun: tree_sitter_subtree,
2786+ aliases: &[],
2999− signature: CommandSignature::none(),
2787+ doc: "Open the user config.toml file.",
3000− },
2788+ fun: open_config,
3001− TypableCommand {
2789+ signature: CommandSignature::none(),
3002− name: "config-reload",
2790+ },
3003− aliases: &[],
2791+ TypableCommand {
3004− doc: "Refresh user config.",
2792+ name: "config-open-workspace",
3005− fun: refresh_config,
2793+ aliases: &[],
3006− signature: CommandSignature::none(),
2794+ doc: "Open the workspace config.toml file.",
3007− },
2795+ fun: open_workspace_config,
3008− TypableCommand {
2796+ signature: CommandSignature::none(),
3009− name: "config-open",
2797+ },
3010− aliases: &[],
2798+ TypableCommand {
3011− doc: "Open the user config.toml file.",
2799+ name: "log-open",
3012− fun: open_config,
2800+ aliases: &[],
3013− signature: CommandSignature::none(),
2801+ doc: "Open the helix log file.",
3014− },
2802+ fun: open_log,
3015− TypableCommand {
2803+ signature: CommandSignature::none(),
3016− name: "config-open-workspace",
2804+ },
3017− aliases: &[],
2805+ TypableCommand {
3018− doc: "Open the workspace config.toml file.",
2806+ name: "insert-output",
3019− fun: open_workspace_config,
2807+ aliases: &[],
3020− signature: CommandSignature::none(),
2808+ doc: "Run shell command, inserting output before each selection.",
3021− },
2809+ fun: insert_output,
3022− TypableCommand {
2810+ signature: CommandSignature::none(),
3023− name: "log-open",
2811+ },
3024− aliases: &[],
2812+ TypableCommand {
3025− doc: "Open the helix log file.",
2813+ name: "append-output",
3026− fun: open_log,
2814+ aliases: &[],
3027− signature: CommandSignature::none(),
2815+ doc: "Run shell command, appending output after each selection.",
3028− },
2816+ fun: append_output,
3029− TypableCommand {
2817+ signature: CommandSignature::none(),
3030− name: "insert-output",
2818+ },
3031− aliases: &[],
2819+ TypableCommand {
3032− doc: "Run shell command, inserting output before each selection.",
2820+ name: "pipe",
3033− fun: insert_output,
2821+ aliases: &[],
3034− signature: CommandSignature::none(),
2822+ doc: "Pipe each selection to the shell command.",
3035− },
2823+ fun: pipe,
3036− TypableCommand {
2824+ signature: CommandSignature::none(),
3037− name: "append-output",
2825+ },
3038− aliases: &[],
2826+ TypableCommand {
3039− doc: "Run shell command, appending output after each selection.",
2827+ name: "pipe-to",
3040− fun: append_output,
2828+ aliases: &[],
3041− signature: CommandSignature::none(),
2829+ doc: "Pipe each selection to the shell command, ignoring output.",
3042− },
2830+ fun: pipe_to,
3043− TypableCommand {
2831+ signature: CommandSignature::none(),
3044− name: "pipe",
2832+ },
3045− aliases: &[],
2833+ TypableCommand {
3046− doc: "Pipe each selection to the shell command.",
2834+ name: "run-shell-command",
3047− fun: pipe,
2835+ aliases: &["sh"],
3048− signature: CommandSignature::none(),
2836+ doc: "Run a shell command",
3049− },
2837+ fun: run_shell_command,
3050− TypableCommand {
2838+ signature: CommandSignature::all(completers::filename)
3051− name: "pipe-to",
2839+ },
3052− aliases: &[],
2840+ TypableCommand {
3053− doc: "Pipe each selection to the shell command, ignoring output.",
2841+ name: "reset-diff-change",
3054− fun: pipe_to,
2842+ aliases: &["diffget", "diffg"],
3055− signature: CommandSignature::none(),
2843+ doc: "Reset the diff change at the cursor position.",
3056− },
2844+ fun: reset_diff_change,
3057− TypableCommand {
2845+ signature: CommandSignature::none(),
3058− name: "run-shell-command",
2846+ },
3059− aliases: &["sh"],
2847+ TypableCommand {
3060− doc: "Run a shell command",
2848+ name: "clear-register",
3061− fun: run_shell_command,
2849+ aliases: &[],
3062− signature: CommandSignature::all(completers::filename)
2850+ doc: "Clear given register. If no argument is provided, clear all registers.",
3063− },
2851+ fun: clear_register,
3064− TypableCommand {
2852+ signature: CommandSignature::none(),
3065− name: "reset-diff-change",
2853+ },
3066− aliases: &["diffget", "diffg"],
2854+ ];
3067− doc: "Reset the diff change at the cursor position.",
3068− fun: reset_diff_change,
3069− signature: CommandSignature::none(),
3070− },
3071− TypableCommand {
3072− name: "clear-register",
3073− aliases: &[],
3074− doc: "Clear given register. If no argument is provided, clear all registers.",
3075− fun: clear_register,
3076− signature: CommandSignature::none(),
3077− },
3078− TypableCommand {
3079− name: "redraw",
3080− aliases: &[],
3081− doc: "Clear and re-render the whole UI",
3082− fun: redraw,
3083− signature: CommandSignature::none(),
3084− },
3085− TypableCommand {
3086− name: "move",
3087− aliases: &[],
3088− doc: "Move the current buffer and its corresponding file to a different path",
3089− fun: move_buffer,
3090− signature: CommandSignature::positional(&[completers::filename]),
3091− },
3092−];
3093
2855
3094pub static TYPABLE_COMMAND_MAP: Lazy<HashMap<&'static str, &'static TypableCommand>> =
2856pub static TYPABLE_COMMAND_MAP: Lazy<HashMap<&'static str, &'static TypableCommand>> =
3095 Lazy::new(|| {
2857 Lazy::new(|| {
@@ -3108,18 +2870,28 @@ pub(super) fn command_mode(cx: &mut Context) {
3108 ":".into(),
2870 ":".into(),
3109 Some(':'),
2871 Some(':'),
3110 |editor: &Editor, input: &str| {
2872 |editor: &Editor, input: &str| {
2873+ static FUZZY_MATCHER: Lazy<fuzzy_matcher::skim::SkimMatcherV2> =
2874+ Lazy::new(fuzzy_matcher::skim::SkimMatcherV2::default);
2875+
3111 let shellwords = Shellwords::from(input);
2876 let shellwords = Shellwords::from(input);
3112 let words = shellwords.words();
2877 let words = shellwords.words();
3113
2878
3114 if words.is_empty() || (words.len() == 1 && !shellwords.ends_with_whitespace()) {
2879 if words.is_empty() || (words.len() == 1 && !shellwords.ends_with_whitespace()) {
2880+ // If the command has not been finished yet, complete commands.
2881+ let mut matches: Vec<_> = typed::TYPABLE_COMMAND_LIST
2882+ .iter()
2883+ .filter_map(|command| {
2884+ FUZZY_MATCHER
3115− fuzzy_match(
2885+ .fuzzy_match(command.name, input)
3116− input,
3117− TYPABLE_COMMAND_LIST.iter().map(|command| command.name),
2886+ .map(|score| (command.name, score))
3118− false,
2887+ })
3119− )
2888+ .collect();
2889+
2890+ matches.sort_unstable_by_key(|(_file, score)| std::cmp::Reverse(*score));
2891+ matches
3120− .into_iter()
2892+ .into_iter()
3121− .map(|(name, _)| (0.., name.into()))
2893+ .map(|(name, _)| (0.., name.into()))
3122− .collect()
2894+ .collect()
3123 } else {
2895 } else {
3124 // Otherwise, use the command's completer and the last shellword
2896 // Otherwise, use the command's completer and the last shellword
3125 // as completion input.
2897 // as completion input.
helix-term/src/compositor.rs−12
@@ -16,7 +16,6 @@ pub enum EventResult {
16}
16}
17
17
18use crate::job::Jobs;
18use crate::job::Jobs;
19−use crate::ui::picker;
20use helix_view::Editor;
19use helix_view::Editor;
21
20
22pub use helix_view::input::Event;
21pub use helix_view::input::Event;
@@ -80,7 +79,6 @@ pub struct Compositor {
80 area: Rect,
79 area: Rect,
81
80
82 pub(crate) last_picker: Option<Box<dyn Component>>,
81 pub(crate) last_picker: Option<Box<dyn Component>>,
83− pub(crate) full_redraw: bool,
84}
82}
85
83
86impl Compositor {
84impl Compositor {
@@ -89,7 +87,6 @@ impl Compositor {
89 layers: Vec::new(),
87 layers: Vec::new(),
90 area,
88 area,
91 last_picker: None,
89 last_picker: None,
92− full_redraw: false,
93 }
90 }
94 }
91 }
95
92
@@ -103,11 +100,6 @@ impl Compositor {
103
100
104 /// Add a layer to be rendered in front of all existing layers.
101 /// Add a layer to be rendered in front of all existing layers.
105 pub fn push(&mut self, mut layer: Box<dyn Component>) {
102 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− }
111 let size = self.size();
103 let size = self.size();
112 // trigger required_size on init
104 // trigger required_size on init
113 layer.required_size((size.width, size.height));
105 layer.required_size((size.width, size.height));
@@ -208,10 +200,6 @@ impl Compositor {
208 .find(|component| component.id() == Some(id))
200 .find(|component| component.id() == Some(id))
209 .and_then(|component| component.as_any_mut().downcast_mut())
201 .and_then(|component| component.as_any_mut().downcast_mut())
210 }
202 }
211−
212− pub fn need_full_redraw(&mut self) {
213− self.full_redraw = true;
214− }
215}
203}
216
204
217// View casting, taken straight from Cursive
205// View casting, taken straight from Cursive
helix-term/src/config.rs−1
@@ -109,7 +109,6 @@ impl Config {
109 )?,
109 )?,
110 }
110 }
111 }
111 }
112−
113 // these are just two io errors return the one for the global config
112 // these are just two io errors return the one for the global config
114 (Err(err), Err(_)) => return Err(err),
113 (Err(err), Err(_)) => return Err(err),
115 };
114 };
helix-term/src/health.rs+16−44
@@ -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<&str>| match cmd {
184+ let check_binary = |cmd: Option<String>| 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,15 +192,17 @@ 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+
195− let mut cmds = lang.language_servers.iter().filter_map(|ls| {
197+ let lsp = lang.language_servers.first().and_then(|ls| {
196 syn_loader_conf
198 syn_loader_conf
197 .language_server
199 .language_server
198 .get(&ls.name)
200 .get(&ls.name)
199− .map(|config| config.command.as_str())
201+ .map(|config| config.command.clone())
200 });
202 });
201− check_binary(cmds.next());
203+ check_binary(lsp);
202
204
203− let dap = lang.debugger.as_ref().map(|dap| dap.command.as_str());
205+ let dap = lang.debugger.as_ref().map(|dap| dap.command.to_string());
204 check_binary(dap);
206 check_binary(dap);
205
207
206 for ts_feat in TsFeature::all() {
208 for ts_feat in TsFeature::all() {
@@ -211,12 +213,6 @@ pub fn languages_all() -> std::io::Result<()> {
211 }
213 }
212
214
213 writeln!(stdout)?;
215 writeln!(stdout)?;
214−
215− for cmd in cmds {
216− column("", Color::Reset);
217− check_binary(Some(cmd));
218− writeln!(stdout)?;
219− }
220 }
216 }
221
217
222 Ok(())
218 Ok(())
@@ -272,12 +268,15 @@ pub fn language(lang_str: String) -> std::io::Result<()> {
272 }
268 }
273 };
269 };
274
270
275− probe_protocols(
271+ // TODO multiple language servers
272+ probe_protocol(
276 "language server",
273 "language server",
277− lang.language_servers
274+ lang.language_servers.first().and_then(|ls| {
278− .iter()
279− .filter_map(|ls| syn_loader_conf.language_server.get(&ls.name))
275+ syn_loader_conf
276+ .language_server
277+ .get(&ls.name)
280− .map(|config| config.command.as_str()),
278+ .map(|config| config.command.clone())
279+ }),
281 )?;
280 )?;
282
281
283 probe_protocol(
282 probe_protocol(
@@ -292,33 +291,6 @@ pub fn language(lang_str: String) -> std::io::Result<()> {
292 Ok(())
291 Ok(())
293}
292}
294
293
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−
322/// Display diagnostics about LSP and DAP.
294/// Display diagnostics about LSP and DAP.
323fn probe_protocol(protocol_name: &str, server_cmd: Option<String>) -> std::io::Result<()> {
295fn probe_protocol(protocol_name: &str, server_cmd: Option<String>) -> std::io::Result<()> {
324 let stdout = std::io::stdout();
296 let stdout = std::io::stdout();
helix-term/src/keymap.rs+14−14
@@ -401,14 +401,14 @@ mod tests {
401 fn merge_partial_keys() {
401 fn merge_partial_keys() {
402 let keymap = hashmap! {
402 let keymap = hashmap! {
403 Mode::Normal => keymap!({ "Normal mode"
403 Mode::Normal => keymap!({ "Normal mode"
404− "i" => normal_mode,
404+ "i" => normal_mode,
405− "无" => insert_mode,
405+ "无" => insert_mode,
406− "z" => jump_backward,
406+ "z" => jump_backward,
407− "g" => { "Merge into goto mode"
407+ "g" => { "Merge into goto mode"
408− "$" => goto_line_end,
408+ "$" => goto_line_end,
409− "g" => delete_char_forward,
409+ "g" => delete_char_forward,
410− },
410+ },
411− })
411+ })
412 };
412 };
413 let mut merged_keyamp = default();
413 let mut merged_keyamp = default();
414 merge_keys(&mut merged_keyamp, keymap.clone());
414 merge_keys(&mut merged_keyamp, keymap.clone());
@@ -474,13 +474,13 @@ mod tests {
474 fn order_should_be_set() {
474 fn order_should_be_set() {
475 let keymap = hashmap! {
475 let keymap = hashmap! {
476 Mode::Normal => keymap!({ "Normal mode"
476 Mode::Normal => keymap!({ "Normal mode"
477− "space" => { ""
477+ "space" => { ""
478− "s" => { ""
478+ "s" => { ""
479− "v" => vsplit,
479+ "v" => vsplit,
480− "c" => hsplit,
480+ "c" => hsplit,
481+ },
481 },
482 },
482− },
483+ })
483− })
484 };
484 };
485 let mut merged_keyamp = default();
485 let mut merged_keyamp = default();
486 merge_keys(&mut merged_keyamp, keymap.clone());
486 merge_keys(&mut merged_keyamp, keymap.clone());
helix-term/src/keymap/default.rs+2−8
@@ -88,8 +88,6 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
88 "A-i" | "A-down" => shrink_selection,
88 "A-i" | "A-down" => shrink_selection,
89 "A-p" | "A-left" => select_prev_sibling,
89 "A-p" | "A-left" => select_prev_sibling,
90 "A-n" | "A-right" => select_next_sibling,
90 "A-n" | "A-right" => select_next_sibling,
91− "A-e" => move_parent_node_end,
92− "A-b" => move_parent_node_start,
93
91
94 "%" => select_all,
92 "%" => select_all,
95 "x" => extend_line_below,
93 "x" => extend_line_below,
@@ -267,7 +265,7 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
267 "C-v" | "v" => vsplit_new,
265 "C-v" | "v" => vsplit_new,
268 },
266 },
269 },
267 },
270− "y" => yank_to_clipboard,
268+ "y" => yank_joined_to_clipboard,
271 "Y" => yank_main_selection_to_clipboard,
269 "Y" => yank_main_selection_to_clipboard,
272 "p" => paste_clipboard_after,
270 "p" => paste_clipboard_after,
273 "P" => paste_clipboard_before,
271 "P" => paste_clipboard_before,
@@ -338,9 +336,6 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
338 "B" => extend_prev_long_word_start,
336 "B" => extend_prev_long_word_start,
339 "E" => extend_next_long_word_end,
337 "E" => extend_next_long_word_end,
340
338
341− "A-e" => extend_parent_node_end,
342− "A-b" => extend_parent_node_start,
343−
344 "n" => extend_search_next,
339 "n" => extend_search_next,
345 "N" => extend_search_prev,
340 "N" => extend_search_prev,
346
341
@@ -373,8 +368,7 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
373 "C-h" | "backspace" | "S-backspace" => delete_char_backward,
368 "C-h" | "backspace" | "S-backspace" => delete_char_backward,
374 "C-d" | "del" => delete_char_forward,
369 "C-d" | "del" => delete_char_forward,
375 "C-j" | "ret" => insert_newline,
370 "C-j" | "ret" => insert_newline,
376− "tab" => smart_tab,
377− "S-tab" => insert_tab,
371+ "tab" => insert_tab,
378
372
379 "up" => move_visual_line_up,
373 "up" => move_visual_line_up,
380 "down" => move_visual_line_down,
374 "down" => move_visual_line_down,
helix-term/src/main.rs+17−21
@@ -4,8 +4,9 @@ use helix_loader::VERSION_AND_GIT_HASH;
4use helix_term::application::Application;
4use helix_term::application::Application;
5use helix_term::args::Args;
5use helix_term::args::Args;
6use helix_term::config::{Config, ConfigLoadError};
6use helix_term::config::{Config, ConfigLoadError};
7+use std::path::PathBuf;
7
8
8−fn setup_logging(verbosity: u64) -> Result<()> {
9+fn setup_logging(logpath: PathBuf, verbosity: u64) -> Result<()> {
9 let mut base_config = fern::Dispatch::new();
10 let mut base_config = fern::Dispatch::new();
10
11
11 base_config = match verbosity {
12 base_config = match verbosity {
@@ -26,7 +27,7 @@ fn setup_logging(verbosity: u64) -> Result<()> {
26 message
27 message
27 ))
28 ))
28 })
29 })
29− .chain(fern::log_file(helix_loader::log_file())?);
30+ .chain(fern::log_file(logpath)?);
30
31
31 base_config.chain(file_config).apply()?;
32 base_config.chain(file_config).apply()?;
32
33
@@ -40,6 +41,12 @@ fn main() -> Result<()> {
40
41
41#[tokio::main]
42#[tokio::main]
42async fn main_impl() -> Result<i32> {
43async fn main_impl() -> Result<i32> {
44+ let logpath = helix_loader::log_file();
45+ let parent = logpath.parent().unwrap();
46+ if !parent.exists() {
47+ std::fs::create_dir_all(parent).ok();
48+ }
49+
43 let help = format!(
50 let help = format!(
44 "\
51 "\
45{} {}
52{} {}
@@ -66,20 +73,15 @@ FLAGS:
66 -V, --version Prints version information
73 -V, --version Prints version information
67 --vsplit Splits all given files vertically into different windows
74 --vsplit Splits all given files vertically into different windows
68 --hsplit Splits all given files horizontally into different windows
75 --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
71",
76",
72 env!("CARGO_PKG_NAME"),
77 env!("CARGO_PKG_NAME"),
73 VERSION_AND_GIT_HASH,
78 VERSION_AND_GIT_HASH,
74 env!("CARGO_PKG_AUTHORS"),
79 env!("CARGO_PKG_AUTHORS"),
75 env!("CARGO_PKG_DESCRIPTION"),
80 env!("CARGO_PKG_DESCRIPTION"),
76− helix_loader::default_log_file().display(),
81+ logpath.display(),
77 );
82 );
78
83
79− let mut args = Args::parse_args().context("could not parse arguments")?;
84+ let args = Args::parse_args().context("could not parse arguments")?;
80−
81− helix_loader::initialize_config_file(args.config_file.clone());
82− helix_loader::initialize_log_file(args.log_file.clone());
83
85
84 // Help has a higher priority and should be handled separately.
86 // Help has a higher priority and should be handled separately.
85 if args.display_help {
87 if args.display_help {
@@ -114,21 +116,15 @@ FLAGS:
114 return Ok(0);
116 return Ok(0);
115 }
117 }
116
118
119+ let logpath = args.log_file.as_ref().cloned().unwrap_or(logpath);
117− setup_logging(args.verbosity).context("failed to initialize logging")?;
120+ setup_logging(logpath, args.verbosity).context("failed to initialize logging")?;
118
121
119− // Before setting the working directory, resolve all the paths in args.files
122+ let config_dir = helix_loader::config_dir();
120− for (path, _) in args.files.iter_mut() {
123+ if !config_dir.exists() {
121− *path = helix_core::path::get_canonicalized_path(path);
124+ std::fs::create_dir_all(&config_dir).ok();
122 }
125 }
123
126
124− // NOTE: Set the working directory early so the correct configuration is loaded. Be aware that
127+ helix_loader::initialize_config_file(args.config_file.clone());
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
128
133 let config = match Config::load_default() {
129 let config = match Config::load_default() {
134 Ok(config) => config,
130 Ok(config) => config,
helix-term/src/ui/completion.rs+4−32
@@ -2,7 +2,6 @@ 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,
6 theme::{Modifier, Style},
5 theme::{Modifier, Style},
7 ViewId,
6 ViewId,
8};
7};
@@ -145,9 +144,7 @@ impl Completion {
145 }
144 }
146 };
145 };
147
146
148− let Some(range) =
149− util::lsp_range_to_range(doc.text(), edit.range, offset_encoding)
147+ let Some(range) = util::lsp_range_to_range(doc.text(), edit.range, offset_encoding) else{
150− else {
151 return Transaction::new(doc.text());
148 return Transaction::new(doc.text());
152 };
149 };
153
150
@@ -295,8 +292,6 @@ impl Completion {
295 };
292 };
296 // if more text was entered, remove it
293 // if more text was entered, remove it
297 doc.restore(view, &savepoint, true);
294 doc.restore(view, &savepoint, true);
298− // save an undo checkpoint before the completion
299− doc.append_changes_to_history(view);
300 let transaction = item_to_transaction(
295 let transaction = item_to_transaction(
301 doc,
296 doc,
302 view.id,
297 view.id,
@@ -327,18 +322,9 @@ impl Completion {
327 }
322 }
328 };
323 };
329 });
324 });
330−
331− let margin = if editor.menu_border() {
332− Margin::vertical(1)
333− } else {
334− Margin::none()
335− };
336−
337 let popup = Popup::new(Self::ID, menu)
325 let popup = Popup::new(Self::ID, menu)
338 .with_scrollbar(false)
326 .with_scrollbar(false)
339− .ignore_escape_key(true)
327+ .ignore_escape_key(true);
340− .margin(margin);
341−
342 let mut completion = Self {
328 let mut completion = Self {
343 popup,
329 popup,
344 start_offset,
330 start_offset,
@@ -425,18 +411,10 @@ impl Completion {
425 _ => return false,
411 _ => return false,
426 };
412 };
427
413
428− let Some(language_server) = cx
429− .editor
430− .language_server_by_id(current_item.language_server_id)
414+ let Some(language_server) = cx.editor.language_server_by_id(current_item.language_server_id) else { return false; };
431− else {
432− return false;
433− };
434
415
435 // This method should not block the compositor so we handle the response asynchronously.
416 // This method should not block the compositor so we handle the response asynchronously.
436− let Some(future) = language_server.resolve_completion_item(current_item.item.clone())
417+ let Some(future) = language_server.resolve_completion_item(current_item.item.clone()) else { return false; };
437− else {
438− return false;
439− };
440
418
441 cx.callback(
419 cx.callback(
442 future,
420 future,
@@ -579,12 +557,6 @@ impl Component for Completion {
579 // clear area
557 // clear area
580 let background = cx.editor.theme.get("ui.popup");
558 let background = cx.editor.theme.get("ui.popup");
581 surface.clear_with(doc_area, background);
559 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−
588 markdown_doc.render(doc_area, surface, cx);
560 markdown_doc.render(doc_area, surface, cx);
589 }
561 }
590}
562}
helix-term/src/ui/document.rs+24−60
@@ -97,8 +97,7 @@ 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>,
101− overlay_highlight_iter: impl Iterator<Item = HighlightEvent>,
100+ highlight_iter: impl Iterator<Item = HighlightEvent>,
102 theme: &Theme,
101 theme: &Theme,
103 line_decoration: &mut [Box<dyn LineDecoration + '_>],
102 line_decoration: &mut [Box<dyn LineDecoration + '_>],
104 translated_positions: &mut [TranslatedPosition],
103 translated_positions: &mut [TranslatedPosition],
@@ -110,8 +109,7 @@ pub fn render_document(
110 offset,
109 offset,
111 &doc.text_format(viewport.width, Some(theme)),
110 &doc.text_format(viewport.width, Some(theme)),
112 doc_annotations,
111 doc_annotations,
113− syntax_highlight_iter,
112+ highlight_iter,
114− overlay_highlight_iter,
115 theme,
113 theme,
116 line_decoration,
114 line_decoration,
117 translated_positions,
115 translated_positions,
@@ -159,8 +157,7 @@ pub fn render_text<'t>(
159 offset: ViewPosition,
157 offset: ViewPosition,
160 text_fmt: &TextFormat,
158 text_fmt: &TextFormat,
161 text_annotations: &TextAnnotations,
159 text_annotations: &TextAnnotations,
162− syntax_highlight_iter: impl Iterator<Item = HighlightEvent>,
163− overlay_highlight_iter: impl Iterator<Item = HighlightEvent>,
160+ highlight_iter: impl Iterator<Item = HighlightEvent>,
164 theme: &Theme,
161 theme: &Theme,
165 line_decorations: &mut [Box<dyn LineDecoration + '_>],
162 line_decorations: &mut [Box<dyn LineDecoration + '_>],
166 translated_positions: &mut [TranslatedPosition],
163 translated_positions: &mut [TranslatedPosition],
@@ -181,16 +178,10 @@ pub fn render_text<'t>(
181
178
182 let (mut formatter, mut first_visible_char_idx) =
179 let (mut formatter, mut first_visible_char_idx) =
183 DocumentFormatter::new_at_prev_checkpoint(text, text_fmt, text_annotations, offset.anchor);
180 DocumentFormatter::new_at_prev_checkpoint(text, text_fmt, text_annotations, offset.anchor);
184− let mut syntax_styles = StyleIter {
181+ let mut styles = StyleIter {
185 text_style: renderer.text_style,
182 text_style: renderer.text_style,
186 active_highlights: Vec::with_capacity(64),
183 active_highlights: Vec::with_capacity(64),
187− highlight_iter: syntax_highlight_iter,
184+ 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,
194 theme,
185 theme,
195 };
186 };
196
187
@@ -202,10 +193,7 @@ pub fn render_text<'t>(
202 };
193 };
203 let mut is_in_indent_area = true;
194 let mut is_in_indent_area = true;
204 let mut last_line_indent_level = 0;
195 let mut last_line_indent_level = 0;
205− let mut syntax_style_span = syntax_styles
196+ let mut style_span = styles
206− .next()
207− .unwrap_or_else(|| (Style::default(), usize::MAX));
208− let mut overlay_style_span = overlay_styles
209 .next()
197 .next()
210 .unwrap_or_else(|| (Style::default(), usize::MAX));
198 .unwrap_or_else(|| (Style::default(), usize::MAX));
211
199
@@ -233,16 +221,9 @@ pub fn render_text<'t>(
233
221
234 // skip any graphemes on visual lines before the block start
222 // skip any graphemes on visual lines before the block start
235 if pos.row < row_off {
223 if pos.row < row_off {
236− if char_pos >= syntax_style_span.1 {
224+ if char_pos >= style_span.1 {
237− syntax_style_span = if let Some(syntax_style_span) = syntax_styles.next() {
225+ style_span = if let Some(style_span) = styles.next() {
238− syntax_style_span
226+ 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
246 } else {
227 } else {
247 break;
228 break;
248 }
229 }
@@ -279,15 +260,8 @@ pub fn render_text<'t>(
279 }
260 }
280
261
281 // acquire the correct grapheme style
262 // acquire the correct grapheme style
282− if char_pos >= syntax_style_span.1 {
263+ if char_pos >= style_span.1 {
283− syntax_style_span = syntax_styles
284− .next()
285− .unwrap_or((Style::default(), usize::MAX));
286− }
287− if char_pos >= overlay_style_span.1 {
288− overlay_style_span = overlay_styles
289− .next()
290− .unwrap_or((Style::default(), usize::MAX));
264+ style_span = styles.next().unwrap_or((Style::default(), usize::MAX));
291 }
265 }
292 char_pos += grapheme.doc_chars();
266 char_pos += grapheme.doc_chars();
293
267
@@ -301,25 +275,22 @@ pub fn render_text<'t>(
301 pos,
275 pos,
302 );
276 );
303
277
304− let (syntax_style, overlay_style) =
305− if let GraphemeSource::VirtualText { highlight } = grapheme.source {
278+ let grapheme_style = if let GraphemeSource::VirtualText { highlight } = grapheme.source {
306− let mut style = renderer.text_style;
279+ let style = renderer.text_style;
307− if let Some(highlight) = highlight {
280+ if let Some(highlight) = highlight {
308− style = style.patch(theme.highlight(highlight.0))
281+ style.patch(theme.highlight(highlight.0))
309− }
310− (style, Style::default())
311 } else {
282 } else {
312− (syntax_style_span.0, overlay_style_span.0)
283+ style
284+ }
285+ } else {
286+ style_span.0
313− };
287+ };
314
288
315− let is_virtual = grapheme.is_virtual();
289+ let virt = grapheme.is_virtual();
316 renderer.draw_grapheme(
290 renderer.draw_grapheme(
317 grapheme.grapheme,
291 grapheme.grapheme,
318− GraphemeStyle {
292+ grapheme_style,
319− syntax_style,
293+ virt,
320− overlay_style,
321− },
322− is_virtual,
323 &mut last_line_indent_level,
294 &mut last_line_indent_level,
324 &mut is_in_indent_area,
295 &mut is_in_indent_area,
325 pos,
296 pos,
@@ -351,11 +322,6 @@ pub struct TextRenderer<'a> {
351 pub viewport: Rect,
322 pub viewport: Rect,
352}
323}
353
324
354−pub struct GraphemeStyle {
355− syntax_style: Style,
356− overlay_style: Style,
357−}
358−
359impl<'a> TextRenderer<'a> {
325impl<'a> TextRenderer<'a> {
360 pub fn new(
326 pub fn new(
361 surface: &'a mut Surface,
327 surface: &'a mut Surface,
@@ -429,7 +395,7 @@ impl<'a> TextRenderer<'a> {
429 pub fn draw_grapheme(
395 pub fn draw_grapheme(
430 &mut self,
396 &mut self,
431 grapheme: Grapheme,
397 grapheme: Grapheme,
432− grapheme_style: GraphemeStyle,
398+ mut style: Style,
433 is_virtual: bool,
399 is_virtual: bool,
434 last_indent_level: &mut usize,
400 last_indent_level: &mut usize,
435 is_in_indent_area: &mut bool,
401 is_in_indent_area: &mut bool,
@@ -439,11 +405,9 @@ impl<'a> TextRenderer<'a> {
439 let is_whitespace = grapheme.is_whitespace();
405 let is_whitespace = grapheme.is_whitespace();
440
406
441 // TODO is it correct to apply the whitespace style to all unicode white spaces?
407 // TODO is it correct to apply the whitespace style to all unicode white spaces?
442− let mut style = grapheme_style.syntax_style;
443 if is_whitespace {
408 if is_whitespace {
444 style = style.patch(self.whitespace_style);
409 style = style.patch(self.whitespace_style);
445 }
410 }
446− style = style.patch(grapheme_style.overlay_style);
447
411
448 let width = grapheme.width();
412 let width = grapheme.width();
449 let space = if is_virtual { " " } else { &self.space };
413 let space = if is_virtual { " " } else { &self.space };
helix-term/src/ui/editor.rs+54−102
@@ -43,8 +43,6 @@ 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,
48}
46}
49
47
50#[derive(Debug, Clone)]
48#[derive(Debug, Clone)]
@@ -73,7 +71,6 @@ impl EditorView {
73 last_insert: (commands::MappableCommand::normal_mode, Vec::new()),
71 last_insert: (commands::MappableCommand::normal_mode, Vec::new()),
74 completion: None,
72 completion: None,
75 spinners: ProgressSpinners::default(),
73 spinners: ProgressSpinners::default(),
76− terminal_focused: true,
77 }
74 }
78 }
75 }
79
76
@@ -124,20 +121,16 @@ impl EditorView {
124 line_decorations.push(Box::new(line_decoration));
121 line_decorations.push(Box::new(line_decoration));
125 }
122 }
126
123
127− let syntax_highlights =
124+ let mut highlights =
128 Self::doc_syntax_highlights(doc, view.offset.anchor, inner.height, theme);
125 Self::doc_syntax_highlights(doc, view.offset.anchor, inner.height, theme);
129−
130− let mut overlay_highlights =
126+ let overlay_highlights = Self::overlay_syntax_highlights(
131− Self::empty_highlight_iter(doc, view.offset.anchor, inner.height);
132− let overlay_syntax_highlights = Self::overlay_syntax_highlights(
133 doc,
127 doc,
134 view.offset.anchor,
128 view.offset.anchor,
135 inner.height,
129 inner.height,
136 &text_annotations,
130 &text_annotations,
137 );
131 );
138− if !overlay_syntax_highlights.is_empty() {
132+ if !overlay_highlights.is_empty() {
139− overlay_highlights =
133+ highlights = Box::new(syntax::merge(highlights, overlay_highlights));
140− Box::new(syntax::merge(overlay_highlights, overlay_syntax_highlights));
141 }
134 }
142
135
143 for diagnostic in Self::doc_diagnostics_highlights(doc, theme) {
136 for diagnostic in Self::doc_diagnostics_highlights(doc, theme) {
@@ -146,41 +139,39 @@ impl EditorView {
146 if diagnostic.is_empty() {
139 if diagnostic.is_empty() {
147 continue;
140 continue;
148 }
141 }
149− overlay_highlights = Box::new(syntax::merge(overlay_highlights, diagnostic));
142+ highlights = Box::new(syntax::merge(highlights, diagnostic));
150 }
143 }
151
144
152− if is_focused {
145+ let highlights: Box<dyn Iterator<Item = HighlightEvent>> = if is_focused {
153 let highlights = syntax::merge(
146 let highlights = syntax::merge(
154− overlay_highlights,
147+ highlights,
155 Self::doc_selection_highlights(
148 Self::doc_selection_highlights(
156 editor.mode(),
149 editor.mode(),
157 doc,
150 doc,
158 view,
151 view,
159 theme,
152 theme,
160 &config.cursor_shape,
153 &config.cursor_shape,
161− self.terminal_focused,
162 ),
154 ),
163 );
155 );
164 let focused_view_elements = Self::highlight_focused_view_elements(view, doc, theme);
156 let focused_view_elements = Self::highlight_focused_view_elements(view, doc, theme);
165 if focused_view_elements.is_empty() {
157 if focused_view_elements.is_empty() {
166− overlay_highlights = Box::new(highlights)
158+ Box::new(highlights)
167 } else {
159 } else {
168− overlay_highlights = Box::new(syntax::merge(highlights, focused_view_elements))
160+ Box::new(syntax::merge(highlights, focused_view_elements))
169 }
161 }
170− }
162+ } else {
163+ Box::new(highlights)
164+ };
171
165
172− let gutter_overflow = view.gutter_offset(doc) == 0;
173− if !gutter_overflow {
174− Self::render_gutter(
166+ Self::render_gutter(
175− editor,
167+ editor,
176− doc,
168+ doc,
177− view,
169+ view,
178− view.area,
170+ view.area,
179− theme,
171+ theme,
180− is_focused & self.terminal_focused,
172+ is_focused,
181− &mut line_decorations,
173+ &mut line_decorations,
182− );
174+ );
183− }
184
175
185 if is_focused {
176 if is_focused {
186 let cursor = doc
177 let cursor = doc
@@ -200,8 +191,7 @@ impl EditorView {
200 doc,
191 doc,
201 view.offset,
192 view.offset,
202 &text_annotations,
193 &text_annotations,
203− syntax_highlights,
194+ highlights,
204− overlay_highlights,
205 theme,
195 theme,
206 &mut line_decorations,
196 &mut line_decorations,
207 &mut translated_positions,
197 &mut translated_positions,
@@ -261,39 +251,27 @@ impl EditorView {
261 .for_each(|area| surface.set_style(area, ruler_theme))
251 .for_each(|area| surface.set_style(area, ruler_theme))
262 }
252 }
263
253
264− fn viewport_byte_range(
254+ pub fn overlay_syntax_highlights(
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(
280 doc: &Document,
255 doc: &Document,
281 anchor: usize,
256 anchor: usize,
282 height: u16,
257 height: u16,
283− ) -> Box<dyn Iterator<Item = HighlightEvent>> {
258+ text_annotations: &TextAnnotations,
259+ ) -> Vec<(usize, std::ops::Range<usize>)> {
284 let text = doc.text().slice(..);
260 let text = doc.text().slice(..);
285 let row = text.char_to_line(anchor.min(text.len_chars()));
261 let row = text.char_to_line(anchor.min(text.len_chars()));
286
262
263+ let range = {
287− // Calculate viewport byte ranges:
264+ // Calculate viewport byte ranges:
288− // Saturating subs to make it inclusive zero indexing.
265+ // Saturating subs to make it inclusive zero indexing.
289− let range = Self::viewport_byte_range(text, row, height);
266+ let last_line = text.len_lines().saturating_sub(1);
290− Box::new(
267+ let last_visible_line = (row + height as usize).saturating_sub(1).min(last_line);
291− [HighlightEvent::Source {
268+ let start = text.line_to_byte(row.min(last_line));
292− start: text.byte_to_char(range.start),
269+ let end = text.line_to_byte(last_visible_line + 1);
293− end: text.byte_to_char(range.end),
270+
271+ start..end
294− }]
272+ };
295− .into_iter(),
273+
296− )
274+ text_annotations.collect_overlay_highlights(range)
297 }
275 }
298
276
299 /// Get syntax highlights for a document in a view represented by the first line
277 /// Get syntax highlights for a document in a view represented by the first line
@@ -308,7 +286,16 @@ impl EditorView {
308 let text = doc.text().slice(..);
286 let text = doc.text().slice(..);
309 let row = text.char_to_line(anchor.min(text.len_chars()));
287 let row = text.char_to_line(anchor.min(text.len_chars()));
310
288
311− let range = Self::viewport_byte_range(text, row, height);
289+ let range = {
290+ // Calculate viewport byte ranges:
291+ // Saturating subs to make it inclusive zero indexing.
292+ let last_line = text.len_lines().saturating_sub(1);
293+ let last_visible_line = (row + height as usize).saturating_sub(1).min(last_line);
294+ let start = text.line_to_byte(row.min(last_line));
295+ let end = text.line_to_byte(last_visible_line + 1);
296+
297+ start..end
298+ };
312
299
313 match doc.syntax() {
300 match doc.syntax() {
314 Some(syntax) => {
301 Some(syntax) => {
@@ -341,20 +328,6 @@ impl EditorView {
341 }
328 }
342 }
329 }
343
330
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−
358 /// Get highlight spans for document diagnostics
331 /// Get highlight spans for document diagnostics
359 pub fn doc_diagnostics_highlights(
332 pub fn doc_diagnostics_highlights(
360 doc: &Document,
333 doc: &Document,
@@ -386,7 +359,7 @@ impl EditorView {
386 let mut warning_vec = Vec::new();
359 let mut warning_vec = Vec::new();
387 let mut error_vec = Vec::new();
360 let mut error_vec = Vec::new();
388
361
389− for diagnostic in doc.shown_diagnostics() {
362+ for diagnostic in doc.diagnostics() {
390 // Separate diagnostics into different Vecs by severity.
363 // Separate diagnostics into different Vecs by severity.
391 let (vec, scope) = match diagnostic.severity {
364 let (vec, scope) = match diagnostic.severity {
392 Some(Severity::Info) => (&mut info_vec, info),
365 Some(Severity::Info) => (&mut info_vec, info),
@@ -421,7 +394,6 @@ impl EditorView {
421 view: &View,
394 view: &View,
422 theme: &Theme,
395 theme: &Theme,
423 cursor_shape_config: &CursorShapeConfig,
396 cursor_shape_config: &CursorShapeConfig,
424− is_terminal_focused: bool,
425 ) -> Vec<(usize, std::ops::Range<usize>)> {
397 ) -> Vec<(usize, std::ops::Range<usize>)> {
426 let text = doc.text().slice(..);
398 let text = doc.text().slice(..);
427 let selection = doc.selection(view.id);
399 let selection = doc.selection(view.id);
@@ -469,7 +441,7 @@ impl EditorView {
469
441
470 // Special-case: cursor at end of the rope.
442 // Special-case: cursor at end of the rope.
471 if range.head == range.anchor && range.head == text.len_chars() {
443 if range.head == range.anchor && range.head == text.len_chars() {
472− if !selection_is_primary || (cursor_is_block && is_terminal_focused) {
444+ if !selection_is_primary || cursor_is_block {
473 // Bar and underline cursors are drawn by the terminal
445 // Bar and underline cursors are drawn by the terminal
474 // BUG: If the editor area loses focus while having a bar or
446 // BUG: If the editor area loses focus while having a bar or
475 // underline cursor (eg. when a regex prompt has focus) then
447 // underline cursor (eg. when a regex prompt has focus) then
@@ -492,17 +464,13 @@ impl EditorView {
492 cursor_start
464 cursor_start
493 };
465 };
494 spans.push((selection_scope, range.anchor..selection_end));
466 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
497− if !selection_is_primary || (cursor_is_block && is_terminal_focused) {
467+ if !selection_is_primary || cursor_is_block {
498 spans.push((cursor_scope, cursor_start..range.head));
468 spans.push((cursor_scope, cursor_start..range.head));
499 }
469 }
500 } else {
470 } else {
501 // Reverse case.
471 // Reverse case.
502 let cursor_end = next_grapheme_boundary(text, range.head);
472 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
505− if !selection_is_primary || (cursor_is_block && is_terminal_focused) {
473+ if !selection_is_primary || cursor_is_block {
506 spans.push((cursor_scope, range.head..cursor_end));
474 spans.push((cursor_scope, range.head..cursor_end));
507 }
475 }
508 // non block cursors look like they exclude the cursor
476 // non block cursors look like they exclude the cursor
@@ -1099,7 +1067,6 @@ impl EditorView {
1099 let editor = &mut cxt.editor;
1067 let editor = &mut cxt.editor;
1100
1068
1101 if let Some((pos, view_id)) = pos_and_view(editor, row, column, true) {
1069 if let Some((pos, view_id)) = pos_and_view(editor, row, column, true) {
1102− let prev_view_id = view!(editor).id;
1103 let doc = doc_mut!(editor, &view!(editor, view_id).doc);
1070 let doc = doc_mut!(editor, &view!(editor, view_id).doc);
1104
1071
1105 if modifiers == KeyModifiers::ALT {
1072 if modifiers == KeyModifiers::ALT {
@@ -1109,10 +1076,6 @@ impl EditorView {
1109 doc.set_selection(view_id, Selection::point(pos));
1076 doc.set_selection(view_id, Selection::point(pos));
1110 }
1077 }
1111
1078
1112− if view_id != prev_view_id {
1113− self.clear_completion(editor);
1114− }
1115−
1116 editor.focus(view_id);
1079 editor.focus(view_id);
1117 editor.ensure_cursor_in_view(view_id);
1080 editor.ensure_cursor_in_view(view_id);
1118
1081
@@ -1406,17 +1369,13 @@ impl Component for EditorView {
1406
1369
1407 Event::Mouse(event) => self.handle_mouse_event(event, &mut cx),
1370 Event::Mouse(event) => self.handle_mouse_event(event, &mut cx),
1408 Event::IdleTimeout => self.handle_idle_timeout(&mut cx),
1371 Event::IdleTimeout => self.handle_idle_timeout(&mut cx),
1409− Event::FocusGained => {
1372+ Event::FocusGained => EventResult::Ignored(None),
1410− self.terminal_focused = true;
1411− EventResult::Consumed(None)
1412− }
1413 Event::FocusLost => {
1373 Event::FocusLost => {
1414 if context.editor.config().auto_save {
1374 if context.editor.config().auto_save {
1415 if let Err(e) = commands::typed::write_all_impl(context, false, false) {
1375 if let Err(e) = commands::typed::write_all_impl(context, false, false) {
1416 context.editor.set_error(format!("{}", e));
1376 context.editor.set_error(format!("{}", e));
1417 }
1377 }
1418 }
1378 }
1419− self.terminal_focused = false;
1420 EventResult::Consumed(None)
1379 EventResult::Consumed(None)
1421 }
1380 }
1422 }
1381 }
@@ -1526,15 +1485,8 @@ impl Component for EditorView {
1526
1485
1527 fn cursor(&self, _area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) {
1486 fn cursor(&self, _area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) {
1528 match editor.cursor() {
1487 match editor.cursor() {
1529− // all block cursors are drawn manually
1488+ // All block cursors are drawn manually
1530− (pos, CursorKind::Block) => {
1531− if self.terminal_focused {
1532− (pos, CursorKind::Hidden)
1489+ (pos, CursorKind::Block) => (pos, CursorKind::Hidden),
1533− } else {
1534− // use crossterm cursor when terminal loses focus
1535− (pos, CursorKind::Underline)
1536− }
1537− }
1538 cursor => cursor,
1490 cursor => cursor,
1539 }
1491 }
1540 }
1492 }
helix-term/src/ui/fuzzy_match.rsnew file+239
@@ -0,0 +1,239 @@
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.rsnew file+47
@@ -0,0 +1,47 @@
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−5
@@ -62,7 +62,7 @@ impl Component for SignatureHelp {
62 });
62 });
63
63
64 let sig_text = crate::ui::markdown::highlighted_code_block(
64 let sig_text = crate::ui::markdown::highlighted_code_block(
65− &self.signature,
65+ self.signature.clone(),
66 &self.language,
66 &self.language,
67 Some(&cx.editor.theme),
67 Some(&cx.editor.theme),
68 Arc::clone(&self.config_loader),
68 Arc::clone(&self.config_loader),
@@ -92,9 +92,7 @@ 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
96− .clip_top(sig_text_area.height + 2)
95+ let sig_doc_area = area.clip_top(sig_text_area.height + 2);
97− .clip_bottom(u16::from(cx.editor.popup_border()));
98 let sig_doc_para = Paragraph::new(sig_doc)
96 let sig_doc_para = Paragraph::new(sig_doc)
99 .wrap(Wrap { trim: false })
97 .wrap(Wrap { trim: false })
100 .scroll((cx.scroll.unwrap_or_default() as u16, 0));
98 .scroll((cx.scroll.unwrap_or_default() as u16, 0));
@@ -111,7 +109,7 @@ impl Component for SignatureHelp {
111 let max_text_width = (viewport.0 - PADDING).min(120);
109 let max_text_width = (viewport.0 - PADDING).min(120);
112
110
113 let signature_text = crate::ui::markdown::highlighted_code_block(
111 let signature_text = crate::ui::markdown::highlighted_code_block(
114− &self.signature,
112+ self.signature.clone(),
115 &self.language,
113 &self.language,
116 None,
114 None,
117 Arc::clone(&self.config_loader),
115 Arc::clone(&self.config_loader),
helix-term/src/ui/markdown.rs+12−19
@@ -10,15 +10,14 @@ use pulldown_cmark::{CodeBlockKind, Event, HeadingLevel, Options, Parser, Tag};
10
10
11use helix_core::{
11use helix_core::{
12 syntax::{self, HighlightEvent, InjectionLanguageMarker, Syntax},
12 syntax::{self, HighlightEvent, InjectionLanguageMarker, Syntax},
13− RopeSlice,
13+ Rope,
14};
14};
15use helix_view::{
15use helix_view::{
16 graphics::{Margin, Rect, Style},
16 graphics::{Margin, Rect, Style},
17− theme::Modifier,
18 Theme,
17 Theme,
19};
18};
20
19
21−fn styled_multiline_text<'a>(text: &str, style: Style) -> Text<'a> {
20+fn styled_multiline_text<'a>(text: String, style: Style) -> Text<'a> {
22 let spans: Vec<_> = text
21 let spans: Vec<_> = text
23 .lines()
22 .lines()
24 .map(|line| Span::styled(line.to_string(), style))
23 .map(|line| Span::styled(line.to_string(), style))
@@ -28,7 +27,7 @@ fn styled_multiline_text<'a>(text: &str, style: Style) -> Text<'a> {
28}
27}
29
28
30pub fn highlighted_code_block<'a>(
29pub fn highlighted_code_block<'a>(
31− text: &str,
30+ text: String,
32 language: &str,
31 language: &str,
33 theme: Option<&Theme>,
32 theme: Option<&Theme>,
34 config_loader: Arc<syntax::Loader>,
33 config_loader: Arc<syntax::Loader>,
@@ -46,13 +45,13 @@ pub fn highlighted_code_block<'a>(
46 None => return styled_multiline_text(text, code_style),
45 None => return styled_multiline_text(text, code_style),
47 };
46 };
48
47
49− let ropeslice = RopeSlice::from(text);
48+ let rope = Rope::from(text.as_ref());
50 let syntax = config_loader
49 let syntax = config_loader
51 .language_configuration_for_injection_string(&InjectionLanguageMarker::Name(
50 .language_configuration_for_injection_string(&InjectionLanguageMarker::Name(
52 language.into(),
51 language.into(),
53 ))
52 ))
54 .and_then(|config| config.highlight_config(theme.scopes()))
53 .and_then(|config| config.highlight_config(theme.scopes()))
55− .and_then(|config| Syntax::new(ropeslice, config, Arc::clone(&config_loader)));
54+ .and_then(|config| Syntax::new(&rope, config, Arc::clone(&config_loader)));
56
55
57 let syntax = match syntax {
56 let syntax = match syntax {
58 Some(s) => s,
57 Some(s) => s,
@@ -60,7 +59,7 @@ pub fn highlighted_code_block<'a>(
60 };
59 };
61
60
62 let highlight_iter = syntax
61 let highlight_iter = syntax
63− .highlight_iter(ropeslice, None, None)
62+ .highlight_iter(rope.slice(..), None, None)
64 .map(|e| e.unwrap());
63 .map(|e| e.unwrap());
65 let highlight_iter: Box<dyn Iterator<Item = HighlightEvent>> =
64 let highlight_iter: Box<dyn Iterator<Item = HighlightEvent>> =
66 if let Some(spans) = additional_highlight_spans {
65 if let Some(spans) = additional_highlight_spans {
@@ -184,9 +183,7 @@ impl Markdown {
184 // Transform text in `<code>` blocks into `Event::Code`
183 // Transform text in `<code>` blocks into `Event::Code`
185 let mut in_code = false;
184 let mut in_code = false;
186 let parser = parser.filter_map(|event| match event {
185 let parser = parser.filter_map(|event| match event {
187− Event::Html(tag)
186+ Event::Html(tag) if *tag == *"<code>" => {
188− if tag.starts_with("<code") && matches!(tag.chars().nth(5), Some(' ' | '>')) =>
189− {
190 in_code = true;
187 in_code = true;
191 None
188 None
192 }
189 }
@@ -270,7 +267,7 @@ impl Markdown {
270 CodeBlockKind::Indented => "",
267 CodeBlockKind::Indented => "",
271 };
268 };
272 let tui_text = highlighted_code_block(
269 let tui_text = highlighted_code_block(
273− &text,
270+ text.to_string(),
274 language,
271 language,
275 theme,
272 theme,
276 Arc::clone(&self.config_loader),
273 Arc::clone(&self.config_loader),
@@ -278,21 +275,17 @@ impl Markdown {
278 );
275 );
279 lines.extend(tui_text.lines.into_iter());
276 lines.extend(tui_text.lines.into_iter());
280 } else {
277 } else {
281− let style = match tags.last() {
282− Some(Tag::Heading(level, ..)) => match level {
278+ let style = if let Some(Tag::Heading(level, ..)) = tags.last() {
279+ match level {
283 HeadingLevel::H1 => heading_styles[0],
280 HeadingLevel::H1 => heading_styles[0],
284 HeadingLevel::H2 => heading_styles[1],
281 HeadingLevel::H2 => heading_styles[1],
285 HeadingLevel::H3 => heading_styles[2],
282 HeadingLevel::H3 => heading_styles[2],
286 HeadingLevel::H4 => heading_styles[3],
283 HeadingLevel::H4 => heading_styles[3],
287 HeadingLevel::H5 => heading_styles[4],
284 HeadingLevel::H5 => heading_styles[4],
288 HeadingLevel::H6 => heading_styles[5],
285 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)
294 }
286 }
287+ } else {
295− _ => text_style,
288+ text_style
296 };
289 };
297 spans.push(Span::styled(text, style));
290 spans.push(Span::styled(text, style));
298 }
291 }
helix-term/src/ui/menu.rs+40−73
@@ -1,29 +1,22 @@
1−use std::{borrow::Cow, cmp::Reverse, path::PathBuf};
1+use std::{borrow::Cow, 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::{
11− buffer::Buffer as Surface,
7+use tui::{buffer::Buffer as Surface, widgets::Table};
12− widgets::{Block, Borders, Table, Widget},
13−};
14
8
15pub use tui::widgets::{Cell, Row};
9pub use tui::widgets::{Cell, Row};
16
10
17−use helix_view::{
11+use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
18− editor::SmartTabConfig,
12+use fuzzy_matcher::FuzzyMatcher;
13+
19− graphics::{Margin, Rect},
14+use helix_view::{graphics::Rect, Editor};
20− Editor,
21−};
22use tui::layout::Constraint;
15use tui::layout::Constraint;
23
16
24−pub trait Item: Sync + Send + 'static {
17+pub trait Item {
25 /// Additional editor state that is used for label calculation.
18 /// Additional editor state that is used for label calculation.
26− type Data: Sync + Send + 'static;
19+ type Data;
27
20
28 fn format(&self, data: &Self::Data) -> Row;
21 fn format(&self, data: &Self::Data) -> Row;
29
22
@@ -58,8 +51,9 @@ pub struct Menu<T: Item> {
58
51
59 cursor: Option<usize>,
52 cursor: Option<usize>,
60
53
54+ matcher: Box<Matcher>,
61 /// (index, score)
55 /// (index, score)
62− matches: Vec<(u32, u32)>,
56+ matches: Vec<(usize, i64)>,
63
57
64 widths: Vec<Constraint>,
58 widths: Vec<Constraint>,
65
59
@@ -81,10 +75,11 @@ impl<T: Item> Menu<T> {
81 editor_data: <T as Item>::Data,
75 editor_data: <T as Item>::Data,
82 callback_fn: impl Fn(&mut Editor, Option<&T>, MenuEvent) + 'static,
76 callback_fn: impl Fn(&mut Editor, Option<&T>, MenuEvent) + 'static,
83 ) -> Self {
77 ) -> Self {
84− let matches = (0..options.len() as u32).map(|i| (i, 0)).collect();
78+ let matches = (0..options.len()).map(|i| (i, 0)).collect();
85 Self {
79 Self {
86 options,
80 options,
87 editor_data,
81 editor_data,
82+ matcher: Box::new(Matcher::default().ignore_case()),
88 matches,
83 matches,
89 cursor: None,
84 cursor: None,
90 widths: Vec::new(),
85 widths: Vec::new(),
@@ -99,19 +94,20 @@ impl<T: Item> Menu<T> {
99 pub fn score(&mut self, pattern: &str) {
94 pub fn score(&mut self, pattern: &str) {
100 // reuse the matches allocation
95 // reuse the matches allocation
101 self.matches.clear();
96 self.matches.clear();
102− let mut matcher = MATCHER.lock();
97+ self.matches.extend(
103− matcher.config = Config::DEFAULT;
98+ self.options
104− let pattern = Atom::new(pattern, CaseMatching::Ignore, AtomKind::Fuzzy, false);
99+ .iter()
105− let mut buf = Vec::new();
100+ .enumerate()
106− let matches = self.options.iter().enumerate().filter_map(|(i, option)| {
101+ .filter_map(|(index, option)| {
107− let text = option.filter_text(&self.editor_data);
102+ let text = option.filter_text(&self.editor_data);
108− pattern
103+ // TODO: using fuzzy_indices could give us the char idx for match highlighting
109− .score(Utf32Str::new(&text, &mut buf), &mut matcher)
104+ self.matcher
105+ .fuzzy_match(&text, pattern)
110− .map(|score| (i as u32, score as u32))
106+ .map(|score| (index, score))
111− });
107+ }),
112− self.matches.extend(matches);
108+ );
109+ // Order of equal elements needs to be preserved as LSP preselected items come in order of high to low priority
113− self.matches
110+ self.matches.sort_by_key(|(_, score)| -score);
114− .sort_unstable_by_key(|&(i, score)| (Reverse(score), i));
115
111
116 // reset cursor position
112 // reset cursor position
117 self.cursor = None;
113 self.cursor = None;
@@ -205,7 +201,7 @@ impl<T: Item> Menu<T> {
205 self.cursor.and_then(|cursor| {
201 self.cursor.and_then(|cursor| {
206 self.matches
202 self.matches
207 .get(cursor)
203 .get(cursor)
208− .map(|(index, _score)| &self.options[*index as usize])
204+ .map(|(index, _score)| &self.options[*index])
209 })
205 })
210 }
206 }
211
207
@@ -213,7 +209,7 @@ impl<T: Item> Menu<T> {
213 self.cursor.and_then(|cursor| {
209 self.cursor.and_then(|cursor| {
214 self.matches
210 self.matches
215 .get(cursor)
211 .get(cursor)
216− .map(|(index, _score)| &mut self.options[*index as usize])
212+ .map(|(index, _score)| &mut self.options[*index])
217 })
213 })
218 }
214 }
219
215
@@ -251,21 +247,6 @@ impl<T: Item + 'static> Component for Menu<T> {
251 compositor.pop();
247 compositor.pop();
252 }));
248 }));
253
249
254− // Ignore tab key when supertab is turned on in order not to interfere
255− // with it. (Is there a better way to do this?)
256− if (event == key!(Tab) || event == shift!(Tab))
257− && cx.editor.config().auto_completion
258− && matches!(
259− cx.editor.config().smart_tab,
260− Some(SmartTabConfig {
261− enable: true,
262− supersede_menu: true,
263− })
264− )
265− {
266− return EventResult::Ignored(None);
267− }
268−
269 match event {
250 match event {
270 // esc or ctrl-c aborts the completion and closes the menu
251 // esc or ctrl-c aborts the completion and closes the menu
271 key!(Esc) | ctrl!('c') => {
252 key!(Esc) | ctrl!('c') => {
@@ -329,15 +310,6 @@ impl<T: Item + 'static> Component for Menu<T> {
329 let selected = theme.get("ui.menu.selected");
310 let selected = theme.get("ui.menu.selected");
330 surface.clear_with(area, style);
311 surface.clear_with(area, style);
331
312
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−
341 let scroll = self.scroll;
313 let scroll = self.scroll;
342
314
343 let options: Vec<_> = self
315 let options: Vec<_> = self
@@ -345,7 +317,7 @@ impl<T: Item + 'static> Component for Menu<T> {
345 .iter()
317 .iter()
346 .map(|(index, _score)| {
318 .map(|(index, _score)| {
347 // (index, self.options.get(*index).unwrap()) // get_unchecked
319 // (index, self.options.get(*index).unwrap()) // get_unchecked
348− &self.options[*index as usize] // get_unchecked
320+ &self.options[*index] // get_unchecked
349 })
321 })
350 .collect();
322 .collect();
351
323
@@ -378,19 +350,15 @@ impl<T: Item + 'static> Component for Menu<T> {
378 false,
350 false,
379 );
351 );
380
352
381− let render_borders = cx.editor.menu_border();
382−
383− if !render_borders {
384− if let Some(cursor) = self.cursor {
353+ if let Some(cursor) = self.cursor {
385− let offset_from_top = cursor - scroll;
354+ let offset_from_top = cursor - scroll;
386− let left = &mut surface[(area.left(), area.y + offset_from_top as u16)];
355+ let left = &mut surface[(area.left(), area.y + offset_from_top as u16)];
387− left.set_style(selected);
356+ left.set_style(selected);
388− let right = &mut surface[(
357+ let right = &mut surface[(
389− area.right().saturating_sub(1),
358+ area.right().saturating_sub(1),
390− area.y + offset_from_top as u16,
359+ area.y + offset_from_top as u16,
391− )];
360+ )];
392− right.set_style(selected);
361+ right.set_style(selected);
393− }
394 }
362 }
395
363
396 let fits = len <= win_height;
364 let fits = len <= win_height;
@@ -405,13 +373,12 @@ impl<T: Item + 'static> Component for Menu<T> {
405 for i in 0..win_height {
373 for i in 0..win_height {
406 cell = &mut surface[(area.right() - 1, area.top() + i as u16)];
374 cell = &mut surface[(area.right() - 1, area.top() + i as u16)];
407
375
408− let half_block = if render_borders { "▌" } else { "▐" };
376+ cell.set_symbol("▐"); // right half block
409
377
410 if scroll_line <= i && i < scroll_line + scroll_height {
378 if scroll_line <= i && i < scroll_line + scroll_height {
411 // Draw scroll thumb
379 // Draw scroll thumb
412− cell.set_symbol(half_block);
413 cell.set_fg(scroll_style.fg.unwrap_or(helix_view::theme::Color::Reset));
380 cell.set_fg(scroll_style.fg.unwrap_or(helix_view::theme::Color::Reset));
414− } else if !render_borders {
381+ } else {
415 // Draw scroll track
382 // Draw scroll track
416 cell.set_fg(scroll_style.bg.unwrap_or(helix_view::theme::Color::Reset));
383 cell.set_fg(scroll_style.bg.unwrap_or(helix_view::theme::Color::Reset));
417 }
384 }
helix-term/src/ui/mod.rs+150−91
@@ -1,12 +1,13 @@
1mod completion;
1mod completion;
2mod document;
2mod document;
3pub(crate) mod editor;
3pub(crate) mod editor;
4+mod fuzzy_match;
4mod info;
5mod info;
5pub mod lsp;
6pub mod lsp;
6mod markdown;
7mod markdown;
7pub mod menu;
8pub mod menu;
8pub mod overlay;
9pub mod overlay;
9−pub mod picker;
10+mod picker;
10pub mod popup;
11pub mod popup;
11mod prompt;
12mod prompt;
12mod spinner;
13mod spinner;
@@ -63,7 +64,7 @@ pub fn regex_prompt(
63 prompt: std::borrow::Cow<'static, str>,
64 prompt: std::borrow::Cow<'static, str>,
64 history_register: Option<char>,
65 history_register: Option<char>,
65 completion_fn: impl FnMut(&Editor, &str) -> Vec<prompt::Completion> + 'static,
66 completion_fn: impl FnMut(&Editor, &str) -> Vec<prompt::Completion> + 'static,
66− fun: impl Fn(&mut crate::compositor::Context, Regex, PromptEvent) + 'static,
67+ fun: impl Fn(&mut Editor, Regex, PromptEvent) + 'static,
67) {
68) {
68 let (view, doc) = current!(cx.editor);
69 let (view, doc) = current!(cx.editor);
69 let doc_id = view.doc;
70 let doc_id = view.doc;
@@ -110,7 +111,7 @@ pub fn regex_prompt(
110 view.jumps.push((doc_id, snapshot.clone()));
111 view.jumps.push((doc_id, snapshot.clone()));
111 }
112 }
112
113
113− fun(cx, regex, event);
114+ fun(cx.editor, regex, event);
114
115
115 let (view, doc) = current!(cx.editor);
116 let (view, doc) = current!(cx.editor);
116 view.ensure_cursor_in_view(doc, config.scrolloff);
117 view.ensure_cursor_in_view(doc, config.scrolloff);
@@ -141,14 +142,16 @@ pub fn regex_prompt(
141 };
142 };
142
143
143 cx.jobs.callback(callback);
144 cx.jobs.callback(callback);
145+ } else {
146+ // Update
147+ // TODO: mark command line as error
144 }
148 }
145 }
149 }
146 }
150 }
147 }
151 }
148 }
152 }
149 },
153 },
150− )
154+ );
151− .with_language("regex", std::sync::Arc::clone(&cx.editor.syn_loader));
152 // Calculate initial completion
155 // Calculate initial completion
153 prompt.recalculate_completion(cx.editor);
156 prompt.recalculate_completion(cx.editor);
154 // prompt
157 // prompt
@@ -173,13 +176,9 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> Picker
173 .git_ignore(config.file_picker.git_ignore)
176 .git_ignore(config.file_picker.git_ignore)
174 .git_global(config.file_picker.git_global)
177 .git_global(config.file_picker.git_global)
175 .git_exclude(config.file_picker.git_exclude)
178 .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)
179 .max_depth(config.file_picker.max_depth)
178 .filter_entry(move |entry| filter_picker_entry(entry, &absolute_root, dedup_symlinks));
180 .filter_entry(move |entry| filter_picker_entry(entry, &absolute_root, dedup_symlinks));
179
181
180− walk_builder.add_custom_ignore_filename(helix_loader::config_dir().join("ignore"));
181− walk_builder.add_custom_ignore_filename(".helix/ignore");
182−
183 // We want to exclude files that the editor can't handle yet
182 // We want to exclude files that the editor can't handle yet
184 let mut type_builder = TypesBuilder::new();
183 let mut type_builder = TypesBuilder::new();
185 type_builder
184 type_builder
@@ -193,16 +192,32 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> Picker
193 .build()
192 .build()
194 .expect("failed to build excluded_types");
193 .expect("failed to build excluded_types");
195 walk_builder.types(excluded_types);
194 walk_builder.types(excluded_types);
195+
196+ // We want files along with their modification date for sorting
196− let mut files = walk_builder.build().filter_map(|entry| {
197+ let files = walk_builder.build().filter_map(|entry| {
197 let entry = entry.ok()?;
198 let entry = entry.ok()?;
199+ // 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() {
200+ if entry.file_type()?.is_file() {
201+ Some(entry.into_path())
202+ } else {
199− return None;
203+ None
200 }
204 }
201− Some(entry.into_path())
202 });
205 });
206+
207+ // Cap the number of files if we aren't in a git project, preventing
208+ // hangs when using the picker in your home directory
209+ let mut files: Vec<PathBuf> = if root.join(".git").exists() {
210+ files.collect()
211+ } else {
212+ // const MAX: usize = 8192;
213+ const MAX: usize = 100_000;
214+ files.take(MAX).collect()
215+ };
216+ files.sort();
217+
203 log::debug!("file_picker init {:?}", Instant::now().duration_since(now));
218 log::debug!("file_picker init {:?}", Instant::now().duration_since(now));
204
219
205− let picker = Picker::new(Vec::new(), root, move |cx, path: &PathBuf, action| {
220+ Picker::new(files, root, move |cx, path: &PathBuf, action| {
206 if let Err(e) = cx.editor.open(path, action) {
221 if let Err(e) = cx.editor.open(path, action) {
207 let err = if let Some(err) = e.source() {
222 let err = if let Some(err) = e.source() {
208 format!("{}", err)
223 format!("{}", err)
@@ -212,41 +227,20 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> Picker
212 cx.editor.set_error(err);
227 cx.editor.set_error(err);
213 }
228 }
214 })
229 })
215− .with_preview(|_editor, path| Some((path.clone().into(), None)));
230+ .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
239}
231}
240
232
241pub mod completers {
233pub mod completers {
242 use crate::ui::prompt::Completion;
234 use crate::ui::prompt::Completion;
243− use helix_core::fuzzy::fuzzy_match;
235+ use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
236+ use fuzzy_matcher::FuzzyMatcher;
244 use helix_core::syntax::LanguageServerFeature;
237 use helix_core::syntax::LanguageServerFeature;
245 use helix_view::document::SCRATCH_BUFFER_NAME;
238 use helix_view::document::SCRATCH_BUFFER_NAME;
246 use helix_view::theme;
239 use helix_view::theme;
247 use helix_view::{editor::Config, Editor};
240 use helix_view::{editor::Config, Editor};
248 use once_cell::sync::Lazy;
241 use once_cell::sync::Lazy;
249 use std::borrow::Cow;
242 use std::borrow::Cow;
243+ use std::cmp::Reverse;
250
244
251 pub type Completer = fn(&Editor, &str) -> Vec<Completion>;
245 pub type Completer = fn(&Editor, &str) -> Vec<Completion>;
252
246
@@ -255,16 +249,31 @@ pub mod completers {
255 }
249 }
256
250
257 pub fn buffer(editor: &Editor, input: &str) -> Vec<Completion> {
251 pub fn buffer(editor: &Editor, input: &str) -> Vec<Completion> {
258− let names = editor.documents.values().map(|doc| {
252+ let mut names: Vec<_> = editor
253+ .documents
254+ .values()
255+ .map(|doc| {
256+ let name = doc
259− doc.relative_path()
257+ .relative_path()
260− .map(|p| p.display().to_string().into())
258+ .map(|p| p.display().to_string())
261− .unwrap_or_else(|| Cow::from(SCRATCH_BUFFER_NAME))
259+ .unwrap_or_else(|| String::from(SCRATCH_BUFFER_NAME));
260+ ((0..), Cow::from(name))
262− });
261+ })
263−
262+ .collect();
264− fuzzy_match(input, names, true)
263+
264+ let matcher = Matcher::default();
265+
266+ let mut matches: Vec<_> = names
265 .into_iter()
267 .into_iter()
268+ .filter_map(|(_range, name)| {
269+ matcher.fuzzy_match(&name, input).map(|score| (name, score))
270+ })
271+ .collect();
272+
273+ matches.sort_unstable_by_key(|(_file, score)| Reverse(*score));
266− .map(|(name, _)| ((0..), name))
274+ names = matches.into_iter().map(|(name, _)| ((0..), name)).collect();
267− .collect()
275+
276+ names
268 }
277 }
269
278
270 pub fn theme(_editor: &Editor, input: &str) -> Vec<Completion> {
279 pub fn theme(_editor: &Editor, input: &str) -> Vec<Completion> {
@@ -277,10 +286,26 @@ pub mod completers {
277 names.sort();
286 names.sort();
278 names.dedup();
287 names.dedup();
279
288
280− fuzzy_match(input, names, false)
289+ let mut names: Vec<_> = names
281 .into_iter()
290 .into_iter()
282− .map(|(name, _)| ((0..), name.into()))
291+ .map(|name| ((0..), Cow::from(name)))
283− .collect()
292+ .collect();
293+
294+ let matcher = Matcher::default();
295+
296+ let mut matches: Vec<_> = names
297+ .into_iter()
298+ .filter_map(|(_range, name)| {
299+ matcher.fuzzy_match(&name, input).map(|score| (name, score))
300+ })
301+ .collect();
302+
303+ matches.sort_unstable_by(|(name1, score1), (name2, score2)| {
304+ (Reverse(*score1), name1).cmp(&(Reverse(*score2), name2))
305+ });
306+ names = matches.into_iter().map(|(name, _)| ((0..), name)).collect();
307+
308+ names
284 }
309 }
285
310
286 /// Recursive function to get all keys from this value and add them to vec
311 /// Recursive function to get all keys from this value and add them to vec
@@ -307,22 +332,22 @@ pub mod completers {
307 keys
332 keys
308 });
333 });
309
334
310− fuzzy_match(input, &*KEYS, false)
335+ let matcher = Matcher::default();
336+
337+ let mut matches: Vec<_> = KEYS
338+ .iter()
339+ .filter_map(|name| matcher.fuzzy_match(name, input).map(|score| (name, score)))
340+ .collect();
341+
342+ matches.sort_unstable_by_key(|(_file, score)| Reverse(*score));
343+ matches
311 .into_iter()
344 .into_iter()
312 .map(|(name, _)| ((0..), name.into()))
345 .map(|(name, _)| ((0..), name.into()))
313 .collect()
346 .collect()
314 }
347 }
315
348
316 pub fn filename(editor: &Editor, input: &str) -> Vec<Completion> {
349 pub fn filename(editor: &Editor, input: &str) -> Vec<Completion> {
317− filename_with_git_ignore(editor, input, true)
318− }
319−
320− pub fn filename_with_git_ignore(
321− editor: &Editor,
322− input: &str,
323− git_ignore: bool,
324− ) -> Vec<Completion> {
325− filename_impl(editor, input, git_ignore, |entry| {
350+ filename_impl(editor, input, |entry| {
326 let is_dir = entry.file_type().map_or(false, |entry| entry.is_dir());
351 let is_dir = entry.file_type().map_or(false, |entry| entry.is_dir());
327
352
328 if is_dir {
353 if is_dir {
@@ -334,6 +359,8 @@ pub mod completers {
334 }
359 }
335
360
336 pub fn language(editor: &Editor, input: &str) -> Vec<Completion> {
361 pub fn language(editor: &Editor, input: &str) -> Vec<Completion> {
362+ let matcher = Matcher::default();
363+
337 let text: String = "text".into();
364 let text: String = "text".into();
338
365
339 let language_ids = editor
366 let language_ids = editor
@@ -342,13 +369,27 @@ pub mod completers {
342 .map(|config| &config.language_id)
369 .map(|config| &config.language_id)
343 .chain(std::iter::once(&text));
370 .chain(std::iter::once(&text));
344
371
372+ let mut matches: Vec<_> = language_ids
373+ .filter_map(|language_id| {
374+ matcher
345− fuzzy_match(input, language_ids, false)
375+ .fuzzy_match(language_id, input)
376+ .map(|score| (language_id, score))
377+ })
378+ .collect();
379+
380+ matches.sort_unstable_by(|(language1, score1), (language2, score2)| {
381+ (Reverse(*score1), language1).cmp(&(Reverse(*score2), language2))
382+ });
383+
384+ matches
346 .into_iter()
385 .into_iter()
347− .map(|(name, _)| ((0..), name.to_owned().into()))
386+ .map(|(language, _score)| ((0..), language.clone().into()))
348 .collect()
387 .collect()
349 }
388 }
350
389
351 pub fn lsp_workspace_command(editor: &Editor, input: &str) -> Vec<Completion> {
390 pub fn lsp_workspace_command(editor: &Editor, input: &str) -> Vec<Completion> {
391+ let matcher = Matcher::default();
392+
352 let Some(options) = doc!(editor)
393 let Some(options) = doc!(editor)
353 .language_servers_with_feature(LanguageServerFeature::WorkspaceCommand)
394 .language_servers_with_feature(LanguageServerFeature::WorkspaceCommand)
354 .find_map(|ls| ls.capabilities().execute_command_provider.as_ref())
395 .find_map(|ls| ls.capabilities().execute_command_provider.as_ref())
@@ -356,22 +397,28 @@ pub mod completers {
356 return vec![];
397 return vec![];
357 };
398 };
358
399
400+ let mut matches: Vec<_> = options
401+ .commands
402+ .iter()
403+ .filter_map(|command| {
404+ matcher
359− fuzzy_match(input, &options.commands, false)
405+ .fuzzy_match(command, input)
406+ .map(|score| (command, score))
407+ })
408+ .collect();
409+
410+ matches.sort_unstable_by(|(command1, score1), (command2, score2)| {
411+ (Reverse(*score1), command1).cmp(&(Reverse(*score2), command2))
412+ });
413+
414+ matches
360 .into_iter()
415 .into_iter()
361− .map(|(name, _)| ((0..), name.to_owned().into()))
416+ .map(|(command, _score)| ((0..), command.clone().into()))
362 .collect()
417 .collect()
363 }
418 }
364
419
365 pub fn directory(editor: &Editor, input: &str) -> Vec<Completion> {
420 pub fn directory(editor: &Editor, input: &str) -> Vec<Completion> {
366− directory_with_git_ignore(editor, input, true)
367− }
368−
369− pub fn directory_with_git_ignore(
370− editor: &Editor,
371− input: &str,
372− git_ignore: bool,
373− ) -> Vec<Completion> {
374− filename_impl(editor, input, git_ignore, |entry| {
421+ filename_impl(editor, input, |entry| {
375 let is_dir = entry.file_type().map_or(false, |entry| entry.is_dir());
422 let is_dir = entry.file_type().map_or(false, |entry| entry.is_dir());
376
423
377 if is_dir {
424 if is_dir {
@@ -394,12 +441,7 @@ pub mod completers {
394 }
441 }
395
442
396 // TODO: we could return an iter/lazy thing so it can fetch as many as it needs.
443 // TODO: we could return an iter/lazy thing so it can fetch as many as it needs.
397− fn filename_impl<F>(
444+ fn filename_impl<F>(_editor: &Editor, input: &str, filter_fn: F) -> Vec<Completion>
398− _editor: &Editor,
399− input: &str,
400− git_ignore: bool,
401− filter_fn: F,
402− ) -> Vec<Completion>
403 where
445 where
404 F: Fn(&ignore::DirEntry) -> FileMatch,
446 F: Fn(&ignore::DirEntry) -> FileMatch,
405 {
447 {
@@ -430,7 +472,7 @@ pub mod completers {
430 match path.parent() {
472 match path.parent() {
431 Some(path) if !path.as_os_str().is_empty() => path.to_path_buf(),
473 Some(path) if !path.as_os_str().is_empty() => path.to_path_buf(),
432 // Path::new("h")'s parent is Some("")...
474 // Path::new("h")'s parent is Some("")...
433− _ => helix_loader::current_working_dir(),
475+ _ => std::env::current_dir().expect("couldn't determine current directory"),
434 }
476 }
435 };
477 };
436
478
@@ -439,10 +481,9 @@ pub mod completers {
439
481
440 let end = input.len()..;
482 let end = input.len()..;
441
483
442− let files = WalkBuilder::new(&dir)
484+ let mut files: Vec<_> = WalkBuilder::new(&dir)
443 .hidden(false)
485 .hidden(false)
444 .follow_links(false) // We're scanning over depth 1
486 .follow_links(false) // We're scanning over depth 1
445− .git_ignore(git_ignore)
446 .max_depth(Some(1))
487 .max_depth(Some(1))
447 .build()
488 .build()
448 .filter_map(|file| {
489 .filter_map(|file| {
@@ -471,25 +512,43 @@ pub mod completers {
471 path.push("");
512 path.push("");
472 }
513 }
473
514
474− let path = path.into_os_string().into_string().ok()?;
515+ let path = path.to_str()?.to_owned();
475− Some(Cow::from(path))
516+ Some((end.clone(), Cow::from(path)))
476 })
517 })
477 }) // TODO: unwrap or skip
518 }) // TODO: unwrap or skip
478− .filter(|path| !path.is_empty());
519+ .filter(|(_, path)| !path.is_empty()) // TODO
520+ .collect();
479
521
480 // if empty, return a list of dirs and files in current dir
522 // if empty, return a list of dirs and files in current dir
481 if let Some(file_name) = file_name {
523 if let Some(file_name) = file_name {
524+ let matcher = Matcher::default();
525+
526+ // inefficient, but we need to calculate the scores, filter out None, then sort.
527+ let mut matches: Vec<_> = files
528+ .into_iter()
529+ .filter_map(|(_range, file)| {
530+ matcher
531+ .fuzzy_match(&file, &file_name)
532+ .map(|score| (file, score))
533+ })
534+ .collect();
535+
482 let range = (input.len().saturating_sub(file_name.len()))..;
536 let range = (input.len().saturating_sub(file_name.len()))..;
483− fuzzy_match(&file_name, files, true)
537+
538+ matches.sort_unstable_by(|(file1, score1), (file2, score2)| {
539+ (Reverse(*score1), file1).cmp(&(Reverse(*score2), file2))
540+ });
541+
542+ files = matches
484 .into_iter()
543 .into_iter()
485− .map(|(name, _)| (range.clone(), name))
544+ .map(|(file, _)| (range.clone(), file))
486− .collect()
545+ .collect();
487
546
488 // TODO: complete to longest common match
547 // TODO: complete to longest common match
489 } else {
548 } else {
490− let mut files: Vec<_> = files.map(|file| (end.clone(), file)).collect();
491 files.sort_unstable_by(|(_, path1), (_, path2)| path1.cmp(path2));
549 files.sort_unstable_by(|(_, path1), (_, path2)| path1.cmp(path2));
492− files
493 }
550 }
551+
552+ files
494 }
553 }
495}
554}
helix-term/src/ui/picker.rs+325−362
@@ -7,12 +7,11 @@ 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,
10 EditorView,
11 EditorView,
11 },
12 },
12};
13};
13use futures_util::{future::BoxFuture, FutureExt};
14use futures_util::{future::BoxFuture, FutureExt};
14−use nucleo::pattern::CaseMatching;
15−use nucleo::{Config, Nucleo, Utf32String};
16use tui::{
15use tui::{
17 buffer::Buffer as Surface,
16 buffer::Buffer as Surface,
18 layout::Constraint,
17 layout::Constraint,
@@ -20,23 +19,16 @@ use tui::{
20 widgets::{Block, BorderType, Borders, Cell, Table},
19 widgets::{Block, BorderType, Borders, Cell, Table},
21};
20};
22
21
22+use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
23use tui::widgets::Widget;
23use tui::widgets::Widget;
24
24
25−use std::{
25+use std::cmp::{self, Ordering};
26− collections::HashMap,
26+use std::{collections::HashMap, io::Read, path::PathBuf};
27− io::Read,
28− path::PathBuf,
29− sync::{
30− atomic::{self, AtomicBool},
31− Arc,
32− },
33−};
34
27
35use crate::ui::{Prompt, PromptEvent};
28use crate::ui::{Prompt, PromptEvent};
36use helix_core::{
29use helix_core::{
37− char_idx_at_visual_offset, fuzzy::MATCHER, movement::Direction,
30+ movement::Direction, text_annotations::TextAnnotations,
38− text_annotations::TextAnnotations, unicode::segmentation::UnicodeSegmentation, Position,
31+ unicode::segmentation::UnicodeSegmentation, Position, Syntax,
39− Syntax,
40};
32};
41use helix_view::{
33use helix_view::{
42 editor::Action,
34 editor::Action,
@@ -46,7 +38,6 @@ use helix_view::{
46 Document, DocumentId, Editor,
38 Document, DocumentId, Editor,
47};
39};
48
40
49−pub const ID: &str = "picker";
50use super::{menu::Item, overlay::Overlay};
41use super::{menu::Item, overlay::Overlay};
51
42
52pub const MIN_AREA_WIDTH_FOR_PREVIEW: u16 = 72;
43pub const MIN_AREA_WIDTH_FOR_PREVIEW: u16 = 72;
@@ -60,12 +51,12 @@ pub enum PathOrId {
60}
51}
61
52
62impl PathOrId {
53impl PathOrId {
63− fn get_canonicalized(self) -> Self {
54+ fn get_canonicalized(self) -> std::io::Result<Self> {
64 use PathOrId::*;
55 use PathOrId::*;
65− match self {
56+ Ok(match self {
66− Path(path) => Path(helix_core::path::get_canonicalized_path(&path)),
57+ Path(path) => Path(helix_core::path::get_canonicalized_path(&path)?),
67 Id(id) => Id(id),
58 Id(id) => Id(id),
68− }
59+ })
69 }
60 }
70}
61}
71
62
@@ -112,9 +103,9 @@ impl Preview<'_, '_> {
112 /// Alternate text to show for the preview.
103 /// Alternate text to show for the preview.
113 fn placeholder(&self) -> &str {
104 fn placeholder(&self) -> &str {
114 match *self {
105 match *self {
115− Self::EditorDocument(_) => "<Invalid file location>",
106+ Self::EditorDocument(_) => "<File preview>",
116 Self::Cached(preview) => match preview {
107 Self::Cached(preview) => match preview {
117− CachedPreview::Document(_) => "<Invalid file location>",
108+ CachedPreview::Document(_) => "<File preview>",
118 CachedPreview::Binary => "<Binary file>",
109 CachedPreview::Binary => "<Binary file>",
119 CachedPreview::LargeFile => "<File too large to preview>",
110 CachedPreview::LargeFile => "<File too large to preview>",
120 CachedPreview::NotFound => "<File not found>",
111 CachedPreview::NotFound => "<File not found>",
@@ -123,71 +114,20 @@ impl Preview<'_, '_> {
123 }
114 }
124}
115}
125
116
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−
179pub struct Picker<T: Item> {
117pub struct Picker<T: Item> {
118+ options: Vec<T>,
180− editor_data: Arc<T::Data>,
119+ editor_data: T::Data,
181− shutdown: Arc<AtomicBool>,
120+ // filter: String,
182− matcher: Nucleo<T>,
121+ matcher: Box<Matcher>,
122+ matches: Vec<PickerMatch>,
183
123
184 /// Current height of the completions box
124 /// Current height of the completions box
185 completion_height: u16,
125 completion_height: u16,
186
126
187− cursor: u32,
127+ cursor: usize,
128+ // pattern: String,
188 prompt: Prompt,
129 prompt: Prompt,
189− previous_pattern: String,
130+ previous_pattern: (String, FuzzyQuery),
190−
191 /// Whether to show the preview panel (default true)
131 /// Whether to show the preview panel (default true)
192 show_preview: bool,
132 show_preview: bool,
193 /// Constraints for tabular formatting
133 /// Constraints for tabular formatting
@@ -204,59 +144,10 @@ pub struct Picker<T: Item> {
204}
144}
205
145
206impl<T: Item + 'static> Picker<T> {
146impl<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−
222 pub fn new(
147 pub fn new(
223 options: Vec<T>,
148 options: Vec<T>,
224 editor_data: T::Data,
149 editor_data: T::Data,
225 callback_fn: impl Fn(&mut Context, &T, Action) + 'static,
150 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,
260 ) -> Self {
151 ) -> Self {
261 let prompt = Prompt::new(
152 let prompt = Prompt::new(
262 "".into(),
153 "".into(),
@@ -265,13 +156,14 @@ impl<T: Item + 'static> Picker<T> {
265 |_editor: &mut Context, _pattern: &str, _event: PromptEvent| {},
156 |_editor: &mut Context, _pattern: &str, _event: PromptEvent| {},
266 );
157 );
267
158
268− Self {
159+ let mut picker = Self {
269− matcher,
160+ options,
270 editor_data,
161 editor_data,
271− shutdown,
162+ matcher: Box::default(),
163+ matches: Vec::new(),
272 cursor: 0,
164 cursor: 0,
273 prompt,
165 prompt,
274− previous_pattern: String::new(),
166+ previous_pattern: (String::new(), FuzzyQuery::default()),
275 truncate_start: true,
167 truncate_start: true,
276 show_preview: true,
168 show_preview: true,
277 callback_fn: Box::new(callback_fn),
169 callback_fn: Box::new(callback_fn),
@@ -280,15 +172,24 @@ impl<T: Item + 'static> Picker<T> {
280 preview_cache: HashMap::new(),
172 preview_cache: HashMap::new(),
281 read_buffer: Vec::with_capacity(1024),
173 read_buffer: Vec::with_capacity(1024),
282 file_fn: None,
174 file_fn: None,
283− }
175+ };
284− }
285
176
286− pub fn injector(&self) -> Injector<T> {
177+ picker.calculate_column_widths();
287− Injector {
178+
288− dst: self.matcher.injector(),
179+ // scoring on empty input
289− editor_data: self.editor_data.clone(),
180+ // TODO: just reuse score()
290− shutown: self.shutdown.clone(),
181+ picker
291− }
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+ }));
191+
192+ picker
292 }
193 }
293
194
294 pub fn truncate_start(mut self, truncate_start: bool) -> Self {
195 pub fn truncate_start(mut self, truncate_start: bool) -> Self {
@@ -301,25 +202,122 @@ impl<T: Item + 'static> Picker<T> {
301 preview_fn: impl Fn(&Editor, &T) -> Option<FileLocation> + 'static,
202 preview_fn: impl Fn(&Editor, &T) -> Option<FileLocation> + 'static,
302 ) -> Self {
203 ) -> Self {
303 self.file_fn = Some(Box::new(preview_fn));
204 self.file_fn = Some(Box::new(preview_fn));
304− // assumption: if we have a preview we are matching paths... If this is ever
305− // not true this could be a separate builder function
306− self.matcher.update_config(Config::DEFAULT.match_paths());
307 self
205 self
308 }
206 }
309
207
310 pub fn set_options(&mut self, new_options: Vec<T>) {
208 pub fn set_options(&mut self, new_options: Vec<T>) {
311− self.matcher.restart(false);
312− let injector = self.matcher.injector();
313− for item in new_options {
209+ self.options = new_options;
314− if let Some((item, matcher_text)) = item_to_nucleo(item, &self.editor_data) {
210+ self.cursor = 0;
315− injector.push(item, |dst| dst[0] = matcher_text);
211+ self.force_score();
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+ }
316 }
231 }
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;
317 }
245 }
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();
318 }
316 }
319
317
320 /// Move the cursor by a number of lines, either down (`Forward`) or up (`Backward`)
318 /// Move the cursor by a number of lines, either down (`Forward`) or up (`Backward`)
321− pub fn move_by(&mut self, amount: u32, direction: Direction) {
319+ pub fn move_by(&mut self, amount: usize, direction: Direction) {
322− let len = self.matcher.snapshot().matched_item_count();
320+ let len = self.matches.len();
323
321
324 if len == 0 {
322 if len == 0 {
325 // No results, can't move.
323 // No results, can't move.
@@ -338,12 +336,12 @@ impl<T: Item + 'static> Picker<T> {
338
336
339 /// Move the cursor down by exactly one page. After the last page comes the first page.
337 /// Move the cursor down by exactly one page. After the last page comes the first page.
340 pub fn page_up(&mut self) {
338 pub fn page_up(&mut self) {
341− self.move_by(self.completion_height as u32, Direction::Backward);
339+ self.move_by(self.completion_height as usize, Direction::Backward);
342 }
340 }
343
341
344 /// Move the cursor up by exactly one page. After the first page comes the last page.
342 /// Move the cursor up by exactly one page. After the first page comes the last page.
345 pub fn page_down(&mut self) {
343 pub fn page_down(&mut self) {
346− self.move_by(self.completion_height as u32, Direction::Forward);
344+ self.move_by(self.completion_height as usize, Direction::Forward);
347 }
345 }
348
346
349 /// Move the cursor to the first entry
347 /// Move the cursor to the first entry
@@ -353,18 +351,13 @@ impl<T: Item + 'static> Picker<T> {
353
351
354 /// Move the cursor to the last entry
352 /// Move the cursor to the last entry
355 pub fn to_end(&mut self) {
353 pub fn to_end(&mut self) {
356− self.cursor = self
357− .matcher
358− .snapshot()
359− .matched_item_count()
360− .saturating_sub(1);
354+ self.cursor = self.matches.len().saturating_sub(1);
361 }
355 }
362
356
363 pub fn selection(&self) -> Option<&T> {
357 pub fn selection(&self) -> Option<&T> {
364− self.matcher
358+ self.matches
365− .snapshot()
366− .get_matched_item(self.cursor)
359+ .get(self.cursor)
367− .map(|item| item.data)
360+ .map(|pmatch| &self.options[pmatch.index])
368 }
361 }
369
362
370 pub fn toggle_preview(&mut self) {
363 pub fn toggle_preview(&mut self) {
@@ -373,17 +366,8 @@ impl<T: Item + 'static> Picker<T> {
373
366
374 fn prompt_handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
367 fn prompt_handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
375 if let EventResult::Consumed(_) = self.prompt.handle_event(event, cx) {
368 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− }
387 }
371 }
388 EventResult::Consumed(None)
372 EventResult::Consumed(None)
389 }
373 }
@@ -391,7 +375,7 @@ impl<T: Item + 'static> Picker<T> {
391 fn current_file(&self, editor: &Editor) -> Option<FileLocation> {
375 fn current_file(&self, editor: &Editor) -> Option<FileLocation> {
392 self.selection()
376 self.selection()
393 .and_then(|current| (self.file_fn.as_ref()?)(editor, current))
377 .and_then(|current| (self.file_fn.as_ref()?)(editor, current))
394− .map(|(path_or_id, line)| (path_or_id.get_canonicalized(), line))
378+ .and_then(|(path_or_id, line)| path_or_id.get_canonicalized().ok().zip(Some(line)))
395 }
379 }
396
380
397 /// Get (cached) preview for a given path. If a document corresponding
381 /// Get (cached) preview for a given path. If a document corresponding
@@ -427,9 +411,12 @@ impl<T: Item + 'static> Picker<T> {
427 (size, _) if size > MAX_FILE_SIZE_FOR_PREVIEW => {
411 (size, _) if size > MAX_FILE_SIZE_FOR_PREVIEW => {
428 CachedPreview::LargeFile
412 CachedPreview::LargeFile
429 }
413 }
414+ _ => {
415+ // TODO: enable syntax highlighting; blocked by async rendering
430− _ => Document::open(path, None, None, editor.config.clone())
416+ Document::open(path, None, None, editor.config.clone())
431− .map(|doc| CachedPreview::Document(Box::new(doc)))
417+ .map(|doc| CachedPreview::Document(Box::new(doc)))
432− .unwrap_or(CachedPreview::NotFound),
418+ .unwrap_or(CachedPreview::NotFound)
419+ }
433 },
420 },
434 )
421 )
435 .unwrap_or(CachedPreview::NotFound);
422 .unwrap_or(CachedPreview::NotFound);
@@ -445,7 +432,7 @@ impl<T: Item + 'static> Picker<T> {
445
432
446 fn handle_idle_timeout(&mut self, cx: &mut Context) -> EventResult {
433 fn handle_idle_timeout(&mut self, cx: &mut Context) -> EventResult {
447 let Some((current_file, _)) = self.current_file(cx.editor) else {
434 let Some((current_file, _)) = self.current_file(cx.editor) else {
448− return EventResult::Consumed(None);
435+ return EventResult::Consumed(None)
449 };
436 };
450
437
451 // Try to find a document in the cache
438 // Try to find a document in the cache
@@ -466,24 +453,17 @@ impl<T: Item + 'static> Picker<T> {
466 let text = doc.text().clone();
453 let text = doc.text().clone();
467 let loader = cx.editor.syn_loader.clone();
454 let loader = cx.editor.syn_loader.clone();
468 let job = tokio::task::spawn_blocking(move || {
455 let job = tokio::task::spawn_blocking(move || {
456+ let syntax = language_config
469− let syntax = language_config.highlight_config(&loader.scopes()).and_then(
457+ .highlight_config(&loader.scopes())
470− |highlight_config| Syntax::new(text.slice(..), highlight_config, loader),
458+ .and_then(|highlight_config| Syntax::new(&text, highlight_config, loader));
471− );
472 let callback = move |editor: &mut Editor, compositor: &mut Compositor| {
459 let callback = move |editor: &mut Editor, compositor: &mut Compositor| {
473 let Some(syntax) = syntax else {
460 let Some(syntax) = syntax else {
474 log::info!("highlighting picker item failed");
461 log::info!("highlighting picker item failed");
475− return;
462+ return
476− };
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 };
463 };
483− let Some(picker) = picker
464+ let Some(Overlay { content: picker, .. }) = compositor.find::<Overlay<Self>>() else {
484− else {
485 log::info!("picker closed before syntax highlighting finished");
465 log::info!("picker closed before syntax highlighting finished");
486− return;
466+ return
487 };
467 };
488 // Try to find a document in the cache
468 // Try to find a document in the cache
489 let doc = match current_file {
469 let doc = match current_file {
@@ -512,14 +492,6 @@ impl<T: Item + 'static> Picker<T> {
512 }
492 }
513
493
514 fn render_picker(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
494 fn render_picker(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
515− let status = self.matcher.tick(10);
516− let snapshot = self.matcher.snapshot();
517− if status.changed {
518− self.cursor = self
519− .cursor
520− .min(snapshot.matched_item_count().saturating_sub(1))
521− }
522−
523 let text_style = cx.editor.theme.get("ui.text");
495 let text_style = cx.editor.theme.get("ui.text");
524 let selected = cx.editor.theme.get("ui.text.focus");
496 let selected = cx.editor.theme.get("ui.text.focus");
525 let highlight_style = cx.editor.theme.get("special").add_modifier(Modifier::BOLD);
497 let highlight_style = cx.editor.theme.get("special").add_modifier(Modifier::BOLD);
@@ -540,15 +512,8 @@ impl<T: Item + 'static> Picker<T> {
540 // -- Render the input bar:
512 // -- Render the input bar:
541
513
542 let area = inner.clip_left(1).with_height(1);
514 let area = inner.clip_left(1).with_height(1);
543− // render the prompt first since it will clear its background
544− self.prompt.render(area, surface, cx);
545
515
546− let count = format!(
516+ let count = format!("{}/{}", self.matches.len(), self.options.len());
547− "{}{}/{}",
548− if status.running { "(running) " } else { "" },
549− snapshot.matched_item_count(),
550− snapshot.item_count(),
551− );
552 surface.set_stringn(
517 surface.set_stringn(
553 (area.x + area.width).saturating_sub(count.len() as u16 + 1),
518 (area.x + area.width).saturating_sub(count.len() as u16 + 1),
554 area.y,
519 area.y,
@@ -557,6 +522,8 @@ impl<T: Item + 'static> Picker<T> {
557 text_style,
522 text_style,
558 );
523 );
559
524
525+ self.prompt.render(area, surface, cx);
526+
560 // -- Separator
527 // -- Separator
561 let sep_style = cx.editor.theme.get("ui.background.separator");
528 let sep_style = cx.editor.theme.get("ui.background.separator");
562 let borders = BorderType::line_symbols(BorderType::Plain);
529 let borders = BorderType::line_symbols(BorderType::Plain);
@@ -569,89 +536,106 @@ impl<T: Item + 'static> Picker<T> {
569 // -- Render the contents:
536 // -- Render the contents:
570 // subtract area of prompt from top
537 // subtract area of prompt from top
571 let inner = inner.clip_top(2);
538 let inner = inner.clip_top(2);
539+
572− let rows = inner.height as u32;
540+ let rows = inner.height;
573− let offset = self.cursor - (self.cursor % std::cmp::max(1, rows));
541+ let offset = self.cursor - (self.cursor % std::cmp::max(1, rows as usize));
574 let cursor = self.cursor.saturating_sub(offset);
542 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− }
584
543
585− let options = snapshot.matched_items(offset..end).map(|item| {
544+ let options = self
586− snapshot.pattern().column_pattern(0).indices(
545+ .matches
587− item.matcher_columns[0].slice(..),
546+ .iter()
588− &mut matcher,
547+ .skip(offset)
589− &mut indices,
548+ .take(rows as usize)
590− );
549+ .map(|pmatch| &self.options[pmatch.index])
591− indices.sort_unstable();
592− indices.dedup();
593− let mut row = item.data.format(&self.editor_data);
550+ .map(|option| option.format(&self.editor_data))
594−
551+ .map(|mut row| {
595− let mut grapheme_idx = 0u32;
552+ const TEMP_CELL_SEP: &str = " ";
596− let mut indices = indices.drain(..);
553+
597− let mut next_highlight_idx = indices.next().unwrap_or(u32::MAX);
554+ let line = row.cell_text().fold(String::new(), |mut s, frag| {
598− if self.widths.len() < row.cells.len() {
555+ s.push_str(&frag);
599− self.widths.resize(row.cells.len(), Constraint::Length(0));
556+ s.push_str(TEMP_CELL_SEP);
600− }
557+ s
601− let mut widths = self.widths.iter_mut();
602− for cell in &mut row.cells {
603− let Some(Constraint::Length(max_width)) = widths.next() else {
604− unreachable!();
605− };
558+ });
606
559
607− // merge index highlights on top of existing hightlights
560+ // Items are filtered by using the text returned by menu::Item::filter_text
608− let mut span_list = Vec::new();
561+ // but we do highlighting here using the text in Row and therefore there
609− let mut current_span = String::new();
562+ // might be inconsistencies. This is the best we can do since only the
610− let mut current_style = Style::default();
563+ // text in Row is displayed to the end user.
611− let mut width = 0;
564+ let (_score, highlights) = FuzzyQuery::new(self.prompt.line())
612−
565+ .fuzzy_indices(&line, &self.matcher)
613− let spans: &[Span] = cell.content.lines.first().map_or(&[], |it| it.0.as_slice());
566+ .unwrap_or_default();
614− for span in spans {
567+
615− // this looks like a bug on first glance, we are iterating
568+ let highlight_byte_ranges: Vec<_> = line
616− // graphemes but treating them as char indices. The reason that
569+ .char_indices()
617− // this is correct is that nucleo will only ever consider the first char
570+ .enumerate()
618− // of a grapheme (and discard the rest of the grapheme) so the indices
571+ .filter_map(|(char_idx, (byte_offset, ch))| {
619− // returned by nucleo are essentially grapheme indecies
572+ highlights
620− for grapheme in span.content.graphemes(true) {
573+ .contains(&char_idx)
621− let style = if grapheme_idx == next_highlight_idx {
574+ .then(|| byte_offset..byte_offset + ch.len_utf8())
622− next_highlight_idx = indices.next().unwrap_or(u32::MAX);
575+ })
576+ .collect();
577+
578+ // The starting byte index of the current (iterating) cell
579+ let mut cell_start_byte_offset = 0;
580+ for cell in row.cells.iter_mut() {
581+ let spans = match cell.content.lines.get(0) {
582+ Some(s) => s,
583+ None => {
584+ cell_start_byte_offset += TEMP_CELL_SEP.len();
585+ continue;
586+ }
587+ };
588+
589+ let mut cell_len = 0;
590+
591+ let graphemes_with_style: Vec<_> = spans
592+ .0
593+ .iter()
594+ .flat_map(|span| {
595+ span.content
596+ .grapheme_indices(true)
597+ .zip(std::iter::repeat(span.style))
598+ })
599+ .map(|((grapheme_byte_offset, grapheme), style)| {
600+ cell_len += grapheme.len();
601+ let start = cell_start_byte_offset;
602+
603+ let grapheme_byte_range =
604+ grapheme_byte_offset..grapheme_byte_offset + grapheme.len();
605+
606+ if highlight_byte_ranges.iter().any(|hl_rng| {
607+ hl_rng.start >= start + grapheme_byte_range.start
608+ && hl_rng.end <= start + grapheme_byte_range.end
609+ }) {
623− span.style.patch(highlight_style)
610+ (grapheme, style.patch(highlight_style))
624− } else {
611+ } else {
625− span.style
612+ (grapheme, style)
626− };
627− if style != current_style {
628− if !current_span.is_empty() {
629− span_list.push(Span::styled(current_span, current_style))
630 }
613 }
631− current_span = String::new();
614+ })
632− current_style = style;
615+ .collect();
616+
617+ let mut span_list: Vec<(String, Style)> = Vec::new();
618+ for (grapheme, style) in graphemes_with_style {
619+ if span_list.last().map(|(_, sty)| sty) == Some(&style) {
620+ let (string, _) = span_list.last_mut().unwrap();
621+ string.push_str(grapheme);
622+ } else {
623+ span_list.push((String::from(grapheme), style))
633 }
624 }
634− current_span.push_str(grapheme);
635− grapheme_idx += 1;
636 }
625 }
637− width += span.width();
638− }
639
626
640− span_list.push(Span::styled(current_span, current_style));
627+ let spans: Vec<Span> = span_list
641− if width as u16 > *max_width {
628+ .into_iter()
642− *max_width = width as u16;
629+ .map(|(string, style)| Span::styled(string, style))
643− }
630+ .collect();
631+ let spans: Spans = spans.into();
644− *cell = Cell::from(Spans::from(span_list));
632+ *cell = Cell::from(spans);
645
633
646− // spacer
634+ cell_start_byte_offset += cell_len + TEMP_CELL_SEP.len();
647− if grapheme_idx == next_highlight_idx {
648− next_highlight_idx = indices.next().unwrap_or(u32::MAX);
649 }
635 }
650− grapheme_idx += 1;
651− }
652
636
653− row
637+ row
654− });
638+ });
655
639
656 let table = Table::new(options)
640 let table = Table::new(options)
657 .style(text_style)
641 .style(text_style)
@@ -667,7 +651,7 @@ impl<T: Item + 'static> Picker<T> {
667 surface,
651 surface,
668 &mut TableState {
652 &mut TableState {
669 offset: 0,
653 offset: 0,
670− selected: Some(cursor as usize),
654+ selected: Some(cursor),
671 },
655 },
672 self.truncate_start,
656 self.truncate_start,
673 );
657 );
@@ -693,14 +677,8 @@ impl<T: Item + 'static> Picker<T> {
693 if let Some((path, range)) = self.current_file(cx.editor) {
677 if let Some((path, range)) = self.current_file(cx.editor) {
694 let preview = self.get_preview(path, cx.editor);
678 let preview = self.get_preview(path, cx.editor);
695 let doc = match preview.document() {
679 let doc = match preview.document() {
696− Some(doc)
680+ Some(doc) => doc,
697− if range.map_or(true, |(start, end)| {
681+ None => {
698− start <= end && end <= doc.text().len_lines()
699− }) =>
700− {
701− doc
702− }
703− _ => {
704 let alt_text = preview.placeholder();
682 let alt_text = preview.placeholder();
705 let x = inner.x + inner.width.saturating_sub(alt_text.len() as u16) / 2;
683 let x = inner.x + inner.width.saturating_sub(alt_text.len() as u16) / 2;
706 let y = inner.y + inner.height / 2;
684 let y = inner.y + inner.height / 2;
@@ -709,47 +687,32 @@ impl<T: Item + 'static> Picker<T> {
709 }
687 }
710 };
688 };
711
689
712− let mut offset = ViewPosition::default();
713− if let Some((start_line, end_line)) = range {
714− let height = end_line - start_line;
715− let text = doc.text().slice(..);
716− let start = text.line_to_char(start_line);
717− let middle = text.line_to_char(start_line + height / 2);
718− if height < inner.height as usize {
719− let text_fmt = doc.text_format(inner.width, None);
720− let annotations = TextAnnotations::default();
721− (offset.anchor, offset.vertical_offset) = char_idx_at_visual_offset(
722− text,
723− middle,
724− // align to middle
690+ // align to middle
725− -(inner.height as isize / 2),
691+ let first_line = range
726− 0,
692+ .map(|(start, end)| {
727− &text_fmt,
693+ let height = end.saturating_sub(start) + 1;
728− &annotations,
694+ let middle = start + (height.saturating_sub(1) / 2);
729− );
695+ middle.saturating_sub(inner.height as usize / 2).min(start)
730− if start < offset.anchor {
731− offset.anchor = start;
732− offset.vertical_offset = 0;
733− }
734− } else {
735− offset.anchor = start;
736− }
696+ })
737− }
697+ .unwrap_or(0);
738
698
699+ let offset = ViewPosition {
700+ anchor: doc.text().line_to_char(first_line),
701+ horizontal_offset: 0,
702+ vertical_offset: 0,
703+ };
704+
739− let syntax_highlights = EditorView::doc_syntax_highlights(
705+ let mut highlights = EditorView::doc_syntax_highlights(
740 doc,
706 doc,
741 offset.anchor,
707 offset.anchor,
742 area.height,
708 area.height,
743 &cx.editor.theme,
709 &cx.editor.theme,
744 );
710 );
745−
746− let mut overlay_highlights =
747− EditorView::empty_highlight_iter(doc, offset.anchor, area.height);
748 for spans in EditorView::doc_diagnostics_highlights(doc, &cx.editor.theme) {
711 for spans in EditorView::doc_diagnostics_highlights(doc, &cx.editor.theme) {
749 if spans.is_empty() {
712 if spans.is_empty() {
750 continue;
713 continue;
751 }
714 }
752− overlay_highlights = Box::new(helix_core::syntax::merge(overlay_highlights, spans));
715+ highlights = Box::new(helix_core::syntax::merge(highlights, spans));
753 }
716 }
754 let mut decorations: Vec<Box<dyn LineDecoration>> = Vec::new();
717 let mut decorations: Vec<Box<dyn LineDecoration>> = Vec::new();
755
718
@@ -780,8 +743,7 @@ impl<T: Item + 'static> Picker<T> {
780 offset,
743 offset,
781 // TODO: compute text annotations asynchronously here (like inlay hints)
744 // TODO: compute text annotations asynchronously here (like inlay hints)
782 &TextAnnotations::default(),
745 &TextAnnotations::default(),
783− syntax_highlights,
746+ highlights,
784− overlay_highlights,
785 &cx.editor.theme,
747 &cx.editor.theme,
786 &mut decorations,
748 &mut decorations,
787 &mut [],
749 &mut [],
@@ -790,7 +752,7 @@ impl<T: Item + 'static> Picker<T> {
790 }
752 }
791}
753}
792
754
793−impl<T: Item + 'static + Send + Sync> Component for Picker<T> {
755+impl<T: Item + 'static> Component for Picker<T> {
794 fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
756 fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
795 // +---------+ +---------+
757 // +---------+ +---------+
796 // |prompt | |preview |
758 // |prompt | |preview |
@@ -799,8 +761,7 @@ impl<T: Item + 'static + Send + Sync> Component for Picker<T> {
799 // | | | |
761 // | | | |
800 // +---------+ +---------+
762 // +---------+ +---------+
801
763
802− let render_preview =
803− self.show_preview && self.file_fn.is_some() && area.width > MIN_AREA_WIDTH_FOR_PREVIEW;
764+ let render_preview = self.show_preview && area.width > MIN_AREA_WIDTH_FOR_PREVIEW;
804
765
805 let picker_width = if render_preview {
766 let picker_width = if render_preview {
806 area.width / 2
767 area.width / 2
@@ -830,28 +791,11 @@ impl<T: Item + 'static + Send + Sync> Component for Picker<T> {
830 _ => return EventResult::Ignored(None),
791 _ => return EventResult::Ignored(None),
831 };
792 };
832
793
833− let close_fn = |picker: &mut Self| {
794+ let close_fn =
834− // if the picker is very large don't store it as last_picker to avoid
835− // excessive memory consumption
836− let callback: compositor::Callback = if picker.matcher.snapshot().item_count() > 100_000
837− {
838− Box::new(|compositor: &mut Compositor, _ctx| {
839− // remove the layer
840− compositor.pop();
841− })
842− } else {
843− // stop streaming in new items in the background, really we should
844− // be restarting the stream somehow once the picker gets
845− // reopened instead (like for an FS crawl) that would also remove the
846− // need for the special case above but that is pretty tricky
847− picker.shutdown.store(true, atomic::Ordering::Relaxed);
848− Box::new(|compositor: &mut Compositor, _ctx| {
849− // remove the layer
850− compositor.last_picker = compositor.pop();
851− })
852− };
853− EventResult::Consumed(Some(callback))
795+ EventResult::Consumed(Some(Box::new(|compositor: &mut Compositor, _ctx| {
796+ // remove the layer
797+ compositor.last_picker = compositor.pop();
854− };
798+ })));
855
799
856 // So that idle timeout retriggers
800 // So that idle timeout retriggers
857 ctx.editor.reset_idle_timer();
801 ctx.editor.reset_idle_timer();
@@ -875,7 +819,9 @@ impl<T: Item + 'static + Send + Sync> Component for Picker<T> {
875 key!(End) => {
819 key!(End) => {
876 self.to_end();
820 self.to_end();
877 }
821 }
822+ key!(Esc) | ctrl!('c') => {
878− key!(Esc) | ctrl!('c') => return close_fn(self),
823+ return close_fn;
824+ }
879 alt!(Enter) => {
825 alt!(Enter) => {
880 if let Some(option) = self.selection() {
826 if let Some(option) = self.selection() {
881 (self.callback_fn)(ctx, option, Action::Load);
827 (self.callback_fn)(ctx, option, Action::Load);
@@ -885,19 +831,19 @@ impl<T: Item + 'static + Send + Sync> Component for Picker<T> {
885 if let Some(option) = self.selection() {
831 if let Some(option) = self.selection() {
886 (self.callback_fn)(ctx, option, Action::Replace);
832 (self.callback_fn)(ctx, option, Action::Replace);
887 }
833 }
888− return close_fn(self);
834+ return close_fn;
889 }
835 }
890 ctrl!('s') => {
836 ctrl!('s') => {
891 if let Some(option) = self.selection() {
837 if let Some(option) = self.selection() {
892 (self.callback_fn)(ctx, option, Action::HorizontalSplit);
838 (self.callback_fn)(ctx, option, Action::HorizontalSplit);
893 }
839 }
894− return close_fn(self);
840+ return close_fn;
895 }
841 }
896 ctrl!('v') => {
842 ctrl!('v') => {
897 if let Some(option) = self.selection() {
843 if let Some(option) = self.selection() {
898 (self.callback_fn)(ctx, option, Action::VerticalSplit);
844 (self.callback_fn)(ctx, option, Action::VerticalSplit);
899 }
845 }
900− return close_fn(self);
846+ return close_fn;
901 }
847 }
902 ctrl!('t') => {
848 ctrl!('t') => {
903 self.toggle_preview();
849 self.toggle_preview();
@@ -925,15 +871,30 @@ impl<T: Item + 'static + Send + Sync> Component for Picker<T> {
925 self.completion_height = height.saturating_sub(4);
871 self.completion_height = height.saturating_sub(4);
926 Some((width, height))
872 Some((width, height))
927 }
873 }
874+}
928
875
929− fn id(&self) -> Option<&'static str> {
876+#[derive(PartialEq, Eq, Debug)]
930− Some(ID)
877+struct PickerMatch {
878+ score: i64,
879+ index: usize,
880+ len: usize,
881+}
882+
883+impl PickerMatch {
884+ fn key(&self) -> impl Ord {
885+ (cmp::Reverse(self.score), self.len, self.index)
931 }
886 }
932}
887}
933−impl<T: Item> Drop for Picker<T> {
888+
934− fn drop(&mut self) {
889+impl PartialOrd for PickerMatch {
935− // ensure we cancel any ongoing background threads streaming into the picker
890+ fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
936− self.shutdown.store(true, atomic::Ordering::Relaxed)
891+ Some(self.cmp(other))
892+ }
893+}
894+
895+impl Ord for PickerMatch {
896+ fn cmp(&self, other: &Self) -> Ordering {
897+ self.key().cmp(&other.key())
937 }
898 }
938}
899}
939
900
@@ -946,13 +907,15 @@ pub type DynQueryCallback<T> =
946
907
947/// A picker that updates its contents via a callback whenever the
908/// A picker that updates its contents via a callback whenever the
948/// query string changes. Useful for live grep, workspace symbols, etc.
909/// query string changes. Useful for live grep, workspace symbols, etc.
949−pub struct DynamicPicker<T: ui::menu::Item + Send + Sync> {
910+pub struct DynamicPicker<T: ui::menu::Item + Send> {
950 file_picker: Picker<T>,
911 file_picker: Picker<T>,
951 query_callback: DynQueryCallback<T>,
912 query_callback: DynQueryCallback<T>,
952 query: String,
913 query: String,
953}
914}
954
915
955−impl<T: ui::menu::Item + Send + Sync> DynamicPicker<T> {
916+impl<T: ui::menu::Item + Send> DynamicPicker<T> {
917+ pub const ID: &'static str = "dynamic-picker";
918+
956 pub fn new(file_picker: Picker<T>, query_callback: DynQueryCallback<T>) -> Self {
919 pub fn new(file_picker: Picker<T>, query_callback: DynQueryCallback<T>) -> Self {
957 Self {
920 Self {
958 file_picker,
921 file_picker,
@@ -962,7 +925,7 @@ impl<T: ui::menu::Item + Send + Sync> DynamicPicker<T> {
962 }
925 }
963}
926}
964
927
965−impl<T: Item + Send + Sync + 'static> Component for DynamicPicker<T> {
928+impl<T: Item + Send + 'static> Component for DynamicPicker<T> {
966 fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
929 fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
967 self.file_picker.render(area, surface, cx);
930 self.file_picker.render(area, surface, cx);
968 }
931 }
@@ -984,7 +947,7 @@ impl<T: Item + Send + Sync + 'static> Component for DynamicPicker<T> {
984 let callback = Callback::EditorCompositor(Box::new(move |editor, compositor| {
947 let callback = Callback::EditorCompositor(Box::new(move |editor, compositor| {
985 // Wrapping of pickers in overlay is done outside the picker code,
948 // Wrapping of pickers in overlay is done outside the picker code,
986 // so this is fragile and will break if wrapped in some other widget.
949 // so this is fragile and will break if wrapped in some other widget.
987− let picker = match compositor.find_id::<Overlay<DynamicPicker<T>>>(ID) {
950+ let picker = match compositor.find_id::<Overlay<DynamicPicker<T>>>(Self::ID) {
988 Some(overlay) => &mut overlay.content.file_picker,
951 Some(overlay) => &mut overlay.content.file_picker,
989 None => return,
952 None => return,
990 };
953 };
@@ -1005,6 +968,6 @@ impl<T: Item + Send + Sync + 'static> Component for DynamicPicker<T> {
1005 }
968 }
1006
969
1007 fn id(&self) -> Option<&'static str> {
970 fn id(&self) -> Option<&'static str> {
1008− Some(ID)
971+ Some(Self::ID)
1009 }
972 }
1010}
973}
helix-term/src/ui/popup.rs+7−27
@@ -3,10 +3,7 @@ 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::{
7− buffer::Buffer as Surface,
6+use tui::buffer::Buffer as Surface;
8− widgets::{Block, Borders, Widget},
9−};
10
7
11use helix_core::Position;
8use helix_core::Position;
12use helix_view::{
9use helix_view::{
@@ -255,29 +252,13 @@ impl<T: Component> Component for Popup<T> {
255 let background = cx.editor.theme.get("ui.popup");
252 let background = cx.editor.theme.get("ui.popup");
256 surface.clear_with(area, background);
253 surface.clear_with(area, background);
257
254
258− let render_borders = cx.editor.popup_border();
259−
260− let inner = if self
261− .contents
262− .type_name()
263− .starts_with("helix_term::ui::menu::Menu")
264− {
265− area
266− } else {
267− area.inner(&self.margin)
255+ let inner = 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−
275 self.contents.render(inner, surface, cx);
256 self.contents.render(inner, surface, cx);
276
257
277 // render scrollbar if contents do not fit
258 // render scrollbar if contents do not fit
278 if self.has_scrollbar {
259 if self.has_scrollbar {
279− let win_height = (inner.height as usize).saturating_sub(2 * border);
260+ let win_height = inner.height as usize;
280− let len = (self.child_size.1 as usize).saturating_sub(2 * border);
261+ let len = self.child_size.1 as usize;
281 let fits = len <= win_height;
262 let fits = len <= win_height;
282 let scroll = self.scroll;
263 let scroll = self.scroll;
283 let scroll_style = cx.editor.theme.get("ui.menu.scroll");
264 let scroll_style = cx.editor.theme.get("ui.menu.scroll");
@@ -293,15 +274,14 @@ impl<T: Component> Component for Popup<T> {
293
274
294 let mut cell;
275 let mut cell;
295 for i in 0..win_height {
276 for i in 0..win_height {
296− cell = &mut surface[(inner.right() - 1, inner.top() + (border + i) as u16)];
277+ cell = &mut surface[(inner.right() - 1, inner.top() + i as u16)];
297
278
298− let half_block = if render_borders { "▌" } else { "▐" };
279+ cell.set_symbol("▐"); // right half block
299
280
300 if scroll_line <= i && i < scroll_line + scroll_height {
281 if scroll_line <= i && i < scroll_line + scroll_height {
301 // Draw scroll thumb
282 // Draw scroll thumb
302− cell.set_symbol(half_block);
303 cell.set_fg(scroll_style.fg.unwrap_or(helix_view::theme::Color::Reset));
283 cell.set_fg(scroll_style.fg.unwrap_or(helix_view::theme::Color::Reset));
304− } else if !render_borders {
284+ } else {
305 // Draw scroll track
285 // Draw scroll track
306 cell.set_fg(scroll_style.bg.unwrap_or(helix_view::theme::Color::Reset));
286 cell.set_fg(scroll_style.bg.unwrap_or(helix_view::theme::Color::Reset));
307 }
287 }
helix-term/src/ui/prompt.rs+48−55
@@ -1,9 +1,7 @@
1use crate::compositor::{Component, Compositor, Context, Event, EventResult};
1use crate::compositor::{Component, Compositor, Context, Event, EventResult};
2use crate::{alt, ctrl, key, shift, ui};
2use crate::{alt, ctrl, key, shift, ui};
3−use helix_core::syntax;
4use helix_view::input::KeyEvent;
3use helix_view::input::KeyEvent;
5use helix_view::keyboard::KeyCode;
4use helix_view::keyboard::KeyCode;
6−use std::sync::Arc;
7use std::{borrow::Cow, ops::RangeFrom};
5use std::{borrow::Cow, ops::RangeFrom};
8use tui::buffer::Buffer as Surface;
6use tui::buffer::Buffer as Surface;
9use tui::widgets::{Block, Borders, Widget};
7use tui::widgets::{Block, Borders, Widget};
@@ -34,7 +32,6 @@ pub struct Prompt {
34 callback_fn: CallbackFn,
32 callback_fn: CallbackFn,
35 pub doc_fn: DocFn,
33 pub doc_fn: DocFn,
36 next_char_handler: Option<PromptCharHandler>,
34 next_char_handler: Option<PromptCharHandler>,
37− language: Option<(&'static str, Arc<syntax::Loader>)>,
38}
35}
39
36
40#[derive(Clone, Copy, PartialEq, Eq)]
37#[derive(Clone, Copy, PartialEq, Eq)]
@@ -86,7 +83,6 @@ impl Prompt {
86 callback_fn: Box::new(callback_fn),
83 callback_fn: Box::new(callback_fn),
87 doc_fn: Box::new(|_| None),
84 doc_fn: Box::new(|_| None),
88 next_char_handler: None,
85 next_char_handler: None,
89− language: None,
90 }
86 }
91 }
87 }
92
88
@@ -98,11 +94,6 @@ impl Prompt {
98 self
94 self
99 }
95 }
100
96
101− pub fn with_language(mut self, language: &'static str, loader: Arc<syntax::Loader>) -> Self {
102− self.language = Some((language, loader));
103− self
104− }
105−
106 pub fn line(&self) -> &String {
97 pub fn line(&self) -> &String {
107 &self.line
98 &self.line
108 }
99 }
@@ -306,8 +297,8 @@ impl Prompt {
306 direction: CompletionDirection,
297 direction: CompletionDirection,
307 ) {
298 ) {
308 (self.callback_fn)(cx, &self.line, PromptEvent::Abort);
299 (self.callback_fn)(cx, &self.line, PromptEvent::Abort);
309− let mut values = match cx.editor.registers.read(register, cx.editor) {
300+ let values = match cx.editor.registers.read(register) {
310− Some(values) if values.len() > 0 => values.rev(),
301+ Some(values) if !values.is_empty() => values,
311 _ => return,
302 _ => return,
312 };
303 };
313
304
@@ -315,16 +306,13 @@ impl Prompt {
315
306
316 let index = match direction {
307 let index = match direction {
317 CompletionDirection::Forward => self.history_pos.map_or(0, |i| i + 1),
308 CompletionDirection::Forward => self.history_pos.map_or(0, |i| i + 1),
318− CompletionDirection::Backward => self
309+ CompletionDirection::Backward => {
319− .history_pos
320− .unwrap_or_else(|| values.len())
321− .saturating_sub(1),
310+ self.history_pos.unwrap_or(values.len()).saturating_sub(1)
311+ }
322 }
312 }
323 .min(end);
313 .min(end);
324
314
325− self.line = values.nth(index).unwrap().to_string();
315+ self.line = values[index].clone();
326− // Appease the borrow checker.
327− drop(values);
328
316
329 self.history_pos = Some(index);
317 self.history_pos = Some(index);
330
318
@@ -368,7 +356,6 @@ impl Prompt {
368 let completion_color = theme.get("ui.menu");
356 let completion_color = theme.get("ui.menu");
369 let selected_color = theme.get("ui.menu.selected");
357 let selected_color = theme.get("ui.menu.selected");
370 let suggestion_color = theme.get("ui.text.inactive");
358 let suggestion_color = theme.get("ui.text.inactive");
371− let background = theme.get("ui.background");
372 // completion
359 // completion
373
360
374 let max_len = self
361 let max_len = self
@@ -464,32 +451,33 @@ impl Prompt {
464 }
451 }
465
452
466 let line = area.height - 1;
453 let line = area.height - 1;
467− surface.clear_with(area.clip_top(line), background);
468 // render buffer text
454 // render buffer text
469 surface.set_string(area.x, area.y + line, &self.prompt, prompt_color);
455 surface.set_string(area.x, area.y + line, &self.prompt, prompt_color);
470
456
471− let line_area = area.clip_left(self.prompt.len() as u16).clip_top(line);
472− if self.line.is_empty() {
457+ let (input, is_suggestion): (Cow<str>, bool) = if self.line.is_empty() {
473− // Show the most recently entered value as a suggestion.
458+ // latest value in the register list
474− if let Some(suggestion) = self
459+ match self
475 .history_register
460 .history_register
476− .and_then(|reg| cx.editor.registers.first(reg, cx.editor))
461+ .and_then(|reg| cx.editor.registers.last(reg))
462+ .map(|entry| entry.into())
477 {
463 {
478− surface.set_string(line_area.x, line_area.y, suggestion, suggestion_color);
464+ Some(value) => (value, true),
465+ None => (Cow::from(""), false),
479 }
466 }
480− } else if let Some((language, loader)) = self.language.as_ref() {
481− let mut text: ui::text::Text = crate::ui::markdown::highlighted_code_block(
482− &self.line,
483− language,
484− Some(&cx.editor.theme),
485− loader.clone(),
486− None,
487− )
488− .into();
489− text.render(line_area, surface, cx);
490 } else {
467 } else {
468+ (self.line.as_str().into(), false)
469+ };
470+
491− surface.set_string(line_area.x, line_area.y, self.line.clone(), prompt_color);
471+ surface.set_string(
472+ area.x + self.prompt.len() as u16,
473+ area.y + line,
474+ &input,
475+ if is_suggestion {
476+ suggestion_color
477+ } else {
478+ prompt_color
492− }
479+ },
480+ );
493 }
481 }
494}
482}
495
483
@@ -570,29 +558,25 @@ impl Component for Prompt {
570 } else {
558 } else {
571 let last_item = self
559 let last_item = self
572 .history_register
560 .history_register
573− .and_then(|reg| cx.editor.registers.first(reg, cx.editor))
561+ .and_then(|reg| cx.editor.registers.last(reg).cloned())
574− .map(|entry| entry.to_string())
562+ .map(|entry| entry.into())
575− .unwrap_or_else(|| String::from(""));
563+ .unwrap_or_else(|| Cow::from(""));
576
564
577 // handle executing with last command in history if nothing entered
565 // handle executing with last command in history if nothing entered
578− let input = if self.line.is_empty() {
566+ let input: Cow<str> = if self.line.is_empty() {
579− &last_item
567+ last_item
580 } else {
568 } else {
581 if last_item != self.line {
569 if last_item != self.line {
582 // store in history
570 // store in history
583 if let Some(register) = self.history_register {
571 if let Some(register) = self.history_register {
584− if let Err(err) =
585− cx.editor.registers.push(register, self.line.clone())
572+ cx.editor.registers.push(register, self.line.clone());
586− {
587− cx.editor.set_error(err.to_string());
588− }
589 };
573 };
590 }
574 }
591
575
592− &self.line
576+ self.line.as_str().into()
593 };
577 };
594
578
595− (self.callback_fn)(cx, input, PromptEvent::Validate);
579+ (self.callback_fn)(cx, &input, PromptEvent::Validate);
596
580
597 return close_fn;
581 return close_fn;
598 }
582 }
@@ -624,16 +608,25 @@ impl Component for Prompt {
624 self.completion = cx
608 self.completion = cx
625 .editor
609 .editor
626 .registers
610 .registers
627− .iter_preview()
611+ .inner()
612+ .iter()
613+ .map(|(ch, reg)| {
614+ let content = reg
615+ .read()
616+ .get(0)
617+ .and_then(|s| s.lines().next().to_owned())
618+ .unwrap_or_default();
628− .map(|(ch, preview)| (0.., format!("{} {}", ch, &preview).into()))
619+ (0.., format!("{} {}", ch, &content).into())
620+ })
629 .collect();
621 .collect();
630 self.next_char_handler = Some(Box::new(|prompt, c, context| {
622 self.next_char_handler = Some(Box::new(|prompt, c, context| {
631 prompt.insert_str(
623 prompt.insert_str(
632− &context
624+ context
633 .editor
625 .editor
634 .registers
626 .registers
635− .first(c, context.editor)
627+ .read(c)
636− .unwrap_or_default(),
628+ .and_then(|r| r.first())
629+ .map_or("", |r| r.as_str()),
637 context.editor,
630 context.editor,
638 );
631 );
639 }));
632 }));
helix-term/src/ui/statusline.rs−14
@@ -145,7 +145,6 @@ where
145 helix_view::editor::StatusLineElement::FileModificationIndicator => {
145 helix_view::editor::StatusLineElement::FileModificationIndicator => {
146 render_file_modification_indicator
146 render_file_modification_indicator
147 }
147 }
148− helix_view::editor::StatusLineElement::ReadOnlyIndicator => render_read_only_indicator,
149 helix_view::editor::StatusLineElement::FileEncoding => render_file_encoding,
148 helix_view::editor::StatusLineElement::FileEncoding => render_file_encoding,
150 helix_view::editor::StatusLineElement::FileLineEnding => render_file_line_ending,
149 helix_view::editor::StatusLineElement::FileLineEnding => render_file_line_ending,
151 helix_view::editor::StatusLineElement::FileType => render_file_type,
150 helix_view::editor::StatusLineElement::FileType => render_file_type,
@@ -443,19 +442,6 @@ where
443 write(context, title, None);
442 write(context, title, None);
444}
443}
445
444
446−fn render_read_only_indicator<F>(context: &mut RenderContext, write: F)
447−where
448− F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
449−{
450− let title = if context.doc.readonly {
451− " [readonly] "
452− } else {
453− ""
454− }
455− .to_string();
456− write(context, title, None);
457−}
458−
459fn render_file_base_name<F>(context: &mut RenderContext, write: F)
445fn render_file_base_name<F>(context: &mut RenderContext, write: F)
460where
446where
461 F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
447 F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
helix-term/tests/integration.rs−1
@@ -18,7 +18,6 @@ mod test {
18 mod auto_indent;
18 mod auto_indent;
19 mod auto_pairs;
19 mod auto_pairs;
20 mod commands;
20 mod commands;
21− mod languages;
22 mod movement;
21 mod movement;
23 mod prompt;
22 mod prompt;
24 mod splits;
23 mod splits;
helix-term/tests/test/commands.rs−47
@@ -2,7 +2,6 @@ use helix_term::application::Application;
2
2
3use super::*;
3use super::*;
4
4
5−mod movement;
6mod write;
5mod write;
7
6
8#[tokio::test(flavor = "multi_thread")]
7#[tokio::test(flavor = "multi_thread")]
@@ -480,49 +479,3 @@ fn bar() {#(\n|)#\
480
479
481 Ok(())
480 Ok(())
482}
481}
483−
484−#[tokio::test(flavor = "multi_thread")]
485−async fn test_join_selections() -> anyhow::Result<()> {
486− // normal join
487− test((
488− platform_line(indoc! {"\
489− #[a|]#bc
490− def
491− "}),
492− "J",
493− platform_line(indoc! {"\
494− #[a|]#bc def
495− "}),
496− ))
497− .await?;
498−
499− // join with empty line
500− test((
501− platform_line(indoc! {"\
502− #[a|]#bc
503−
504− def
505− "}),
506− "JJ",
507− platform_line(indoc! {"\
508− #[a|]#bc def
509− "}),
510− ))
511− .await?;
512−
513− // join with additional space in non-empty line
514− test((
515− platform_line(indoc! {"\
516− #[a|]#bc
517−
518− def
519− "}),
520− "JJ",
521− platform_line(indoc! {"\
522− #[a|]#bc def
523− "}),
524− ))
525− .await?;
526−
527− Ok(())
528−}
helix-term/tests/test/commands/movement.rsdeleted−452
@@ -1,452 +0,0 @@
1−use super::*;
2−
3−#[tokio::test(flavor = "multi_thread")]
4−async fn test_move_parent_node_end() -> anyhow::Result<()> {
5− let tests = vec![
6− // single cursor stays single cursor, first goes to end of current
7− // node, then parent
8− (
9− helpers::platform_line(indoc! {r##"
10− fn foo() {
11− let result = if true {
12− "yes"
13− } else {
14− "no#["|]#
15− }
16− }
17− "##}),
18− "<A-e>",
19− helpers::platform_line(indoc! {"\
20− fn foo() {
21− let result = if true {
22− \"yes\"
23− } else {
24− \"no\"#[\n|]#
25− }
26− }
27− "}),
28− ),
29− (
30− helpers::platform_line(indoc! {"\
31− fn foo() {
32− let result = if true {
33− \"yes\"
34− } else {
35− \"no\"#[\n|]#
36− }
37− }
38− "}),
39− "<A-e>",
40− helpers::platform_line(indoc! {"\
41− fn foo() {
42− let result = if true {
43− \"yes\"
44− } else {
45− \"no\"
46− }#[\n|]#
47− }
48− "}),
49− ),
50− // select mode extends
51− (
52− helpers::platform_line(indoc! {r##"
53− fn foo() {
54− let result = if true {
55− "yes"
56− } else {
57− #["no"|]#
58− }
59− }
60− "##}),
61− "v<A-e><A-e>",
62− helpers::platform_line(indoc! {"\
63− fn foo() {
64− let result = if true {
65− \"yes\"
66− } else {
67− #[\"no\"
68− }\n|]#
69− }
70− "}),
71− ),
72− ];
73−
74− for test in tests {
75− test_with_config(AppBuilder::new().with_file("foo.rs", None), test).await?;
76− }
77−
78− Ok(())
79−}
80−
81−#[tokio::test(flavor = "multi_thread")]
82−async fn test_move_parent_node_start() -> anyhow::Result<()> {
83− let tests = vec![
84− // single cursor stays single cursor, first goes to end of current
85− // node, then parent
86− (
87− helpers::platform_line(indoc! {r##"
88− fn foo() {
89− let result = if true {
90− "yes"
91− } else {
92− "no#["|]#
93− }
94− }
95− "##}),
96− "<A-b>",
97− helpers::platform_line(indoc! {"\
98− fn foo() {
99− let result = if true {
100− \"yes\"
101− } else {
102− #[\"|]#no\"
103− }
104− }
105− "}),
106− ),
107− (
108− helpers::platform_line(indoc! {"\
109− fn foo() {
110− let result = if true {
111− \"yes\"
112− } else {
113− \"no\"#[\n|]#
114− }
115− }
116− "}),
117− "<A-b>",
118− helpers::platform_line(indoc! {"\
119− fn foo() {
120− let result = if true {
121− \"yes\"
122− } else #[{|]#
123− \"no\"
124− }
125− }
126− "}),
127− ),
128− (
129− helpers::platform_line(indoc! {"\
130− fn foo() {
131− let result = if true {
132− \"yes\"
133− } else #[{|]#
134− \"no\"
135− }
136− }
137− "}),
138− "<A-b>",
139− helpers::platform_line(indoc! {"\
140− fn foo() {
141− let result = if true {
142− \"yes\"
143− } #[e|]#lse {
144− \"no\"
145− }
146− }
147− "}),
148− ),
149− // select mode extends
150− (
151− helpers::platform_line(indoc! {r##"
152− fn foo() {
153− let result = if true {
154− "yes"
155− } else {
156− #["no"|]#
157− }
158− }
159− "##}),
160− "v<A-b><A-b>",
161− helpers::platform_line(indoc! {"\
162− fn foo() {
163− let result = if true {
164− \"yes\"
165− } else #[|{
166− ]#\"no\"
167− }
168− }
169− "}),
170− ),
171− (
172− helpers::platform_line(indoc! {r##"
173− fn foo() {
174− let result = if true {
175− "yes"
176− } else {
177− #["no"|]#
178− }
179− }
180− "##}),
181− "v<A-b><A-b><A-b>",
182− helpers::platform_line(indoc! {"\
183− fn foo() {
184− let result = if true {
185− \"yes\"
186− } #[|else {
187− ]#\"no\"
188− }
189− }
190− "}),
191− ),
192− ];
193−
194− for test in tests {
195− test_with_config(AppBuilder::new().with_file("foo.rs", None), test).await?;
196− }
197−
198− Ok(())
199−}
200−
201−#[tokio::test(flavor = "multi_thread")]
202−async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
203− let tests = vec![
204− // single cursor stays single cursor, first goes to end of current
205− // node, then parent
206− (
207− helpers::platform_line(indoc! {r##"
208− fn foo() {
209− let result = if true {
210− "yes"
211− } else {
212− "no#["|]#
213− }
214− }
215− "##}),
216− "i<tab>",
217− helpers::platform_line(indoc! {"\
218− fn foo() {
219− let result = if true {
220− \"yes\"
221− } else {
222− \"no\"#[|\n]#
223− }
224− }
225− "}),
226− ),
227− (
228− helpers::platform_line(indoc! {"\
229− fn foo() {
230− let result = if true {
231− \"yes\"
232− } else {
233− \"no\"#[\n|]#
234− }
235− }
236− "}),
237− "i<tab>",
238− helpers::platform_line(indoc! {"\
239− fn foo() {
240− let result = if true {
241− \"yes\"
242− } else {
243− \"no\"
244− }#[|\n]#
245− }
246− "}),
247− ),
248− // appending to the end of a line should still look at the current
249− // line, not the next one
250− (
251− helpers::platform_line(indoc! {"\
252− fn foo() {
253− let result = if true {
254− \"yes\"
255− } else {
256− \"no#[\"|]#
257− }
258− }
259− "}),
260− "a<tab>",
261− helpers::platform_line(indoc! {"\
262− fn foo() {
263− let result = if true {
264− \"yes\"
265− } else {
266− \"no\"
267− }#[\n|]#
268− }
269− "}),
270− ),
271− // before cursor is all whitespace, so insert tab
272− (
273− helpers::platform_line(indoc! {"\
274− fn foo() {
275− let result = if true {
276− \"yes\"
277− } else {
278− #[\"no\"|]#
279− }
280− }
281− "}),
282− "i<tab>",
283− helpers::platform_line(indoc! {"\
284− fn foo() {
285− let result = if true {
286− \"yes\"
287− } else {
288− #[|\"no\"]#
289− }
290− }
291− "}),
292− ),
293− // if selection spans multiple lines, it should still only look at the
294− // line on which the head is
295− (
296− helpers::platform_line(indoc! {"\
297− fn foo() {
298− let result = if true {
299− #[\"yes\"
300− } else {
301− \"no\"|]#
302− }
303− }
304− "}),
305− "a<tab>",
306− helpers::platform_line(indoc! {"\
307− fn foo() {
308− let result = if true {
309− \"yes\"
310− } else {
311− \"no\"
312− }#[\n|]#
313− }
314− "}),
315− ),
316− (
317− helpers::platform_line(indoc! {"\
318− fn foo() {
319− let result = if true {
320− #[\"yes\"
321− } else {
322− \"no\"|]#
323− }
324− }
325− "}),
326− "i<tab>",
327− helpers::platform_line(indoc! {"\
328− fn foo() {
329− let result = if true {
330− #[|\"yes\"
331− } else {
332− \"no\"]#
333− }
334− }
335− "}),
336− ),
337− (
338− helpers::platform_line(indoc! {"\
339− fn foo() {
340− #[l|]#et result = if true {
341− #(\"yes\"
342− } else {
343− \"no\"|)#
344− }
345− }
346− "}),
347− "i<tab>",
348− helpers::platform_line(indoc! {"\
349− fn foo() {
350− #[|l]#et result = if true {
351− #(|\"yes\"
352− } else {
353− \"no\")#
354− }
355− }
356− "}),
357− ),
358− (
359− helpers::platform_line(indoc! {"\
360− fn foo() {
361− let result = if true {
362− \"yes\"#[\n|]#
363− } else {
364− \"no\"#(\n|)#
365− }
366− }
367− "}),
368− "i<tab>",
369− helpers::platform_line(indoc! {"\
370− fn foo() {
371− let result = if true {
372− \"yes\"
373− }#[| ]#else {
374− \"no\"
375− }#(|\n)#
376− }
377− "}),
378− ),
379− (
380− helpers::platform_line(indoc! {"\
381− fn foo() {
382− let result = if true {
383− #[\"yes\"|]#
384− } else {
385− #(\"no\"|)#
386− }
387− }
388− "}),
389− "i<tab>",
390− helpers::platform_line(indoc! {"\
391− fn foo() {
392− let result = if true {
393− #[|\"yes\"]#
394− } else {
395− #(|\"no\")#
396− }
397− }
398− "}),
399− ),
400− // if any cursors are not preceded by all whitespace, then do the
401− // smart_tab action
402− (
403− helpers::platform_line(indoc! {"\
404− fn foo() {
405− let result = if true {
406− #[\"yes\"\n|]#
407− } else {
408− \"no#(\"\n|)#
409− }
410− }
411− "}),
412− "i<tab>",
413− helpers::platform_line(indoc! {"\
414− fn foo() {
415− let result = if true {
416− \"yes\"
417− }#[| ]#else {
418− \"no\"
419− }#(|\n)#
420− }
421− "}),
422− ),
423− // Ctrl-tab always inserts a tab
424− (
425− helpers::platform_line(indoc! {"\
426− fn foo() {
427− let result = if true {
428− #[\"yes\"\n|]#
429− } else {
430− \"no#(\"\n|)#
431− }
432− }
433− "}),
434− "i<S-tab>",
435− helpers::platform_line(indoc! {"\
436− fn foo() {
437− let result = if true {
438− #[|\"yes\"\n]#
439− } else {
440− \"no #(|\"\n)#
441− }
442− }
443− "}),
444− ),
445− ];
446−
447− for test in tests {
448− test_with_config(AppBuilder::new().with_file("foo.rs", None), test).await?;
449− }
450−
451− Ok(())
452−}
helix-term/tests/test/commands/write.rs+3−122
@@ -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(), &platform_line(&RANGE.end().to_string()))?;
96+ helpers::assert_file_has_content(file.as_file_mut(), &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!(platform_line(&RANGE.end().to_string()), file_content);
212+ assert_eq!(RANGE.end().to_string(), file_content);
213
213
214 Ok(())
214 Ok(())
215}
215}
@@ -424,132 +424,13 @@ 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−
538async fn edit_file_with_content(file_content: &[u8]) -> anyhow::Result<()> {
427async fn edit_file_with_content(file_content: &[u8]) -> anyhow::Result<()> {
539 let mut file = tempfile::NamedTempFile::new()?;
428 let mut file = tempfile::NamedTempFile::new()?;
540
429
541 file.as_file_mut().write_all(&file_content)?;
430 file.as_file_mut().write_all(&file_content)?;
542
431
543 helpers::test_key_sequence(
432 helpers::test_key_sequence(
544− &mut helpers::AppBuilder::new()
433+ &mut helpers::AppBuilder::new().build()?,
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()?,
553 Some(&format!(":o {}<ret>:x<ret>", file.path().to_string_lossy())),
434 Some(&format!(":o {}<ret>:x<ret>", file.path().to_string_lossy())),
554 None,
435 None,
555 true,
436 true,
helix-term/tests/test/helpers.rs+1−9
@@ -320,14 +320,6 @@ 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−
331 let mut app = Application::new(self.args, self.config, self.syn_conf)?;
323 let mut app = Application::new(self.args, self.config, self.syn_conf)?;
332
324
333 if let Some((text, selection)) = self.input {
325 if let Some((text, selection)) = self.input {
@@ -358,7 +350,7 @@ pub fn assert_file_has_content(file: &mut File, content: &str) -> anyhow::Result
358
350
359 let mut file_content = String::new();
351 let mut file_content = String::new();
360 file.read_to_string(&mut file_content)?;
352 file.read_to_string(&mut file_content)?;
361− assert_eq!(file_content, content);
353+ assert_eq!(content, file_content);
362
354
363 Ok(())
355 Ok(())
364}
356}
helix-term/tests/test/languages/go.rsdeleted−41
@@ -1,41 +0,0 @@
1−use super::*;
2−
3−#[tokio::test(flavor = "multi_thread")]
4−async fn auto_indent() -> anyhow::Result<()> {
5− let app = || AppBuilder::new().with_file("foo.go", None);
6−
7− let enter_tests = [
8− (
9− helpers::platform_line(indoc! {r##"
10− type Test struct {#[}|]#
11− "##}),
12− "i<ret>",
13− helpers::platform_line(indoc! {"\
14− type Test struct {
15− \t#[|\n]#
16− }
17− "}),
18− ),
19− (
20− helpers::platform_line(indoc! {"\
21− func main() {
22− \tswitch nil {#[}|]#
23− }
24− "}),
25− "i<ret>",
26− helpers::platform_line(indoc! {"\
27− func main() {
28− \tswitch nil {
29− \t\t#[|\n]#
30− \t}
31− }
32− "}),
33− ),
34− ];
35−
36− for test in enter_tests {
37− test_with_config(app(), test).await?;
38− }
39−
40− Ok(())
41−}
helix-term/tests/test/languages/mod.rsdeleted−4
@@ -1,4 +0,0 @@
1−use super::*;
2−
3−mod go;
4−mod yaml;
helix-term/tests/test/languages/yaml.rsdeleted−819
@@ -1,819 +0,0 @@
1−use super::*;
2−
3−#[tokio::test(flavor = "multi_thread")]
4−async fn auto_indent() -> anyhow::Result<()> {
5− let app = || AppBuilder::new().with_file("foo.yaml", None);
6−
7− let below_tests = [
8− (
9− helpers::platform_line(indoc! {r##"
10− #[t|]#op:
11− baz: foo
12− bazi:
13− more: yes
14− why: because
15− quux:
16− - 1
17− - 2
18− bax: foox
19− fook:
20− "##}),
21− "o",
22− helpers::platform_line(indoc! {"\
23− top:
24− #[\n|]#
25− baz: foo
26− bazi:
27− more: yes
28− why: because
29− quux:
30− - 1
31− - 2
32− bax: foox
33− fook:
34− "}),
35− ),
36− (
37− helpers::platform_line(indoc! {r##"
38− top:
39− b#[a|]#z: foo
40− bazi:
41− more: yes
42− why: because
43− quux:
44− - 1
45− - 2
46− bax: foox
47− fook:
48− "##}),
49− "o",
50− helpers::platform_line(indoc! {"\
51− top:
52− baz: foo
53− #[\n|]#
54− bazi:
55− more: yes
56− why: because
57− quux:
58− - 1
59− - 2
60− bax: foox
61− fook:
62− "}),
63− ),
64− (
65− helpers::platform_line(indoc! {r##"
66− top:
67− baz: foo
68− bazi#[:|]#
69− more: yes
70− why: because
71− quux:
72− - 1
73− - 2
74− bax: foox
75− fook:
76− "##}),
77− "o",
78− helpers::platform_line(indoc! {"\
79− top:
80− baz: foo
81− bazi:
82− #[\n|]#
83− more: yes
84− why: because
85− quux:
86− - 1
87− - 2
88− bax: foox
89− fook:
90− "}),
91− ),
92− (
93− helpers::platform_line(indoc! {r##"
94− top:
95− baz: foo
96− bazi:
97− more: #[yes|]#
98− why: because
99− quux:
100− - 1
101− - 2
102− bax: foox
103− fook:
104− "##}),
105− "o",
106− helpers::platform_line(indoc! {"\
107− top:
108− baz: foo
109− bazi:
110− more: yes
111− #[\n|]#
112− why: because
113− quux:
114− - 1
115− - 2
116− bax: foox
117− fook:
118− "}),
119− ),
120− (
121− helpers::platform_line(indoc! {r##"
122− top:
123− baz: foo
124− bazi:
125− more: yes
126− why: becaus#[e|]#
127− quux:
128− - 1
129− - 2
130− bax: foox
131− fook:
132− "##}),
133− "o",
134− helpers::platform_line(indoc! {"\
135− top:
136− baz: foo
137− bazi:
138− more: yes
139− why: because
140− #[\n|]#
141− quux:
142− - 1
143− - 2
144− bax: foox
145− fook:
146− "}),
147− ),
148− (
149− helpers::platform_line(indoc! {"\
150− top:
151− baz: foo
152− bazi:
153− more: yes
154− why: because
155− quux:#[\n|]#
156− - 1
157− - 2
158− bax: foox
159− fook:
160− "}),
161− "o",
162− helpers::platform_line(indoc! {"\
163− top:
164− baz: foo
165− bazi:
166− more: yes
167− why: because
168− quux:
169− #[\n|]#
170− - 1
171− - 2
172− bax: foox
173− fook:
174− "}),
175− ),
176− (
177− helpers::platform_line(indoc! {"\
178− top:
179− baz: foo
180− bazi:
181− more: yes
182− why: because
183− quux:
184− - 1#[\n|]#
185− - 2
186− bax: foox
187− fook:
188− "}),
189− "o",
190− helpers::platform_line(indoc! {"\
191− top:
192− baz: foo
193− bazi:
194− more: yes
195− why: because
196− quux:
197− - 1
198− #[\n|]#
199− - 2
200− bax: foox
201− fook:
202− "}),
203− ),
204− (
205− helpers::platform_line(indoc! {"\
206− top:
207− baz: foo
208− bazi:
209− more: yes
210− why: because
211− quux:
212− - 1
213− - 2
214− bax: foox
215− fook:#[\n|]#
216− "}),
217− "o",
218− helpers::platform_line(indoc! {"\
219− top:
220− baz: foo
221− bazi:
222− more: yes
223− why: because
224− quux:
225− - 1
226− - 2
227− bax: foox
228− fook:
229− #[\n|]#
230− "}),
231− ),
232− (
233− helpers::platform_line(indoc! {"\
234− top:
235− baz: foo
236− bax: |
237− some
238− multi
239− line
240− string#[\n|]#
241− fook:
242− "}),
243− "o",
244− helpers::platform_line(indoc! {"\
245− top:
246− baz: foo
247− bax: |
248− some
249− multi
250− line
251− string
252− #[\n|]#
253− fook:
254− "}),
255− ),
256− (
257− helpers::platform_line(indoc! {"\
258− top:
259− baz: foo
260− bax: >
261− some
262− multi
263− line#[\n|]#
264− string
265− fook:
266− "}),
267− "o",
268− helpers::platform_line(indoc! {"\
269− top:
270− baz: foo
271− bax: >
272− some
273− multi
274− line
275− #[\n|]#
276− string
277− fook:
278− "}),
279− ),
280− (
281− helpers::platform_line(indoc! {"\
282− top:
283− baz: foo
284− bax: >#[\n|]#
285− fook:
286− "}),
287− "o",
288− helpers::platform_line(indoc! {"\
289− top:
290− baz: foo
291− bax: >
292− #[\n|]#
293− fook:
294− "}),
295− ),
296− (
297− helpers::platform_line(indoc! {"\
298− - top:#[\n|]#
299− baz: foo
300− bax: foox
301− fook:
302− "}),
303− "o",
304− helpers::platform_line(indoc! {"\
305− - top:
306− #[\n|]#
307− baz: foo
308− bax: foox
309− fook:
310− "}),
311− ),
312− (
313− helpers::platform_line(indoc! {"\
314− - top:
315− baz: foo#[\n|]#
316− bax: foox
317− fook:
318− "}),
319− "o",
320− helpers::platform_line(indoc! {"\
321− - top:
322− baz: foo
323− #[\n|]#
324− bax: foox
325− fook:
326− "}),
327− ),
328− (
329− helpers::platform_line(indoc! {"\
330− - top:
331− baz: foo
332− bax: foox#[\n|]#
333− fook:
334− "}),
335− "o",
336− helpers::platform_line(indoc! {"\
337− - top:
338− baz: foo
339− bax: foox
340− #[\n|]#
341− fook:
342− "}),
343− ),
344− (
345− helpers::platform_line(indoc! {"\
346− top:
347− baz:
348− - one: two#[\n|]#
349− three: four
350− - top:
351− baz: foo
352− bax: foox
353− "}),
354− "o",
355− helpers::platform_line(indoc! {"\
356− top:
357− baz:
358− - one: two
359− #[\n|]#
360− three: four
361− - top:
362− baz: foo
363− bax: foox
364− "}),
365− ),
366− // yaml map without a key
367− (
368− helpers::platform_line(indoc! {"\
369− top:#[\n|]#
370− "}),
371− "o",
372− helpers::platform_line(indoc! {"\
373− top:
374− #[\n|]#
375− "}),
376− ),
377− (
378− helpers::platform_line(indoc! {"\
379− top#[:|]#
380− bottom: withvalue
381− "}),
382− "o",
383− helpers::platform_line(indoc! {"\
384− top:
385− #[\n|]#
386− bottom: withvalue
387− "}),
388− ),
389− (
390− helpers::platform_line(indoc! {"\
391− bottom: withvalue
392− top#[:|]#
393− "}),
394− "o",
395− helpers::platform_line(indoc! {"\
396− bottom: withvalue
397− top:
398− #[\n|]#
399− "}),
400− ),
401− ];
402−
403− for test in below_tests {
404− test_with_config(app(), test).await?;
405− }
406−
407− let above_tests = [
408− (
409− helpers::platform_line(indoc! {r##"
410− #[t|]#op:
411− baz: foo
412− bazi:
413− more: yes
414− why: because
415− quux:
416− - 1
417− - 2
418− bax: foox
419− fook:
420− "##}),
421− "O",
422− helpers::platform_line(indoc! {"\
423− #[\n|]#
424− top:
425− baz: foo
426− bazi:
427− more: yes
428− why: because
429− quux:
430− - 1
431− - 2
432− bax: foox
433− fook:
434− "}),
435− ),
436− (
437− helpers::platform_line(indoc! {r##"
438− top:
439− b#[a|]#z: foo
440− bazi:
441− more: yes
442− why: because
443− quux:
444− - 1
445− - 2
446− bax: foox
447− fook:
448− "##}),
449− "O",
450− helpers::platform_line(indoc! {"\
451− top:
452− #[\n|]#
453− baz: foo
454− bazi:
455− more: yes
456− why: because
457− quux:
458− - 1
459− - 2
460− bax: foox
461− fook:
462− "}),
463− ),
464− (
465− helpers::platform_line(indoc! {r##"
466− top:
467− baz: foo
468− bazi#[:|]#
469− more: yes
470− why: because
471− quux:
472− - 1
473− - 2
474− bax: foox
475− fook:
476− "##}),
477− "O",
478− helpers::platform_line(indoc! {"\
479− top:
480− baz: foo
481− #[\n|]#
482− bazi:
483− more: yes
484− why: because
485− quux:
486− - 1
487− - 2
488− bax: foox
489− fook:
490− "}),
491− ),
492− (
493− helpers::platform_line(indoc! {r##"
494− top:
495− baz: foo
496− bazi:
497− more: #[yes|]#
498− why: because
499− quux:
500− - 1
501− - 2
502− bax: foox
503− fook:
504− "##}),
505− "O",
506− helpers::platform_line(indoc! {"\
507− top:
508− baz: foo
509− bazi:
510− #[\n|]#
511− more: yes
512− why: because
513− quux:
514− - 1
515− - 2
516− bax: foox
517− fook:
518− "}),
519− ),
520− (
521− helpers::platform_line(indoc! {r##"
522− top:
523− baz: foo
524− bazi:
525− more: yes
526− why: becaus#[e|]#
527− quux:
528− - 1
529− - 2
530− bax: foox
531− fook:
532− "##}),
533− "O",
534− helpers::platform_line(indoc! {"\
535− top:
536− baz: foo
537− bazi:
538− more: yes
539− #[\n|]#
540− why: because
541− quux:
542− - 1
543− - 2
544− bax: foox
545− fook:
546− "}),
547− ),
548− (
549− helpers::platform_line(indoc! {"\
550− top:
551− baz: foo
552− bazi:
553− more: yes
554− why: because
555− quux:#[\n|]#
556− - 1
557− - 2
558− bax: foox
559− fook:
560− "}),
561− "O",
562− helpers::platform_line(indoc! {"\
563− top:
564− baz: foo
565− bazi:
566− more: yes
567− why: because
568− #[\n|]#
569− quux:
570− - 1
571− - 2
572− bax: foox
573− fook:
574− "}),
575− ),
576− (
577− helpers::platform_line(indoc! {"\
578− top:
579− baz: foo
580− bazi:
581− more: yes
582− why: because
583− quux:
584− - 1#[\n|]#
585− - 2
586− bax: foox
587− fook:
588− "}),
589− "O",
590− helpers::platform_line(indoc! {"\
591− top:
592− baz: foo
593− bazi:
594− more: yes
595− why: because
596− quux:
597− #[\n|]#
598− - 1
599− - 2
600− bax: foox
601− fook:
602− "}),
603− ),
604− (
605− helpers::platform_line(indoc! {"\
606− top:
607− baz: foo
608− bazi:
609− more: yes
610− why: because
611− quux:
612− - 1
613− - 2
614− bax: foox
615− fook:#[\n|]#
616− "}),
617− "O",
618− helpers::platform_line(indoc! {"\
619− top:
620− baz: foo
621− bazi:
622− more: yes
623− why: because
624− quux:
625− - 1
626− - 2
627− bax: foox
628− #[\n|]#
629− fook:
630− "}),
631− ),
632− (
633− helpers::platform_line(indoc! {"\
634− top:
635− baz: foo
636− bax: |
637− some
638− multi
639− line
640− string#[\n|]#
641− fook:
642− "}),
643− "O",
644− helpers::platform_line(indoc! {"\
645− top:
646− baz: foo
647− bax: |
648− some
649− multi
650− line
651− #[\n|]#
652− string
653− fook:
654− "}),
655− ),
656− (
657− helpers::platform_line(indoc! {"\
658− top:
659− baz: foo
660− bax: >
661− some#[\n|]#
662− multi
663− line
664− string
665− fook:
666− "}),
667− "O",
668− helpers::platform_line(indoc! {"\
669− top:
670− baz: foo
671− bax: >
672− #[\n|]#
673− some
674− multi
675− line
676− string
677− fook:
678− "}),
679− ),
680− (
681− helpers::platform_line(indoc! {"\
682− top:
683− baz: foo
684− bax: >
685− fook:#[\n|]#
686− "}),
687− "O",
688− helpers::platform_line(indoc! {"\
689− top:
690− baz: foo
691− bax: >
692− #[\n|]#
693− fook:
694− "}),
695− ),
696− (
697− helpers::platform_line(indoc! {"\
698− - top:
699− baz: foo#[\n|]#
700− bax: foox
701− fook:
702− "}),
703− "O",
704− helpers::platform_line(indoc! {"\
705− - top:
706− #[\n|]#
707− baz: foo
708− bax: foox
709− fook:
710− "}),
711− ),
712− (
713− helpers::platform_line(indoc! {"\
714− - top:
715− baz: foo
716− bax: foox
717− fook:#[\n|]#
718− "}),
719− "O",
720− helpers::platform_line(indoc! {"\
721− - top:
722− baz: foo
723− bax: foox
724− #[\n|]#
725− fook:
726− "}),
727− ),
728− (
729− helpers::platform_line(indoc! {"\
730− top:
731− baz:
732− - one: two#[\n|]#
733− three: four
734− - top:
735− baz: foo
736− bax: foox
737− "}),
738− "O",
739− helpers::platform_line(indoc! {"\
740− top:
741− baz:
742− #[\n|]#
743− - one: two
744− three: four
745− - top:
746− baz: foo
747− bax: foox
748− "}),
749− ),
750− // yaml map without a key
751− (
752− helpers::platform_line(indoc! {"\
753− top:#[\n|]#
754− "}),
755− "O",
756− helpers::platform_line(indoc! {"\
757− #[\n|]#
758− top:
759− "}),
760− ),
761− (
762− helpers::platform_line(indoc! {"\
763− bottom: withvalue
764− top#[:|]#
765− "}),
766− "O",
767− helpers::platform_line(indoc! {"\
768− bottom: withvalue
769− #[\n|]#
770− top:
771− "}),
772− ),
773− (
774− helpers::platform_line(indoc! {"\
775− top:
776− bottom:#[ |]#withvalue
777− "}),
778− "O",
779− helpers::platform_line(indoc! {"\
780− top:
781− #[\n|]#
782− bottom: withvalue
783− "}),
784− ),
785− ];
786−
787− for test in above_tests {
788− test_with_config(app(), test).await?;
789− }
790−
791− let enter_tests = [
792− (
793− helpers::platform_line(indoc! {r##"
794− foo: #[b|]#ar
795− "##}),
796− "i<ret>",
797− helpers::platform_line(indoc! {"\
798− foo:
799− #[|b]#ar
800− "}),
801− ),
802− (
803− helpers::platform_line(indoc! {"\
804− foo:#[\n|]#
805− "}),
806− "i<ret>",
807− helpers::platform_line(indoc! {"\
808− foo:
809− #[|\n]#
810− "}),
811− ),
812− ];
813−
814− for test in enter_tests {
815− test_with_config(app(), test).await?;
816− }
817−
818− Ok(())
819−}
helix-term/tests/test/movement.rs−39
@@ -513,42 +513,3 @@ 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/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(), &platform_line("hello1"))?;
65+ helpers::assert_file_has_content(file1.as_file_mut(), "hello1")?;
66− helpers::assert_file_has_content(file2.as_file_mut(), &platform_line("hello2"))?;
66+ helpers::assert_file_has_content(file2.as_file_mut(), "hello2")?;
67− helpers::assert_file_has_content(file3.as_file_mut(), &platform_line("hello3"))?;
67+ helpers::assert_file_has_content(file3.as_file_mut(), "hello3")?;
68
68
69 Ok(())
69 Ok(())
70}
70}
helix-tui/Cargo.toml+15−15
@@ -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 = """
3−description = """A library to build rich terminal user interfaces or dashboards"""
6+A library to build rich terminal user interfaces or dashboards
7+"""
8+edition = "2021"
9+license = "MPL-2.0"
10+categories = ["editor"]
11+repository = "https://github.com/helix-editor/helix"
12+homepage = "https://helix-editor.com"
4include = ["src/**/*", "README.md"]
13include = ["src/**/*", "README.md"]
5−version.workspace = true
6−authors.workspace = true
7−edition.workspace = true
8−license.workspace = true
9−rust-version.workspace = true
10−categories.workspace = true
11−repository.workspace = true
12−homepage.workspace = true
13
14
14[features]
15[features]
15default = ["crossterm"]
16default = ["crossterm"]
16
17
17[dependencies]
18[dependencies]
18−helix-view = { path = "../helix-view", features = ["term"] }
19−helix-core = { path = "../helix-core" }
20−
21−bitflags = "2.4"
19+bitflags = "2.3"
22cassowary = "0.3"
20cassowary = "0.3"
23unicode-segmentation = "1.10"
21unicode-segmentation = "1.10"
24−crossterm = { version = "0.27", optional = true }
22+crossterm = { version = "0.26", optional = true }
25termini = "1.0"
23termini = "1.0"
26serde = { version = "1", "optional" = true, features = ["derive"]}
24serde = { version = "1", "optional" = true, features = ["derive"]}
27−once_cell = "1.19"
25+once_cell = "1.18"
28log = "~0.4"
26log = "~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+33−51
@@ -32,21 +32,10 @@ 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(Clone, Debug)]
35+#[derive(Copy, Clone, Debug, Default)]
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− }
50}
39}
51
40
52impl Capabilities {
41impl Capabilities {
@@ -65,10 +54,6 @@ impl Capabilities {
65 || t.extended_cap("Su").is_some()
54 || t.extended_cap("Su").is_some()
66 || vte_version() >= Some(5102)
55 || vte_version() >= Some(5102)
67 || matches!(term_program().as_deref(), Some("WezTerm")),
56 || 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(),
72 },
57 },
73 }
58 }
74 }
59 }
@@ -169,8 +154,7 @@ where
169
154
170 fn restore(&mut self, config: Config) -> io::Result<()> {
155 fn restore(&mut self, config: Config) -> io::Result<()> {
171 // reset cursor shape
156 // reset cursor shape
172− self.buffer
157+ write!(self.buffer, "\x1B[0 q")?;
173− .write_all(self.capabilities.reset_cursor_command.as_bytes())?;
174 if config.enable_mouse_capture {
158 if config.enable_mouse_capture {
175 execute!(self.buffer, DisableMouseCapture)?;
159 execute!(self.buffer, DisableMouseCapture)?;
176 }
160 }
@@ -217,7 +201,7 @@ where
217 for (x, y, cell) in content {
201 for (x, y, cell) in content {
218 // Move the cursor if the previous location was not (x - 1, y)
202 // Move the cursor if the previous location was not (x - 1, y)
219 if !matches!(last_pos, Some(p) if x == p.0 + 1 && y == p.1) {
203 if !matches!(last_pos, Some(p) if x == p.0 + 1 && y == p.1) {
220− queue!(self.buffer, MoveTo(x, y))?;
204+ map_error(queue!(self.buffer, MoveTo(x, y)))?;
221 }
205 }
222 last_pos = Some((x, y));
206 last_pos = Some((x, y));
223 if cell.modifier != modifier {
207 if cell.modifier != modifier {
@@ -230,12 +214,12 @@ where
230 }
214 }
231 if cell.fg != fg {
215 if cell.fg != fg {
232 let color = CColor::from(cell.fg);
216 let color = CColor::from(cell.fg);
233− queue!(self.buffer, SetForegroundColor(color))?;
217+ map_error(queue!(self.buffer, SetForegroundColor(color)))?;
234 fg = cell.fg;
218 fg = cell.fg;
235 }
219 }
236 if cell.bg != bg {
220 if cell.bg != bg {
237 let color = CColor::from(cell.bg);
221 let color = CColor::from(cell.bg);
238− queue!(self.buffer, SetBackgroundColor(color))?;
222+ map_error(queue!(self.buffer, SetBackgroundColor(color)))?;
239 bg = cell.bg;
223 bg = cell.bg;
240 }
224 }
241
225
@@ -243,7 +227,7 @@ where
243 if self.capabilities.has_extended_underlines {
227 if self.capabilities.has_extended_underlines {
244 if cell.underline_color != underline_color {
228 if cell.underline_color != underline_color {
245 let color = CColor::from(cell.underline_color);
229 let color = CColor::from(cell.underline_color);
246− queue!(self.buffer, SetUnderlineColor(color))?;
230+ map_error(queue!(self.buffer, SetUnderlineColor(color)))?;
247 underline_color = cell.underline_color;
231 underline_color = cell.underline_color;
248 }
232 }
249 } else {
233 } else {
@@ -255,24 +239,24 @@ where
255
239
256 if new_underline_style != underline_style {
240 if new_underline_style != underline_style {
257 let attr = CAttribute::from(new_underline_style);
241 let attr = CAttribute::from(new_underline_style);
258− queue!(self.buffer, SetAttribute(attr))?;
242+ map_error(queue!(self.buffer, SetAttribute(attr)))?;
259 underline_style = new_underline_style;
243 underline_style = new_underline_style;
260 }
244 }
261
245
262− queue!(self.buffer, Print(&cell.symbol))?;
246+ map_error(queue!(self.buffer, Print(&cell.symbol)))?;
263 }
247 }
264
248
265− queue!(
249+ map_error(queue!(
266 self.buffer,
250 self.buffer,
267 SetUnderlineColor(CColor::Reset),
251 SetUnderlineColor(CColor::Reset),
268 SetForegroundColor(CColor::Reset),
252 SetForegroundColor(CColor::Reset),
269 SetBackgroundColor(CColor::Reset),
253 SetBackgroundColor(CColor::Reset),
270 SetAttribute(CAttribute::Reset)
254 SetAttribute(CAttribute::Reset)
271− )
255+ ))
272 }
256 }
273
257
274 fn hide_cursor(&mut self) -> io::Result<()> {
258 fn hide_cursor(&mut self) -> io::Result<()> {
275− execute!(self.buffer, Hide)
259+ map_error(execute!(self.buffer, Hide))
276 }
260 }
277
261
278 fn show_cursor(&mut self, kind: CursorKind) -> io::Result<()> {
262 fn show_cursor(&mut self, kind: CursorKind) -> io::Result<()> {
@@ -282,7 +266,7 @@ where
282 CursorKind::Underline => SetCursorStyle::SteadyUnderScore,
266 CursorKind::Underline => SetCursorStyle::SteadyUnderScore,
283 CursorKind::Hidden => unreachable!(),
267 CursorKind::Hidden => unreachable!(),
284 };
268 };
285− execute!(self.buffer, Show, shape)
269+ map_error(execute!(self.buffer, Show, shape))
286 }
270 }
287
271
288 fn get_cursor(&mut self) -> io::Result<(u16, u16)> {
272 fn get_cursor(&mut self) -> io::Result<(u16, u16)> {
@@ -291,11 +275,11 @@ where
291 }
275 }
292
276
293 fn set_cursor(&mut self, x: u16, y: u16) -> io::Result<()> {
277 fn set_cursor(&mut self, x: u16, y: u16) -> io::Result<()> {
294− execute!(self.buffer, MoveTo(x, y))
278+ map_error(execute!(self.buffer, MoveTo(x, y)))
295 }
279 }
296
280
297 fn clear(&mut self) -> io::Result<()> {
281 fn clear(&mut self) -> io::Result<()> {
298− execute!(self.buffer, Clear(ClearType::All))
282+ map_error(execute!(self.buffer, Clear(ClearType::All)))
299 }
283 }
300
284
301 fn size(&self) -> io::Result<Rect> {
285 fn size(&self) -> io::Result<Rect> {
@@ -310,6 +294,10 @@ where
310 }
294 }
311}
295}
312
296
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+
313#[derive(Debug)]
301#[derive(Debug)]
314struct ModifierDiff {
302struct ModifierDiff {
315 pub from: Modifier,
303 pub from: Modifier,
@@ -324,54 +312,48 @@ impl ModifierDiff {
324 //use crossterm::Attribute;
312 //use crossterm::Attribute;
325 let removed = self.from - self.to;
313 let removed = self.from - self.to;
326 if removed.contains(Modifier::REVERSED) {
314 if removed.contains(Modifier::REVERSED) {
327− queue!(w, SetAttribute(CAttribute::NoReverse))?;
315+ map_error(queue!(w, SetAttribute(CAttribute::NoReverse)))?;
328 }
316 }
329 if removed.contains(Modifier::BOLD) {
317 if removed.contains(Modifier::BOLD) {
330− queue!(w, SetAttribute(CAttribute::NormalIntensity))?;
318+ map_error(queue!(w, SetAttribute(CAttribute::NormalIntensity)))?;
331 if self.to.contains(Modifier::DIM) {
319 if self.to.contains(Modifier::DIM) {
332− queue!(w, SetAttribute(CAttribute::Dim))?;
320+ map_error(queue!(w, SetAttribute(CAttribute::Dim)))?;
333 }
321 }
334 }
322 }
335 if removed.contains(Modifier::ITALIC) {
323 if removed.contains(Modifier::ITALIC) {
336− queue!(w, SetAttribute(CAttribute::NoItalic))?;
324+ map_error(queue!(w, SetAttribute(CAttribute::NoItalic)))?;
337 }
325 }
338 if removed.contains(Modifier::DIM) {
326 if removed.contains(Modifier::DIM) {
339− queue!(w, SetAttribute(CAttribute::NormalIntensity))?;
327+ map_error(queue!(w, SetAttribute(CAttribute::NormalIntensity)))?;
340 }
328 }
341 if removed.contains(Modifier::CROSSED_OUT) {
329 if removed.contains(Modifier::CROSSED_OUT) {
342− queue!(w, SetAttribute(CAttribute::NotCrossedOut))?;
330+ map_error(queue!(w, SetAttribute(CAttribute::NotCrossedOut)))?;
343 }
331 }
344 if removed.contains(Modifier::SLOW_BLINK) || removed.contains(Modifier::RAPID_BLINK) {
332 if removed.contains(Modifier::SLOW_BLINK) || removed.contains(Modifier::RAPID_BLINK) {
345− queue!(w, SetAttribute(CAttribute::NoBlink))?;
333+ map_error(queue!(w, SetAttribute(CAttribute::NoBlink)))?;
346− }
347− if removed.contains(Modifier::HIDDEN) {
348− queue!(w, SetAttribute(CAttribute::NoHidden))?;
349 }
334 }
350
335
351 let added = self.to - self.from;
336 let added = self.to - self.from;
352 if added.contains(Modifier::REVERSED) {
337 if added.contains(Modifier::REVERSED) {
353− queue!(w, SetAttribute(CAttribute::Reverse))?;
338+ map_error(queue!(w, SetAttribute(CAttribute::Reverse)))?;
354 }
339 }
355 if added.contains(Modifier::BOLD) {
340 if added.contains(Modifier::BOLD) {
356− queue!(w, SetAttribute(CAttribute::Bold))?;
341+ map_error(queue!(w, SetAttribute(CAttribute::Bold)))?;
357 }
342 }
358 if added.contains(Modifier::ITALIC) {
343 if added.contains(Modifier::ITALIC) {
359− queue!(w, SetAttribute(CAttribute::Italic))?;
344+ map_error(queue!(w, SetAttribute(CAttribute::Italic)))?;
360 }
345 }
361 if added.contains(Modifier::DIM) {
346 if added.contains(Modifier::DIM) {
362− queue!(w, SetAttribute(CAttribute::Dim))?;
347+ map_error(queue!(w, SetAttribute(CAttribute::Dim)))?;
363 }
348 }
364 if added.contains(Modifier::CROSSED_OUT) {
349 if added.contains(Modifier::CROSSED_OUT) {
365− queue!(w, SetAttribute(CAttribute::CrossedOut))?;
350+ map_error(queue!(w, SetAttribute(CAttribute::CrossedOut)))?;
366 }
351 }
367 if added.contains(Modifier::SLOW_BLINK) {
352 if added.contains(Modifier::SLOW_BLINK) {
368− queue!(w, SetAttribute(CAttribute::SlowBlink))?;
353+ map_error(queue!(w, SetAttribute(CAttribute::SlowBlink)))?;
369 }
354 }
370 if added.contains(Modifier::RAPID_BLINK) {
355 if added.contains(Modifier::RAPID_BLINK) {
371− queue!(w, SetAttribute(CAttribute::RapidBlink))?;
356+ map_error(queue!(w, SetAttribute(CAttribute::RapidBlink)))?;
372− }
373− if added.contains(Modifier::HIDDEN) {
374− queue!(w, SetAttribute(CAttribute::Hidden))?;
375 }
357 }
376
358
377 Ok(())
359 Ok(())
@@ -425,7 +407,7 @@ impl Command for SetUnderlineColor {
425 }
407 }
426
408
427 #[cfg(windows)]
409 #[cfg(windows)]
428− fn execute_winapi(&self) -> io::Result<()> {
410+ fn execute_winapi(&self) -> crossterm::Result<()> {
429 Err(std::io::Error::new(
411 Err(std::io::Error::new(
430 std::io::ErrorKind::Other,
412 std::io::ErrorKind::Other,
431 "SetUnderlineColor not supported by winapi.",
413 "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-tui/src/terminal.rs+14
@@ -65,6 +65,20 @@ where
65 viewport: Viewport,
65 viewport: Viewport,
66}
66}
67
67
68+impl<B> Drop for Terminal<B>
69+where
70+ B: Backend,
71+{
72+ fn drop(&mut self) {
73+ // Attempt to restore the cursor state
74+ if self.cursor_kind == CursorKind::Hidden {
75+ if let Err(err) = self.show_cursor(CursorKind::Block) {
76+ eprintln!("Failed to show the cursor: {}", err);
77+ }
78+ }
79+ }
80+}
81+
68impl<B> Terminal<B>
82impl<B> Terminal<B>
69where
83where
70 B: Backend,
84 B: Backend,
helix-vcs/Cargo.toml+10−12
@@ -1,25 +1,23 @@
1[package]
1[package]
2name = "helix-vcs"
2name = "helix-vcs"
3−version.workspace = true
3+version = "0.6.0"
4−authors.workspace = true
4+authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
5−edition.workspace = true
5+edition = "2021"
6−license.workspace = true
6+license = "MPL-2.0"
7−rust-version.workspace = true
8−categories.workspace = true
7+categories = ["editor"]
9−repository.workspace = true
8+repository = "https://github.com/helix-editor/helix"
10−homepage.workspace = true
9+homepage = "https://helix-editor.com"
11
10
12# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
11# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
13
12
14[dependencies]
13[dependencies]
15−helix-core = { path = "../helix-core" }
14+helix-core = { version = "0.6", path = "../helix-core" }
16−helix-event = { path = "../helix-event" }
17
15
18tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot", "macros"] }
16tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot", "macros"] }
19parking_lot = "0.12"
17parking_lot = "0.12"
20arc-swap = { version = "1.6.0" }
18arc-swap = { version = "1.6.0" }
21
19
22−gix = { version = "0.57.0", default-features = false , optional = true }
20+gix = { version = "0.46.0", default-features = false , optional = true }
23imara-diff = "0.1.5"
21imara-diff = "0.1.5"
24anyhow = "1"
22anyhow = "1"
25
23
@@ -29,4 +27,4 @@ log = "0.4"
29git = ["gix"]
27git = ["gix"]
30
28
31[dev-dependencies]
29[dev-dependencies]
32−tempfile = "3.8"
30+tempfile = "3.6"
helix-vcs/src/diff.rs+19−6

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

helix-view/Cargo.toml+18−22

This diff is too big to show here.

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

This diff is too big to show here.

helix-view/src/document.rs+47−123

This diff is too big to show here.

helix-view/src/editor.rs+92−173

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

helix-view/src/lib.rs−1

This diff is too big to show here.

helix-view/src/register.rsdeleted−333

This diff is too big to show here.

helix-view/src/theme.rs−6

This diff is too big to show here.

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

This diff is too big to show here.

languages.toml+211−582

This diff is too big to show here.

logo.svg+1−1

This diff is too big to show here.

runtime/queries/_javascript/highlights.scmdeleted−36

This diff is too big to show here.

runtime/queries/_javascript/locals.scmdeleted−14

This diff is too big to show here.

runtime/queries/_javascript/tags.scmdeleted−88

This diff is too big to show here.

runtime/queries/_jsx/highlights.scmdeleted−43

This diff is too big to show here.

runtime/queries/_jsx/indents.scmdeleted−6

This diff is too big to show here.

runtime/queries/_typescript/highlights.scmdeleted−142

This diff is too big to show here.

runtime/queries/_typescript/indents.scmdeleted−5

This diff is too big to show here.

runtime/queries/_typescript/locals.scmdeleted−33

This diff is too big to show here.

runtime/queries/_typescript/tags.scmdeleted−23

This diff is too big to show here.

runtime/queries/_typescript/textobjects.scmdeleted−6

This diff is too big to show here.

runtime/queries/agda/highlights.scmdeleted−124

This diff is too big to show here.

runtime/queries/bash/indents.scm−1

This diff is too big to show here.

runtime/queries/bash/textobjects.scmdeleted−9

This diff is too big to show here.

runtime/queries/blueprint/highlights.scm−5

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/common-lisp/indents.scmdeleted−1

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/dbml/highlights.scmdeleted−44

This diff is too big to show here.

runtime/queries/ecma/README.mddeleted−14

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/fsharp/highlights.scmdeleted−196

This diff is too big to show here.

runtime/queries/fsharp/locals.scmdeleted−25

This diff is too big to show here.

runtime/queries/gas/highlights.scmdeleted−21

This diff is too big to show here.

runtime/queries/gas/injections.scmdeleted−2

This diff is too big to show here.

runtime/queries/gas/textobjects.scmdeleted−2

This diff is too big to show here.

runtime/queries/gemini/highlights.scmdeleted−26

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/gn/highlights.scmdeleted−42

This diff is too big to show here.

runtime/queries/gn/injections.scmdeleted−15

This diff is too big to show here.

runtime/queries/gn/locals.scmdeleted−16

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/haskell/injections.scm−8

This diff is too big to show here.

runtime/queries/janet/highlights.scmdeleted−1

This diff is too big to show here.

runtime/queries/java/indents.scmdeleted−35

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/jinja/highlights.scmdeleted−7

This diff is too big to show here.

runtime/queries/jinja/injections.scmdeleted−4

This diff is too big to show here.

runtime/queries/json5/highlights.scmdeleted−11

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/jsx/tags.scmdeleted−3

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/kdl/indents.scmdeleted−3

This diff is too big to show here.

runtime/queries/kdl/textobjects.scmdeleted−27

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/kotlin/locals.scmdeleted−15

This diff is too big to show here.

runtime/queries/log/highlights.scmdeleted−10

This diff is too big to show here.

runtime/queries/lpf/highlights.scmdeleted−19

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/matlab/highlights.scm+33−34

This diff is too big to show here.

runtime/queries/nix/injections.scm−14

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/nu/locals.scmnew file+13

This diff is too big to show here.

runtime/queries/nunjucks/highlights.scmdeleted−1

This diff is too big to show here.

runtime/queries/nunjucks/injections.scmdeleted−1

This diff is too big to show here.

runtime/queries/ocaml/highlights.scm−2

This diff is too big to show here.

runtime/queries/perl/fold.scmdeleted−19

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/pod/highlights.scmdeleted−61

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/purescript/textobjects.scmdeleted−13

This diff is too big to show here.

runtime/queries/python/highlights.scm−6

This diff is too big to show here.

runtime/queries/python/indents.scm−9

This diff is too big to show here.

runtime/queries/racket/indents.scmdeleted−1

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/rust/highlights.scm−7

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/rust/injections.scm−6

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/scheme/highlights.scm−5

This diff is too big to show here.

runtime/queries/scheme/indents.scmdeleted−43

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/slint/injections.scmdeleted−2

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/smali/folds.scmdeleted−12

This diff is too big to show here.

runtime/queries/smali/highlights.scmdeleted−216

This diff is too big to show here.

runtime/queries/smali/indents.scmdeleted−31

This diff is too big to show here.

runtime/queries/smali/injections.scmdeleted−2

This diff is too big to show here.

runtime/queries/smali/locals.scmdeleted−42

This diff is too big to show here.

runtime/queries/sql/highlights.scm+231−317

This diff is too big to show here.

runtime/queries/strace/highlights.scmdeleted−8

This diff is too big to show here.

runtime/queries/svelte/indents.scmdeleted−18

This diff is too big to show here.

runtime/queries/svelte/injections.scm−10

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/templ/highlights.scmdeleted−99

This diff is too big to show here.

runtime/queries/templ/injections.scmdeleted−4

This diff is too big to show here.

runtime/queries/todotxt/highlights.scmdeleted−6

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/tsx/locals.scmdeleted−3

This diff is too big to show here.

runtime/queries/tsx/tags.scmdeleted−3

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/typst/highlights.scmdeleted−77

This diff is too big to show here.

runtime/queries/typst/injections.scmdeleted−6

This diff is too big to show here.

runtime/queries/unison/highlights.scmdeleted−87

This diff is too big to show here.

runtime/queries/unison/injections.scmdeleted−1

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/wren/highlights.scmdeleted−82

This diff is too big to show here.

runtime/queries/wren/indents.scmdeleted−29

This diff is too big to show here.

runtime/queries/wren/injections.scmdeleted−3

This diff is too big to show here.

runtime/queries/wren/locals.scmdeleted−21

This diff is too big to show here.

runtime/queries/wren/textobjects.scmdeleted−16

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/yaml/injections.scm−52

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/themes/README.md−8

This diff is too big to show here.

runtime/themes/autumn.toml+65−62

This diff is too big to show here.

runtime/themes/autumn_night.toml+6−6

This diff is too big to show here.

runtime/themes/catppuccin_frappe.toml−2

This diff is too big to show here.

runtime/themes/catppuccin_latte.toml−2

This diff is too big to show here.

runtime/themes/catppuccin_macchiato.toml−2

This diff is too big to show here.

runtime/themes/catppuccin_mocha.toml−11

This diff is too big to show here.

runtime/themes/cyan_light.tomldeleted−154

This diff is too big to show here.

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

This diff is too big to show here.

runtime/themes/darcula.toml+4−10

This diff is too big to show here.

runtime/themes/dark_plus.toml+1−2

This diff is too big to show here.

runtime/themes/dracula.toml−2

This diff is too big to show here.

runtime/themes/everblush.toml−1

This diff is too big to show here.

runtime/themes/everforest_dark.toml−4

This diff is too big to show here.

runtime/themes/gruber-darker.tomldeleted−114

This diff is too big to show here.

runtime/themes/gruvbox.toml−1

This diff is too big to show here.

runtime/themes/gruvbox_dark_hard.toml+2

This diff is too big to show here.

runtime/themes/gruvbox_light.toml+2

This diff is too big to show here.

runtime/themes/horizon-dark.tomldeleted−80

This diff is too big to show here.

runtime/themes/jellybeans.toml+1−1

This diff is too big to show here.

runtime/themes/kaolin-dark.tomldeleted−108

This diff is too big to show here.

runtime/themes/kaolin-light.tomldeleted−60

This diff is too big to show here.

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

This diff is too big to show here.

runtime/themes/licenses/everforest.LICENSEdeleted−21

This diff is too big to show here.

runtime/themes/licenses/modus_vivendi.LICENSEdeleted−5

This diff is too big to show here.

runtime/themes/licenses/modus_vivendi_deuteranopia.LICENSEdeleted−5

This diff is too big to show here.

runtime/themes/licenses/modus_vivendi_tinted.LICENSEdeleted−5

This diff is too big to show here.

runtime/themes/licenses/modus_vivendi_tritanopia.LICENSEdeleted−5

This diff is too big to show here.

runtime/themes/licenses/poimandres.LICENSEdeleted−21

This diff is too big to show here.

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

This diff is too big to show here.

runtime/themes/licenses/sonokai.LICENSEdeleted−21

This diff is too big to show here.

runtime/themes/licenses/starlight.LICENSEdeleted−24

This diff is too big to show here.

runtime/themes/material_darker.tomldeleted−20

This diff is too big to show here.

runtime/themes/material_deep_ocean.tomldeleted−123

This diff is too big to show here.

runtime/themes/material_oceanic.tomldeleted−21

This diff is too big to show here.

runtime/themes/material_palenight.tomldeleted−19

This diff is too big to show here.

runtime/themes/modus_operandi.tomldeleted−194

This diff is too big to show here.

runtime/themes/modus_operandi_deuteranopia.tomldeleted−46

This diff is too big to show here.

runtime/themes/modus_operandi_tinted.tomldeleted−45

This diff is too big to show here.

runtime/themes/modus_operandi_tritanopia.tomldeleted−73

This diff is too big to show here.

runtime/themes/modus_vivendi.tomldeleted−242

This diff is too big to show here.

runtime/themes/modus_vivendi_deuteranopia.tomldeleted−158

This diff is too big to show here.

runtime/themes/modus_vivendi_tinted.tomldeleted−144

This diff is too big to show here.

runtime/themes/modus_vivendi_tritanopia.tomldeleted−186

This diff is too big to show here.

runtime/themes/molokai.toml+1−1

This diff is too big to show here.

runtime/themes/monokai.toml−5

This diff is too big to show here.

runtime/themes/naysayer.tomldeleted−91

This diff is too big to show here.

runtime/themes/new_moon.tomldeleted−124

This diff is too big to show here.

runtime/themes/nightfox.toml+2−2

This diff is too big to show here.

runtime/themes/noctis.toml+26−26

This diff is too big to show here.

runtime/themes/nord-night.tomldeleted−23

This diff is too big to show here.

runtime/themes/nord.toml+105−162

This diff is too big to show here.

runtime/themes/onedark.toml−1

This diff is too big to show here.

runtime/themes/onedarker.toml−1

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/themes/poimandres.tomldeleted−113

This diff is too big to show here.

runtime/themes/poimandres_storm.tomldeleted−19

This diff is too big to show here.

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

This diff is too big to show here.

runtime/themes/rose_pine.toml+29−31

This diff is too big to show here.

runtime/themes/starlight.tomldeleted−113

This diff is too big to show here.

runtime/themes/vim_dark_high_contrast.tomldeleted−72

This diff is too big to show here.

runtime/themes/yellowed.tomldeleted−135

This diff is too big to show here.

runtime/themes/zenburn.toml+1−1

This diff is too big to show here.

runtime/tutor+3−157

This diff is too big to show here.

rust-toolchain.toml+2−2

This diff is too big to show here.

xtask/Cargo.toml+6−12

This diff is too big to show here.