be656c1...master · helix

git.iko.soy/helix

779 files changed+73650−17162

since splitsnapshots

unifiedsplit

.cargo/configdeleted−2

@@ -1,2 +0,0 @@

1−[alias]

2−xtask = "run --package xtask --"

.cargo/config.tomlnew file+3

@@ -0,0 +1,3 @@

1+[alias]

2+xtask = "run --package xtask --"

3+integration-test = "test --features integration --profile integration --workspace --test integration"

.envrc+1

@@ -1,5 +1,6 @@

11watch_file shell.nix

22watch_file flake.lock

3+watch_file rust-toolchain.toml

45# try to use flakes, if it fails use normal nix (ie. shell.nix)

56use flake || use nix

.gitattributesnew file+11

@@ -0,0 +1,11 @@

1+# Auto detect text files and perform normalization

2+* text=auto

4+*.rs text diff=rust

5+*.toml text diff=toml

7+*.scm text diff=scheme

8+*.md text diff=markdown

10+book/theme/highlight.js linguist-vendored

11+Cargo.lock text

.github/FUNDING.ymlnew file+1

@@ -0,0 +1 @@

1+open_collective: helix-editor

.github/ISSUE_TEMPLATE/bug_report.yaml+14−3

@@ -32,7 +32,7 @@ body:

3232 id: helix-log

3333 attributes:

3434 label: Helix log

35− description: See `hx -h` for log file path

35+ description: See `hx -h` for log file path. If you can reproduce the issue run `RUST_BACKTRACE=1 hx -vv` to generate a more detailed log file.

3636 value: |

3737 <details><summary>~/.cache/helix/helix.log</summary>

3838

@@ -55,13 +55,24 @@ body:

5555 placeholder: wezterm 20220101-133340-7edc5b5a

5656 validations:

5757 required: true

58+ - type: input

59+ id: installation-method

60+ attributes:

61+ label: Installation Method

62+ description: >

63+ How you installed Helix - from a package manager like Homebrew or the

64+ AUR, built from source, downloaded a binary from the releases page, etc.

65+ placeholder: "source / brew / nixpkgs / flake / releases page"

66+ validations:

67+ required: true

5868 - type: input

5969 id: helix-version

6070 attributes:

6171 label: Helix Version

6272 description: >

6373 Helix version (`hx -V` if using a release, `git describe` if building

64− from master)

65− placeholder: "helix 0.6.0 (c0dbd6dc)"

74+ from master).

75+ **Make sure that you are using the [latest helix release](https://github.com/helix-editor/helix/releases) or a newer master build**

76+ placeholder: "helix 22.12 (5eaa6d97)"

6677 validations:

6778 required: true

.github/ISSUE_TEMPLATE/enhancement.mdnew file+13

@@ -0,0 +1,13 @@

1+---

2+name: Enhancement

3+about: Suggest an improvement

4+title: ''

5+labels: C-enhancement

6+assignees: ''

7+---

9+<!--

10+Your enhancement may already be reported!

11+Please search on the issue tracker before creating a new issue.

12+If this is an idea for a feature, please open an "Idea" Discussion instead.

13+-->

.github/ISSUE_TEMPLATE/feature_request.mddeleted−13

@@ -1,13 +0,0 @@

1−---

2−name: Feature request

3−about: Suggest a new feature or improvement

4−title: ''

5−labels: C-enhancement

6−assignees: ''

7−---

8−

9−<!-- Your feature may already be reported!

10−Please search on the issue tracker before creating one. -->

11−

12−#### Describe your feature request

13−

.github/workflows/build.yml+38−122

@@ -4,194 +4,110 @@ on:

44 push:

55 branches:

66 - master

7+ merge_group:

78 schedule:

89 - cron: '00 01 * * *'

910

1011jobs:

1112 check:

12− name: Check

13+ name: Check (msrv)

1314 runs-on: ubuntu-latest

1415 steps:

1516 - name: Checkout sources

16− uses: actions/checkout@v3

17−

17+ uses: actions/checkout@v4

1818 - name: Install stable toolchain

19− uses: actions-rs/toolchain@v1

19+ uses: helix-editor/rust-toolchain@v1

2020 with:

2121 profile: minimal

22− toolchain: stable

2322 override: true

2423

25− - name: Cache cargo registry

26− uses: actions/cache@v3

27− with:

28− path: ~/.cargo/registry

29− key: ${{ runner.os }}-v2-cargo-registry-${{ hashFiles('**/Cargo.lock') }}

30− restore-keys: ${{ runner.os }}-v2-cargo-registry-

31−

32− - name: Cache cargo index

33− uses: actions/cache@v3

24+ - uses: Swatinem/rust-cache@v2

3425 with:

35− path: ~/.cargo/git

36− key: ${{ runner.os }}-v2-cargo-index-${{ hashFiles('**/Cargo.lock') }}

37− restore-keys: ${{ runner.os }}-v2-cargo-index-

38−

39− - name: Cache cargo target dir

40− uses: actions/cache@v3

41− with:

42− path: target

43− key: ${{ runner.os }}-v2-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}

44− restore-keys: ${{ runner.os }}-v2-cargo-build-target-

26+ shared-key: "build"

4527

4628 - name: Run cargo check

47− uses: actions-rs/cargo@v1

48− with:

49− command: check

29+ run: cargo check

5030

5131 test:

5232 name: Test Suite

5333 runs-on: ${{ matrix.os }}

34+ env:

35+ RUST_BACKTRACE: 1

36+ HELIX_LOG_LEVEL: info

5437 steps:

5538 - name: Checkout sources

56− uses: actions/checkout@v3

39+ uses: actions/checkout@v4

5740

5841 - name: Install stable toolchain

59− uses: actions-rs/toolchain@v1

60− with:

61− profile: minimal

62− toolchain: ${{ matrix.rust }}

63− override: true

64−

65− - name: Cache cargo registry

66− uses: actions/cache@v3

67− with:

68− path: ~/.cargo/registry

69− key: ${{ runner.os }}-v2-cargo-registry-${{ hashFiles('**/Cargo.lock') }}

70− restore-keys: ${{ runner.os }}-v2-cargo-registry-

42+ uses: dtolnay/rust-toolchain@1.70

7143

72− - name: Cache cargo index

73− uses: actions/cache@v3

44+ - uses: Swatinem/rust-cache@v2

7445 with:

75− path: ~/.cargo/git

76− key: ${{ runner.os }}-v2-cargo-index-${{ hashFiles('**/Cargo.lock') }}

77− restore-keys: ${{ runner.os }}-v2-cargo-index-

78−

79− - name: Cache cargo target dir

80− uses: actions/cache@v3

81− with:

82− path: target

83− key: ${{ runner.os }}-v2-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}

84− restore-keys: ${{ runner.os }}-v2-cargo-build-target-

85−

86− - name: Copy minimal languages config

87− run: cp .github/workflows/languages.toml ./languages.toml

46+ shared-key: "build"

8847

8948 - name: Cache test tree-sitter grammar

9049 uses: actions/cache@v3

9150 with:

9251 path: runtime/grammars

93− key: ${{ runner.os }}-v2-tree-sitter-grammars-${{ hashFiles('languages.toml') }}

94− restore-keys: ${{ runner.os }}-v2-tree-sitter-grammars-

52+ key: ${{ runner.os }}-stable-v${{ env.CACHE_VERSION }}-tree-sitter-grammars-${{ hashFiles('languages.toml') }}

53+ restore-keys: ${{ runner.os }}-stable-v${{ env.CACHE_VERSION }}-tree-sitter-grammars-

9554

9655 - name: Run cargo test

97− uses: actions-rs/cargo@v1

98− with:

99− command: test

100− args: --workspace

56+ run: cargo test --workspace

57+

58+ - name: Run cargo integration-test

59+ run: cargo integration-test

10160

10261 strategy:

10362 matrix:

10463 os: [ubuntu-latest, macos-latest, windows-latest]

105− rust: [stable]

10664

10765 lints:

10866 name: Lints

10967 runs-on: ubuntu-latest

11068 steps:

11169 - name: Checkout sources

112− uses: actions/checkout@v3

70+ uses: actions/checkout@v4

11371

11472 - name: Install stable toolchain

115− uses: actions-rs/toolchain@v1

73+ uses: dtolnay/rust-toolchain@1.70

11674 with:

117− profile: minimal

118− toolchain: stable

119− override: true

12075 components: rustfmt, clippy

12176

122− - name: Cache cargo registry

123− uses: actions/cache@v3

124− with:

125− path: ~/.cargo/registry

126− key: ${{ runner.os }}-v2-cargo-registry-${{ hashFiles('**/Cargo.lock') }}

127− restore-keys: ${{ runner.os }}-v2-cargo-registry-

128−

129− - name: Cache cargo index

130− uses: actions/cache@v3

77+ - uses: Swatinem/rust-cache@v2

13178 with:

132− path: ~/.cargo/git

133− key: ${{ runner.os }}-v2-cargo-index-${{ hashFiles('**/Cargo.lock') }}

134− restore-keys: ${{ runner.os }}-v2-cargo-index-

135−

136− - name: Cache cargo target dir

137− uses: actions/cache@v3

138− with:

139− path: target

140− key: ${{ runner.os }}-v2-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}

141− restore-keys: ${{ runner.os }}-v2-cargo-build-target-

79+ shared-key: "build"

14280

14381 - name: Run cargo fmt

144− uses: actions-rs/cargo@v1

145− with:

146− command: fmt

147− args: --all -- --check

82+ run: cargo fmt --all --check

14883

14984 - name: Run cargo clippy

150− uses: actions-rs/cargo@v1

151− with:

152− command: clippy

153− args: --all-targets -- -D warnings

85+ run: cargo clippy --workspace --all-targets -- -D warnings

86+

87+ - name: Run cargo doc

88+ run: cargo doc --no-deps --workspace --document-private-items

89+ env:

90+ RUSTDOCFLAGS: -D warnings

15491

15592 docs:

15693 name: Docs

15794 runs-on: ubuntu-latest

15895 steps:

15996 - name: Checkout sources

160− uses: actions/checkout@v3

97+ uses: actions/checkout@v4

16198

16299 - name: Install stable toolchain

163− uses: actions-rs/toolchain@v1

164− with:

165− profile: minimal

166− toolchain: stable

167− override: true

100+ uses: dtolnay/rust-toolchain@1.70

168101

169− - name: Cache cargo registry

170− uses: actions/cache@v3

102+ - uses: Swatinem/rust-cache@v2

171103 with:

172− path: ~/.cargo/registry

173− key: ${{ runner.os }}-v2-cargo-registry-${{ hashFiles('**/Cargo.lock') }}

174− restore-keys: ${{ runner.os }}-v2-cargo-registry-

104+ shared-key: "build"

175105

176− - name: Cache cargo index

177− uses: actions/cache@v3

178− with:

179− path: ~/.cargo/git

180− key: ${{ runner.os }}-v2-cargo-index-${{ hashFiles('**/Cargo.lock') }}

181− restore-keys: ${{ runner.os }}-v2-cargo-index-

182−

183− - name: Cache cargo target dir

184− uses: actions/cache@v3

185− with:

186− path: target

187− key: ${{ runner.os }}-v2-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}

188− restore-keys: ${{ runner.os }}-v2-cargo-build-target-

106+ - name: Validate queries

107+ run: cargo xtask query-check

189108

190109 - name: Generate docs

191− uses: actions-rs/cargo@v1

192− with:

193− command: xtask

194− args: docgen

110+ run: cargo xtask docgen

195111

196112 - name: Check uncommitted documentation changes

197113 run: |

.github/workflows/cachix.yml+4−4

@@ -11,16 +11,16 @@ jobs:

1111 runs-on: ubuntu-latest

1212 steps:

1313 - name: Checkout sources

14− uses: actions/checkout@v3

14+ uses: actions/checkout@v4

1515

1616 - name: Install nix

17− uses: cachix/install-nix-action@v17

17+ uses: cachix/install-nix-action@v24

1818

1919 - name: Authenticate with Cachix

20− uses: cachix/cachix-action@v10

20+ uses: cachix/cachix-action@v13

2121 with:

2222 name: helix

2323 authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}

2424

2525 - name: Build nix flake

26− run: nix build

26+ run: nix build -L

.github/workflows/gh-pages.yml+5−5

@@ -11,7 +11,7 @@ jobs:

1111 deploy:

1212 runs-on: ubuntu-latest

1313 steps:

14− - uses: actions/checkout@v3

14+ - uses: actions/checkout@v4

1515

1616 - name: Setup mdBook

1717 uses: peaceiris/actions-mdbook@v1

@@ -26,16 +26,16 @@ jobs:

2626 OUTDIR=$(basename ${{ github.ref }})

2727 echo "OUTDIR=$OUTDIR" >> $GITHUB_ENV

2828

29− - name: Deploy

29+ - name: Deploy stable

3030 uses: peaceiris/actions-gh-pages@v3

31+ if: startswith(github.ref, 'refs/tags/')

3132 with:

3233 github_token: ${{ secrets.GITHUB_TOKEN }}

3334 publish_dir: ./book/book

34− destination_dir: ./${{ env.OUTDIR }}

3535

36− - name: Deploy stable

36+ - name: Deploy

3737 uses: peaceiris/actions-gh-pages@v3

38− if: startswith(github.ref, 'refs/tags/')

3938 with:

4039 github_token: ${{ secrets.GITHUB_TOKEN }}

4140 publish_dir: ./book/book

41+ destination_dir: ./${{ env.OUTDIR }}

.github/workflows/languages.toml+1−1

@@ -11,7 +11,7 @@ indent = { tab-width = 4, unit = " " }

1111

1212[[grammar]]

1313name = "rust"

14−source = { git = "https://github.com/tree-sitter/tree-sitter-rust", rev = "a360da0a29a19c281d08295a35ecd0544d2da211" }

14+source = { git = "https://github.com/tree-sitter/tree-sitter-rust", rev = "0431a2c60828731f27491ee9fdefe25e250ce9c9" }

1515

1616[[language]]

1717name = "nix"

.github/workflows/release.yml+150−87

@@ -4,6 +4,18 @@ on:

44 tags:

55 - '[0-9]+.[0-9]+'

66 - '[0-9]+.[0-9]+.[0-9]+'

7+ branches:

8+ - 'patch/ci-release-*'

9+ pull_request:

10+ paths:

11+ - '.github/workflows/release.yml'

12+

13+env:

14+ # Preview mode: Publishes the build output as a CI artifact instead of creating

15+ # a release, allowing for manual inspection of the output. This mode is

16+ # activated if the CI run was triggered by events other than pushed tags, or

17+ # if the repository is a fork.

18+ preview: ${{ !startsWith(github.ref, 'refs/tags/') || github.repository != 'helix-editor/helix' }}

719

820jobs:

921 fetch-grammars:

@@ -11,48 +23,20 @@ jobs:

1123 runs-on: ubuntu-latest

1224 steps:

1325 - name: Checkout sources

14− uses: actions/checkout@v3

26+ uses: actions/checkout@v4

1527

1628 - name: Install stable toolchain

17− uses: actions-rs/toolchain@v1

18− with:

19− profile: minimal

20− toolchain: stable

21− override: true

22−

23− - name: Cache cargo registry

24− uses: actions/cache@v3

25− with:

26− path: ~/.cargo/registry

27− key: ${{ runner.os }}-v2-cargo-registry-${{ hashFiles('**/Cargo.lock') }}

28− restore-keys: ${{ runner.os }}-v2-cargo-registry-

29+ uses: dtolnay/rust-toolchain@stable

2930

30− - name: Cache cargo index

31− uses: actions/cache@v3

32− with:

33− path: ~/.cargo/git

34− key: ${{ runner.os }}-v2-cargo-index-${{ hashFiles('**/Cargo.lock') }}

35− restore-keys: ${{ runner.os }}-v2-cargo-index-

36−

37− - name: Cache cargo target dir

38− uses: actions/cache@v3

39− with:

40− path: target

41− key: ${{ runner.os }}-v2-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}

42− restore-keys: ${{ runner.os }}-v2-cargo-build-target-

31+ - uses: Swatinem/rust-cache@v2

4332

4433 - name: Fetch tree-sitter grammars

45− uses: actions-rs/cargo@v1

46− env:

47− HELIX_DISABLE_AUTO_GRAMMAR_BUILD: yes

48− with:

49− command: run

50− args: -- --grammar fetch

34+ run: cargo run --package=helix-loader --bin=hx-loader

5135

5236 - name: Bundle grammars

5337 run: tar cJf grammars.tar.xz -C runtime/grammars/sources .

5438

55− - uses: actions/upload-artifact@v3

39+ - uses: actions/upload-artifact@v4

5640 with:

5741 name: grammars

5842 path: grammars.tar.xz

@@ -60,6 +44,16 @@ jobs:

6044 dist:

6145 name: Dist

6246 needs: [fetch-grammars]

47+ env:

48+ # For some builds, we use cross to test on 32-bit and big-endian

49+ # systems.

50+ CARGO: cargo

51+ # When CARGO is set to CROSS, this is set to `--target matrix.target`.

52+ TARGET_FLAGS:

53+ # When CARGO is set to CROSS, TARGET_DIR includes matrix.target.

54+ TARGET_DIR: ./target

55+ # Emit backtraces on panics.

56+ RUST_BACKTRACE: 1

6357 runs-on: ${{ matrix.os }}

6458 strategy:

6559 fail-fast: false # don't fail other jobs if one fails

@@ -67,14 +61,19 @@ jobs:

6761 build: [x86_64-linux, x86_64-macos, x86_64-windows] #, x86_64-win-gnu, win32-msvc

6862 include:

6963 - build: x86_64-linux

70− os: ubuntu-20.04

64+ os: ubuntu-latest

7165 rust: stable

7266 target: x86_64-unknown-linux-gnu

7367 cross: false

74− # - build: aarch64-linux

75− # os: ubuntu-20.04

68+ - build: aarch64-linux

69+ os: ubuntu-latest

70+ rust: stable

71+ target: aarch64-unknown-linux-gnu

72+ cross: true

73+ # - build: riscv64-linux

74+ # os: ubuntu-latest

7675 # rust: stable

77− # target: aarch64-unknown-linux-gnu

76+ # target: riscv64gc-unknown-linux-gnu

7877 # cross: true

7978 - build: x86_64-macos

8079 os: macos-latest

@@ -82,14 +81,17 @@ jobs:

8281 target: x86_64-apple-darwin

8382 cross: false

8483 - build: x86_64-windows

85− os: windows-2019

84+ os: windows-latest

8685 rust: stable

8786 target: x86_64-pc-windows-msvc

8887 cross: false

89− # - build: aarch64-macos

90− # os: macos-latest

91− # rust: stable

92− # target: aarch64-apple-darwin

88+ # 23.03: build issues

89+ - build: aarch64-macos

90+ os: macos-latest

91+ rust: stable

92+ target: aarch64-apple-darwin

93+ cross: false

94+ skip_tests: true # x86_64 host can't run aarch64 code

9395 # - build: x86_64-win-gnu

9496 # os: windows-2019

9597 # rust: stable-x86_64-gnu

@@ -101,10 +103,10 @@ jobs:

101103

102104 steps:

103105 - name: Checkout sources

104− uses: actions/checkout@v3

106+ uses: actions/checkout@v4

105107

106108 - name: Download grammars

107− uses: actions/download-artifact@v3

109+ uses: actions/download-artifact@v4

108110

109111 - name: Move grammars under runtime

110112 if: "!startsWith(matrix.os, 'windows')"

@@ -112,54 +114,113 @@ jobs:

112114 mkdir -p runtime/grammars/sources

113115 tar xJf grammars/grammars.tar.xz -C runtime/grammars/sources

114116

117+ # The rust-toolchain action ignores rust-toolchain.toml files.

118+ # Removing this before building with cargo ensures that the rust-toolchain

119+ # is considered the same between installation and usage.

120+ - name: Remove the rust-toolchain.toml file

121+ run: rm rust-toolchain.toml

122+

115123 - name: Install ${{ matrix.rust }} toolchain

116− uses: actions-rs/toolchain@v1

124+ uses: dtolnay/rust-toolchain@master

117125 with:

118− profile: minimal

119126 toolchain: ${{ matrix.rust }}

120127 target: ${{ matrix.target }}

121− override: true

128+

129+ # Install a pre-release version of Cross

130+ # TODO: We need to pre-install Cross because we need cross-rs/cross#591 to

131+ # get a newer C++ compiler toolchain. Remove this step when Cross

132+ # 0.3.0, which includes cross-rs/cross#591, is released.

133+ - name: Install Cross

134+ if: "matrix.cross"

135+ run: |

136+ cargo install cross --git https://github.com/cross-rs/cross.git --rev 47df5c76e7cba682823a0b6aa6d95c17b31ba63a

137+ echo "CARGO=cross" >> $GITHUB_ENV

138+ # echo "TARGET_FLAGS=--target ${{ matrix.target }}" >> $GITHUB_ENV

139+ # echo "TARGET_DIR=./target/${{ matrix.target }}" >> $GITHUB_ENV

140+

141+ - name: Show command used for Cargo

142+ run: |

143+ echo "cargo command is: ${{ env.CARGO }}"

144+ echo "target flag is: ${{ env.TARGET_FLAGS }}"

122145

123146 - name: Run cargo test

124− uses: actions-rs/cargo@v1

125− with:

126− use-cross: ${{ matrix.cross }}

127− command: test

128− args: --release --locked --target ${{ matrix.target }} --workspace

147+ if: "!matrix.skip_tests"

148+ run: ${{ env.CARGO }} test --release --locked --target ${{ matrix.target }} --workspace

129149

130− - name: Build release binary

131− uses: actions-rs/cargo@v1

132− with:

133− use-cross: ${{ matrix.cross }}

134− command: build

135− args: --release --locked --target ${{ matrix.target }}

150+ - name: Set profile.release.strip = true

151+ shell: bash

152+ run: |

153+ cat >> .cargo/config.toml <<EOF

154+ [profile.release]

155+ strip = true

156+ EOF

136157

137− - name: Strip release binary (linux and macos)

138− if: matrix.build == 'x86_64-linux' || matrix.build == 'x86_64-macos'

139− run: strip "target/${{ matrix.target }}/release/hx"

158+ - name: Build release binary

159+ run: ${{ env.CARGO }} build --release --locked --target ${{ matrix.target }}

140160

141− - name: Strip release binary (arm)

142− if: matrix.build == 'aarch64-linux'

161+ - name: Build AppImage

162+ shell: bash

163+ if: matrix.build == 'x86_64-linux'

143164 run: |

144− docker run --rm -v \

145− "$PWD/target:/target:Z" \

146− rustembedded/cross:${{ matrix.target }} \

147− aarch64-linux-gnu-strip \

148− /target/${{ matrix.target }}/release/hx

165+ # Required as of 22.x https://github.com/AppImage/AppImageKit/wiki/FUSE

166+ sudo add-apt-repository universe

167+ sudo apt install libfuse2

168+

169+ mkdir dist

170+

171+ name=dev

172+ if [[ $GITHUB_REF == refs/tags/* ]]; then

173+ name=${GITHUB_REF:10}

174+ fi

175+

176+ build="${{ matrix.build }}"

177+

178+ export VERSION="$name"

179+ export ARCH=${build%-linux}

180+ export APP=helix

181+ export OUTPUT="helix-$VERSION-$ARCH.AppImage"

182+ export UPDATE_INFORMATION="gh-releases-zsync|$GITHUB_REPOSITORY_OWNER|helix|latest|$APP-*-$ARCH.AppImage.zsync"

183+

184+ mkdir -p "$APP.AppDir"/usr/{bin,lib/helix}

185+

186+ cp "target/${{ matrix.target }}/release/hx" "$APP.AppDir/usr/bin/hx"

187+ rm -rf runtime/grammars/sources

188+ cp -r runtime "$APP.AppDir/usr/lib/helix/runtime"

189+

190+ cat << 'EOF' > "$APP.AppDir/AppRun"

191+ #!/bin/sh

192+

193+ APPDIR="$(dirname "$(readlink -f "${0}")")"

194+ HELIX_RUNTIME="$APPDIR/usr/lib/helix/runtime" exec "$APPDIR/usr/bin/hx" "$@"

195+ EOF

196+ chmod 755 "$APP.AppDir/AppRun"

197+

198+ curl -Lo linuxdeploy-x86_64.AppImage \

199+ https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage

200+ chmod +x linuxdeploy-x86_64.AppImage

201+

202+ ./linuxdeploy-x86_64.AppImage \

203+ --appdir "$APP.AppDir" -d contrib/Helix.desktop \

204+ -i contrib/helix.png --output appimage

205+

206+ mv "$APP-$VERSION-$ARCH.AppImage" \

207+ "$APP-$VERSION-$ARCH.AppImage.zsync" dist

149208

150209 - name: Build archive

151210 shell: bash

152211 run: |

153− mkdir dist

212+ mkdir -p dist

154213 if [ "${{ matrix.os }}" = "windows-2019" ]; then

155214 cp "target/${{ matrix.target }}/release/hx.exe" "dist/"

156215 else

157216 cp "target/${{ matrix.target }}/release/hx" "dist/"

158217 fi

159− rm -rf runtime/grammars/sources

218+ if [ -d runtime/grammars/sources ]; then

219+ rm -rf runtime/grammars/sources

220+ fi

160221 cp -r runtime dist

161222

162− - uses: actions/upload-artifact@v3

223+ - uses: actions/upload-artifact@v4

163224 with:

164225 name: bins-${{ matrix.build }}

165226 path: dist

@@ -170,19 +231,9 @@ jobs:

170231 runs-on: ubuntu-latest

171232 steps:

172233 - name: Checkout sources

173− uses: actions/checkout@v3

234+ uses: actions/checkout@v4

174235

175− - uses: actions/download-artifact@v3

176−

177− - name: Calculate tag name

178− run: |

179− name=dev

180− if [[ $GITHUB_REF == refs/tags/* ]]; then

181− name=${GITHUB_REF:10}

182− fi

183− echo ::set-output name=val::$name

184− echo TAG=$name >> $GITHUB_ENV

185− id: tagname

236+ - uses: actions/download-artifact@v4

186237

187238 - name: Build archive

188239 shell: bash

@@ -203,8 +254,8 @@ jobs:

203254 if [[ $platform =~ "windows" ]]; then

204255 exe=".exe"

205256 fi

206− pkgname=helix-$TAG-$platform

207− mkdir $pkgname

257+ pkgname=helix-$GITHUB_REF_NAME-$platform

258+ mkdir -p $pkgname

208259 cp $source/LICENSE $source/README.md $pkgname

209260 mkdir $pkgname/contrib

210261 cp -r $source/contrib/completion $pkgname/contrib

@@ -212,6 +263,10 @@ jobs:

212263 mv bins-$platform/hx$exe $pkgname

213264 chmod +x $pkgname/hx$exe

214265

266+ if [[ "$platform" = "x86_64-linux" ]]; then

267+ mv bins-$platform/helix-*.AppImage* dist/

268+ fi

269+

215270 if [ "$exe" = "" ]; then

216271 tar cJf dist/$pkgname.tar.xz $pkgname

217272 else

@@ -219,14 +274,22 @@ jobs:

219274 fi

220275 done

221276

222− tar cJf dist/helix-$TAG-source.tar.xz -C $source .

277+ tar cJf dist/helix-$GITHUB_REF_NAME-source.tar.xz -C $source .

223278 mv dist $source/

224279

225280 - name: Upload binaries to release

226281 uses: svenstaro/upload-release-action@v2

282+ if: env.preview == 'false'

227283 with:

228284 repo_token: ${{ secrets.GITHUB_TOKEN }}

229285 file: dist/*

230286 file_glob: true

231− tag: ${{ steps.tagname.outputs.val }}

287+ tag: ${{ github.ref_name }}

232288 overwrite: true

289+

290+ - name: Upload binaries as artifact

291+ uses: actions/upload-artifact@v4

292+ if: env.preview == 'true'

293+ with:

294+ name: release

295+ path: dist/*

.gitignore−1

@@ -1,6 +1,5 @@

11target

22.direnv

33helix-term/rustfmt.toml

4−helix-syntax/languages/

54result

65runtime/grammars

.ignorenew file+2

@@ -0,0 +1,2 @@

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

CHANGELOG.md+1395−5

@@ -1,3 +1,1393 @@

1+# 23.10 (2023-10-24)

3+A big shout out to all the contributors! We had 118 contributors in this release.

5+Breaking changes:

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

10+Features:

11+

12+- Support multiple language servers per language ([#2507](https://github.com/helix-editor/helix/pull/2507), [#7082](https://github.com/helix-editor/helix/pull/7082), [#7286](https://github.com/helix-editor/helix/pull/7286), [#8374](https://github.com/helix-editor/helix/pull/8374))

13+- Add a statusline element for the selected register ([#7222](https://github.com/helix-editor/helix/pull/7222))

14+- Add `%`, `#`, `.`, `*` and `+` special registers ([#6985](https://github.com/helix-editor/helix/pull/6985))

15+- Add initial support for LSP DidChangeWatchedFiles notifications ([#7665](https://github.com/helix-editor/helix/pull/7665))

16+- Search buffer contents in `global_search` ([#5652](https://github.com/helix-editor/helix/pull/5652))

17+- Add a "smart tab" command that intelligently jumps the cursor on tab ([#4443](https://github.com/helix-editor/helix/pull/4443))

18+- Add a statusline element for whether a file is read-only ([#7222](https://github.com/helix-editor/helix/pull/7222), [#7875](https://github.com/helix-editor/helix/pull/7875))

19+- Syntax highlight regex prompts ([#7738](https://github.com/helix-editor/helix/pull/7738))

20+- Allow defining alignment in indent queries ([#5355](https://github.com/helix-editor/helix/pull/5355))

21+- Show visual feedback in `surround_replace` ([#7588](https://github.com/helix-editor/helix/pull/7588))

22+- Switch to Nucleo for fuzzy matching ([#7814](https://github.com/helix-editor/helix/pull/7814), [#8148](https://github.com/helix-editor/helix/pull/8148), [#8192](https://github.com/helix-editor/helix/pull/8192), [#8194](https://github.com/helix-editor/helix/pull/8194))

23+- Insert a trailing newline on write ([#8157](https://github.com/helix-editor/helix/pull/8157))

24+- Add a `-w`/`--working-dir` CLI flag for specifying a working directory on startup ([#8223](https://github.com/helix-editor/helix/pull/8223), [#8498](https://github.com/helix-editor/helix/pull/8498), [#8520](https://github.com/helix-editor/helix/pull/8520))

25+- Accept a `+N` CLI argument to set the first file's line number ([#8521](https://github.com/helix-editor/helix/pull/8521))

26+- Accept Helix-specific ignore files in `.helix/ignore` and `~/.config/helix/ignore` ([#8099](https://github.com/helix-editor/helix/pull/8099))

27+

28+Commands:

29+

30+- `merge_selections` (`A-minus`) - merge all selections into one selection that covers all ranges ([#7053](https://github.com/helix-editor/helix/pull/7053))

31+- `move_prev_long_word_end` and `extend_prev_long_word_end` - move/extend to the end of the previous WORD ([#6905](https://github.com/helix-editor/helix/pull/6905))

32+- `reverse_selection_contents` - swaps the values of each selection so they are reversed ([#7329](https://github.com/helix-editor/helix/pull/7329))

33+- Add `:rl` and `:rla` aliases for `:reload` and `:reload-all` ([#7158](https://github.com/helix-editor/helix/pull/7158))

34+- `yank_joined` - join the selections and yank to the selected register ([#7195](https://github.com/helix-editor/helix/pull/7195))

35+- `:write-all!` (`:wa!`) - forcibly write all buffers to disk and create any necessary subdirectories ([#7577](https://github.com/helix-editor/helix/pull/7577))

36+- `:redraw` - clear re-render the UI ([#6949](https://github.com/helix-editor/helix/pull/6949))

37+- `:tree-sitter-highlight-name` - show the theme scope name of the highlight under the cursor ([#8170](https://github.com/helix-editor/helix/pull/8170))

38+

39+Usability improvements:

40+

41+- Allow cycling option values at runtime ([#4411](https://github.com/helix-editor/helix/pull/4411), [#7240](https://github.com/helix-editor/helix/pull/7240), [#7877](https://github.com/helix-editor/helix/pull/7877))

42+- Exit gracefully on termination signals ([#7236](https://github.com/helix-editor/helix/pull/7236))

43+- Add plaintext matching fallback to tree-sitter pair matching ([#4288](https://github.com/helix-editor/helix/pull/4288))

44+- Persist register selection in pending keymaps ([0e08349](https://github.com/helix-editor/helix/commit/0e08349))

45+- Propagate the count and register to command palette commands ([b394997](https://github.com/helix-editor/helix/commit/b394997))

46+- Auto indent on `insert_at_line_start` ([#5837](https://github.com/helix-editor/helix/pull/5837))

47+- Add a config option to control whether LSP completions are automatically inserted on preview ([#7189](https://github.com/helix-editor/helix/pull/7189))

48+- Add a config option for default line endings ([#5621](https://github.com/helix-editor/helix/pull/5621), [#7357](https://github.com/helix-editor/helix/pull/7357))

49+- Allow ANSI colors in themes ([#5119](https://github.com/helix-editor/helix/pull/5119))

50+- Match pairs that don't form a standalone tree-sitter node ([#7242](https://github.com/helix-editor/helix/pull/7242))

51+- Allow indent sizes of up to 16 columns ([#7429](https://github.com/helix-editor/helix/pull/7429))

52+- Improve performance of mapping positions through changes ([#7408](https://github.com/helix-editor/helix/pull/7408), [8d39a81](https://github.com/helix-editor/helix/commit/8d39a81), [#7471](https://github.com/helix-editor/helix/pull/7471))

53+- Mark buffers created from stdin as modified ([#7431](https://github.com/helix-editor/helix/pull/7431))

54+- Forcibly shut down uninitialized language servers ([#7449](https://github.com/helix-editor/helix/pull/7449))

55+- Add filename completer for shell prompts ([#7569](https://github.com/helix-editor/helix/pull/7569))

56+- Allow binding F13-F24 ([#7672](https://github.com/helix-editor/helix/pull/7672))

57+- Resolve LSP code actions ([#7677](https://github.com/helix-editor/helix/pull/7677), [#8421](https://github.com/helix-editor/helix/pull/8421))

58+- Save an undo checkpoint before accepting completions ([#7747](https://github.com/helix-editor/helix/pull/7747))

59+- Include gitignored files in debugger completions ([#7936](https://github.com/helix-editor/helix/pull/7936))

60+- Make editor remember the last search register ([#5244](https://github.com/helix-editor/helix/pull/5244))

61+- Open directories with `goto_file` ([#7909](https://github.com/helix-editor/helix/pull/7909))

62+- Use relative path to open buffer in `goto_file` (`gf`) ([#7965](https://github.com/helix-editor/helix/pull/7965))

63+- Support `default` color in themes ([#8083](https://github.com/helix-editor/helix/pull/8083), [#8114](https://github.com/helix-editor/helix/pull/8114))

64+- Toggle between relative and absolute line numbers when the terminal loses focus ([#7955](https://github.com/helix-editor/helix/pull/7955))

65+- Lower default idle-timeout to 250ms ([060e73a](https://github.com/helix-editor/helix/commit/060e73a))

66+- Allow theming diff gutters separately from other diff colors ([#8343](https://github.com/helix-editor/helix/pull/8343))

67+- Style bold/italic/strikethrough in markdown doc popups ([#8385](https://github.com/helix-editor/helix/pull/8385))

68+- Maintain the cursor position and view when splitting with `:hsplit`/`:vsplit` ([#8109](https://github.com/helix-editor/helix/pull/8109))

69+- Accept `-` in macros outside of `<`/`>` ([#8475](https://github.com/helix-editor/helix/pull/8475))

70+- Show all language servers for each language in `--health` ([#7315](https://github.com/helix-editor/helix/pull/7315))

71+- Don't break on hyphens in `:reflow` ([#8569](https://github.com/helix-editor/helix/pull/8569))

72+

73+Fixes:

74+

75+- Update diagnostics correctly on language server exit ([#7111](https://github.com/helix-editor/helix/pull/7111))

76+- Fix off-by-one in `select_references_to_symbol_under_cursor` ([#7132](https://github.com/helix-editor/helix/pull/7132))

77+- Extend selection with repeat-last-motion only if the original motion extended the selection ([#7159](https://github.com/helix-editor/helix/pull/7159))

78+- Fix undefined behavior in the diff gutter ([#7227](https://github.com/helix-editor/helix/pull/7227))

79+- Check that tab width is non-zero ([#7178](https://github.com/helix-editor/helix/pull/7178))

80+- Fix styles being overwritten in table rows with multiple cells ([#7281](https://github.com/helix-editor/helix/pull/7281))

81+- Add file for `--log` CLI arg in help text ([#7307](https://github.com/helix-editor/helix/pull/7307))

82+- Fix underflow when repeating a completion that has a negative shift position ([#7322](https://github.com/helix-editor/helix/pull/7322))

83+- Prefer longer matches in `select_next_sibling` and `select_prev_sibling` ([#7332](https://github.com/helix-editor/helix/pull/7332))

84+- Preview scratch buffers in the jumplist picker ([#7331](https://github.com/helix-editor/helix/pull/7331))

85+- Fix chunking by bytes in tree-sitter parsing ([#7417](https://github.com/helix-editor/helix/pull/7417))

86+- Discard LSP publishDiagnostic from uninitialized servers ([#7467](https://github.com/helix-editor/helix/pull/7467))

87+- Use negotiated position encoding for LSP workspace edits ([#7469](https://github.com/helix-editor/helix/pull/7469))

88+- Fix error message for unknown gutter types in config ([#7534](https://github.com/helix-editor/helix/pull/7534))

89+- Fix `:log-open` when `--log` CLI arg is specified ([#7573](https://github.com/helix-editor/helix/pull/7573), [#7585](https://github.com/helix-editor/helix/pull/7585))

90+- Fix debouncing of LSP messages to fix the last message sticking around ([#7538](https://github.com/helix-editor/helix/pull/7538), [#8023](https://github.com/helix-editor/helix/pull/8023))

91+- Fix crash when the current working directory is deleted ([#7185](https://github.com/helix-editor/helix/pull/7185))

92+- Fix piping to Helix on macOS ([#5468](https://github.com/helix-editor/helix/pull/5468))

93+- Fix crash when parsing overlapping injections ([#7621](https://github.com/helix-editor/helix/pull/7621))

94+- Clear the statusline when the prompt is visible ([#7646](https://github.com/helix-editor/helix/pull/7646))

95+- Fix range formatting error message typo ([#7823](https://github.com/helix-editor/helix/pull/7823))

96+- Skip rendering gutters when gutter width exceeds view width ([#7821](https://github.com/helix-editor/helix/pull/7821))

97+- Center the picker preview using visual lines ([#7837](https://github.com/helix-editor/helix/pull/7837))

98+- Align view correctly for background buffers opened with `A-ret` ([#7691](https://github.com/helix-editor/helix/pull/7691))

99+- Fix cursor resetting to block when quitting via a keybind ([#7931](https://github.com/helix-editor/helix/pull/7931))

100+- Remove path completions for the `:new` command ([#8010](https://github.com/helix-editor/helix/pull/8010))

101+- Use binary path resolved by `which` for formatter commands ([#8064](https://github.com/helix-editor/helix/pull/8064))

102+- Handle crossterm's `hidden` modifier ([#8120](https://github.com/helix-editor/helix/pull/8120))

103+- Clear completion when switching between windows with the mouse ([#8118](https://github.com/helix-editor/helix/pull/8118))

104+- Eagerly remove the last picker (`<space>'`) when the picker has many items ([#8127](https://github.com/helix-editor/helix/pull/8127))

105+- Fix find commands for buffers with non-LF line-endings ([#8111](https://github.com/helix-editor/helix/pull/8111))

106+- Detect the tmux clipboard provider on macOS ([#8182](https://github.com/helix-editor/helix/pull/8182))

107+- Fix syntax highlighting in dynamic picker preview pane ([#8206](https://github.com/helix-editor/helix/pull/8206))

108+- Recognize HTML code tags with attributes as code in markdown previews ([#8397](https://github.com/helix-editor/helix/pull/8397))

109+- Fix multicursor snippet placeholder directions ([#8423](https://github.com/helix-editor/helix/pull/8423))

110+- Only show diagnostic highlights when diagnostics are enabled for a language server ([#8551](https://github.com/helix-editor/helix/pull/8551))

111+

112+Themes:

113+

114+- Improve the selection color in `ferra` ([#7138](https://github.com/helix-editor/helix/pull/7138))

115+- Add `variable.other.member` theming to `spacebones_light` ([#7125](https://github.com/helix-editor/helix/pull/7125))

116+- Update `autumn` and theme the soft-wrap indicator ([#7229](https://github.com/helix-editor/helix/pull/7229))

117+- Add `gruvbox_dark_soft` ([#7139](https://github.com/helix-editor/helix/pull/7139))

118+- Add `merionette` ([#7186](https://github.com/helix-editor/helix/pull/7186))

119+- Add `zed_onedark` and `zed_onelight` ([#7250](https://github.com/helix-editor/helix/pull/7250))

120+- Use light-gray for `onedarker` inlay hint theming ([#7433](https://github.com/helix-editor/helix/pull/7433))

121+- Update the Nord theme to follow the style guidelines ([#7490](https://github.com/helix-editor/helix/pull/7490))

122+- Tune `dark_plus` inlay hint colors ([#7611](https://github.com/helix-editor/helix/pull/7611))

123+- Add `naysayer` ([#7570](https://github.com/helix-editor/helix/pull/7570))

124+- Add `kaolin-dark`, `kaolin-light` and `kaolin-valley-dark` ([#7151](https://github.com/helix-editor/helix/pull/7151))

125+- Fix selection highlighting in gruvbox variants ([#7717](https://github.com/helix-editor/helix/pull/7717))

126+- Add soft-wrap indicator to `gruvbox` ([#7736](https://github.com/helix-editor/helix/pull/7736))

127+- Add missing palette definitions in `everforest_dark` ([#7739](https://github.com/helix-editor/helix/pull/7739))

128+- Increase diagnostics clarity in `pop-dark` ([#7702](https://github.com/helix-editor/helix/pull/7702))

129+- Add `vim_dark_high_contrast` ([#7785](https://github.com/helix-editor/helix/pull/7785))

130+- Add `new_moon` ([#7834](https://github.com/helix-editor/helix/pull/7834))

131+- Add `yellowed` ([#7849](https://github.com/helix-editor/helix/pull/7849))

132+- Improve comment readability for `autumn` ([#7939](https://github.com/helix-editor/helix/pull/7939))

133+- Distinguish active bufferline buffer in `monokai` ([#7983](https://github.com/helix-editor/helix/pull/7983))

134+- Update ruler colors in `nord` ([#7995](https://github.com/helix-editor/helix/pull/7995))

135+- Update Catppuccin themes ([#8102](https://github.com/helix-editor/helix/pull/8102))

136+- Add text focus scope and diagnostics undercurls for `nord` ([#8165](https://github.com/helix-editor/helix/pull/8165))

137+- Add material theme collection ([#8211](https://github.com/helix-editor/helix/pull/8211))

138+- Improve indent line color in `dracula` ([#8266](https://github.com/helix-editor/helix/pull/8266))

139+- Clean up and refactor `papercolor` to use inheritance ([#8276](https://github.com/helix-editor/helix/pull/8276))

140+- Fix `zenburn` inlay hint color ([#8278](https://github.com/helix-editor/helix/pull/8278)a)

141+- Fix picker crash when previewing an invalid range ([e9d0bd7](https://github.com/helix-editor/helix/commit/e9d0bd7))

142+- Correctly center items in the picker preview ([13d4463](https://github.com/helix-editor/helix/commit/13d4463))

143+- Add `cyan_light` ([#8293](https://github.com/helix-editor/helix/pull/8293), [#8587](https://github.com/helix-editor/helix/pull/8587))

144+- Theme HTML tags in `onedark` ([#8409](https://github.com/helix-editor/helix/pull/8409))

145+- Refine `darcula` and `darcula-solid` themes ([#8412](https://github.com/helix-editor/helix/pull/8412))

146+- Improve `nord` highlights ([#8414](https://github.com/helix-editor/helix/pull/8414))

147+- Add `nord-night` ([#8549](https://github.com/helix-editor/helix/pull/8549))

148+

149+New languages:

150+

151+- Blueprint ([#7213](https://github.com/helix-editor/helix/pull/7213), [#8161](https://github.com/helix-editor/helix/pull/8161))

152+- Forth ([#7256](https://github.com/helix-editor/helix/pull/7256), [#7334](https://github.com/helix-editor/helix/pull/7334))

153+- t32 ([#7140](https://github.com/helix-editor/helix/pull/7140), [#7811](https://github.com/helix-editor/helix/pull/7811))

154+- WebC ([#7290](https://github.com/helix-editor/helix/pull/7290))

155+- Persistent DSL for Haskell ([#7261](https://github.com/helix-editor/helix/pull/7261))

156+- F# ([#7619](https://github.com/helix-editor/helix/pull/7619), [#8024](https://github.com/helix-editor/helix/pull/8024))

157+- Wren ([#7765](https://github.com/helix-editor/helix/pull/7765), [#7819](https://github.com/helix-editor/helix/pull/7819))

158+- Unison ([#7724](https://github.com/helix-editor/helix/pull/7724))

159+- Todo.txt ([#7835](https://github.com/helix-editor/helix/pull/7835))

160+- Jinja and Handlebars ([#7233](https://github.com/helix-editor/helix/pull/7233))

161+- Pod ([#7907](https://github.com/helix-editor/helix/pull/7907))

162+- Strace ([#7928](https://github.com/helix-editor/helix/pull/7928))

163+- Gemini ([#8070](https://github.com/helix-editor/helix/pull/8070))

164+- GNU Assembler (GAS) ([#8291](https://github.com/helix-editor/helix/pull/8291))

165+- JSON5 ([#8473](https://github.com/helix-editor/helix/pull/8473))

166+- TEMPL ([#8540](https://github.com/helix-editor/helix/pull/8540))

167+

168+Updated languages and queries:

169+

170+- Add one to the ruler numbers for git-commit ([#7072](https://github.com/helix-editor/helix/pull/7072))

171+- Recognize XAML files as XML ([#7083](https://github.com/helix-editor/helix/pull/7083))

172+- Recognize `Cargo.lock` as TOML ([#7095](https://github.com/helix-editor/helix/pull/7095))

173+- Use Rust grammar for Cairo ([c6d1430](https://github.com/helix-editor/helix/commit/c6d1430))

174+- Update tree-sitter-nickel ([#7059](https://github.com/helix-editor/helix/pull/7059), [#7551](https://github.com/helix-editor/helix/pull/7551))

175+- Tune auto-pair characters for Nickel ([#7059](https://github.com/helix-editor/helix/pull/7059))

176+- Recognize `Vagrantfile` as Ruby ([#7112](https://github.com/helix-editor/helix/pull/7112))

177+- Recognize hidden justfiles as Just ([#7088](https://github.com/helix-editor/helix/pull/7088))

178+- Update Java and TypeScript highlight queries ([#7145](https://github.com/helix-editor/helix/pull/7145))

179+- Recognize `.zimrc` as Bash ([#7146](https://github.com/helix-editor/helix/pull/7146))

180+- Recognize `.gir` as XML ([#7152](https://github.com/helix-editor/helix/pull/7152))

181+- Update tree-sitter-scala ([#7147](https://github.com/helix-editor/helix/pull/7147))

182+- Recognize make file-type as Makefile ([#7212](https://github.com/helix-editor/helix/pull/7212))

183+- Update tree-sitter-verilog ([#7262](https://github.com/helix-editor/helix/pull/7262))

184+- Update tree-sitter-cpp ([#7285](https://github.com/helix-editor/helix/pull/7285))

185+- Support core mode for delve debugger ([#7300](https://github.com/helix-editor/helix/pull/7300))

186+- Add Fortran comment injections ([#7305](https://github.com/helix-editor/helix/pull/7305))

187+- Switch Vue language server to `vue-language-server` ([#7312](https://github.com/helix-editor/helix/pull/7312))

188+- Update tree-sitter-sql ([#7387](https://github.com/helix-editor/helix/pull/7387), [#8464](https://github.com/helix-editor/helix/pull/8464))

189+- Replace the MATLAB tre-sitter grammar ([#7388](https://github.com/helix-editor/helix/pull/7388), [#7442](https://github.com/helix-editor/helix/pull/7442), [#7491](https://github.com/helix-editor/helix/pull/7491), [#7493](https://github.com/helix-editor/helix/pull/7493), [#7511](https://github.com/helix-editor/helix/pull/7511), [#7532](https://github.com/helix-editor/helix/pull/7532), [#8040](https://github.com/helix-editor/helix/pull/8040))

190+- Highlight TOML table headers ([#7441](https://github.com/helix-editor/helix/pull/7441))

191+- Recognize `cppm` file-type as C++ ([#7492](https://github.com/helix-editor/helix/pull/7492))

192+- Refactor ecma language queries into private and public queries ([#7207](https://github.com/helix-editor/helix/pull/7207))

193+- Update tree-sitter-dart ([#7576](https://github.com/helix-editor/helix/pull/7576))

194+- Add shebang for nushell files ([#7606](https://github.com/helix-editor/helix/pull/7606))

195+- Recognize systemd files as INI ([#7592](https://github.com/helix-editor/helix/pull/7592))

196+- Update TypeScript, TSX and Svelte grammars ([#6874](https://github.com/helix-editor/helix/pull/6874))

197+- Enable inlay hints in the Svelte language server ([#7622](https://github.com/helix-editor/helix/pull/7622))

198+- Recognize `Brewfile`s as Ruby ([#7629](https://github.com/helix-editor/helix/pull/7629))

199+- Add more file-types for R ([#7633](https://github.com/helix-editor/helix/pull/7633))

200+- Switch tree-sitter-perl to official upstream parser ([#7644](https://github.com/helix-editor/helix/pull/7644), [#7947](https://github.com/helix-editor/helix/pull/7947))

201+- Fix predicate typo in comment highlights ([#7732](https://github.com/helix-editor/helix/pull/7732))

202+- Update tree-sitter-prql ([#7771](https://github.com/helix-editor/helix/pull/7771))

203+- Recognize `.gitf` as JSON ([#7781](https://github.com/helix-editor/helix/pull/7781))

204+- Switch V language server to `v-analyzer` ([#7760](https://github.com/helix-editor/helix/pull/7760))

205+- Add protobuf language servers ([#7796](https://github.com/helix-editor/helix/pull/7796))

206+- Update tree-sitter-zig ([#7803](https://github.com/helix-editor/helix/pull/7803))

207+- Update tree-sitter-hare ([#7784](https://github.com/helix-editor/helix/pull/7784))

208+- Add Java indent queries ([#7844](https://github.com/helix-editor/helix/pull/7844))

209+- Update tree-sitter-scheme ([979933b](https://github.com/helix-editor/helix/commit/979933b))

210+- Recognize `scm` as Scheme instead of TSQ ([5707151](https://github.com/helix-editor/helix/commit/5707151))

211+- Update tree-sitter-git-commit ([#7831](https://github.com/helix-editor/helix/pull/7831))

212+- Update JavaScript, TypeScript and TSX grammars ([#7852](https://github.com/helix-editor/helix/pull/7852))

213+- Update tree-sitter-nu ([#7873](https://github.com/helix-editor/helix/pull/7873))

214+- Fix YAML indentation ([#6768](https://github.com/helix-editor/helix/pull/6768))

215+- Add `csharp-ls`, Pyright, Pylyzer and add roots for Python ([#7897](https://github.com/helix-editor/helix/pull/7897), [#8032](https://github.com/helix-editor/helix/pull/8032))

216+- Update tree-sitter-slint ([#7893](https://github.com/helix-editor/helix/pull/7893))

217+- Recognize more ZSH file-types as Bash ([#7930](https://github.com/helix-editor/helix/pull/7930))

218+- Recognize `star` extension as Starlark ([#7922](https://github.com/helix-editor/helix/pull/7922))

219+- Fix inline HTML tag highlighting in markdown ([#7960](https://github.com/helix-editor/helix/pull/7960))

220+- Update tree-sitter-robot ([#7970](https://github.com/helix-editor/helix/pull/7970))

221+- Highlight Dart 3 `sealed` and `base` keywords ([#7974](https://github.com/helix-editor/helix/pull/7974))

222+- Add configuration for `ltex-ls` to the default `languages.toml` ([#7838](https://github.com/helix-editor/helix/pull/7838))

223+- Update tree-sitter-strace ([#8087](https://github.com/helix-editor/helix/pull/8087))

224+- Update tree-sitter-gleam, enable auto-format ([#8085](https://github.com/helix-editor/helix/pull/8085))

225+- Update tree-sitter-esdl ([#8222](https://github.com/helix-editor/helix/pull/8222))

226+- Expand ignore file-types ([#8220](https://github.com/helix-editor/helix/pull/8220))

227+- Recognize feed related formats as XML ([#8232](https://github.com/helix-editor/helix/pull/8232))

228+- Improve YAML injections ([#8217](https://github.com/helix-editor/helix/pull/8217))

229+- Add shebangs for TypeScript, Julia, Java and OCaml ([95e994a](https://github.com/helix-editor/helix/commit/95e994a))

230+- Highlight abbreviations in Scheme ([ef23847](https://github.com/helix-editor/helix/commit/ef23847))

231+- Remove backtic auto-pair in OCaml ([#8260](https://github.com/helix-editor/helix/pull/8260))

232+- Recognize `flake.lock` as JSON ([#8304](https://github.com/helix-editor/helix/pull/8304))

233+- Add Python test script injection for Nix ([b4494e1](https://github.com/helix-editor/helix/commit/b4494e1))

234+- Fix Nix comment injection precedence ([37e48f4](https://github.com/helix-editor/helix/commit/37e48f4))

235+- Recognize editorconfig files as INI ([#8308](https://github.com/helix-editor/helix/pull/8308))

236+- Recognize `.babelrc` as JSON ([#8309](https://github.com/helix-editor/helix/pull/8309))

237+- Switch Purescript to its own tree-sitter parser ([#8306](https://github.com/helix-editor/helix/pull/8306), [#8338](https://github.com/helix-editor/helix/pull/8338), [#8527](https://github.com/helix-editor/helix/pull/8527))

238+- Update Unison highlights ([#8315](https://github.com/helix-editor/helix/pull/8315))

239+- Recognize `.webmanifest` as JSON ([#8342](https://github.com/helix-editor/helix/pull/8342))

240+- Recognize polkit policy files as XML ([#8369](https://github.com/helix-editor/helix/pull/8369))

241+- Recognize polkit rules files as JavaScript ([#8370](https://github.com/helix-editor/helix/pull/8370))

242+- Update Go highlight queries ([#8399](https://github.com/helix-editor/helix/pull/8399))

243+- Add shebangs for Makefiles ([#8410](https://github.com/helix-editor/helix/pull/8410))

244+- Add file-type associations from VSCode ([#8388](https://github.com/helix-editor/helix/pull/8388))

245+- Add validation to JSON/CSS language server configs ([#8433](https://github.com/helix-editor/helix/pull/8433))

246+- Add a configuration for the tailwind language server ([#8442](https://github.com/helix-editor/helix/pull/8442))

247+- Add a configuration for the ansible language server ([#7973](https://github.com/helix-editor/helix/pull/7973))

248+- Add a configuration for the GraphQL language server ([#8492](https://github.com/helix-editor/helix/pull/8492))

249+- Indent while statements in Bash ([#8528](https://github.com/helix-editor/helix/pull/8528))

250+- Update tree-sitter-haskell and queries ([#8558](https://github.com/helix-editor/helix/pull/8558))

251+

252+Packaging:

253+

254+- Add an overlay to the Nix flake ([#7078](https://github.com/helix-editor/helix/pull/7078))

255+- Check for `git` before fetching or building grammars ([#7320](https://github.com/helix-editor/helix/pull/7320))

256+- Refactor Nix flake to use Crane ([#7763](https://github.com/helix-editor/helix/pull/7763))

257+- Remove the aarch64 appimage from the release CI ([#7832](https://github.com/helix-editor/helix/pull/7832))

258+- Add desktop and icon files to Nix flake output ([#7979](https://github.com/helix-editor/helix/pull/7979))

259+- Build flake packages with the latest stable Rust ([#8133](https://github.com/helix-editor/helix/pull/8133))

260+

261+# 23.05 (2023-05-18)

262+

263+23.05 is a smaller release focusing on fixes. There were 88 contributors in this release. Thank you all!

264+

265+Features:

266+

267+- Add a config option to exclude declaration from LSP references request ([#6886](https://github.com/helix-editor/helix/pull/6886))

268+- Enable injecting languages based on their file extension and shebang ([#3970](https://github.com/helix-editor/helix/pull/3970))

269+- Sort the buffer picker by most recent access ([#2980](https://github.com/helix-editor/helix/pull/2980))

270+- Perform syntax highlighting in the picker asynchronously ([#7028](https://github.com/helix-editor/helix/pull/7028))

271+

272+Commands:

273+

274+- `:update` is now aliased as `:u` ([#6835](https://github.com/helix-editor/helix/pull/6835))

275+- Add `extend_to_first_nonwhitespace` which acts the same as `goto_first_nonwhitespace` but always extends ([#6837](https://github.com/helix-editor/helix/pull/6837))

276+- Add `:clear-register` for clearing the given register or all registers ([#5695](https://github.com/helix-editor/helix/pull/5695))

277+- Add `:write-buffer-close` and `:write-buffer-close!` ([#6947](https://github.com/helix-editor/helix/pull/6947))

278+

279+Fixes:

280+

281+- Normalize LSP workspace paths ([#6517](https://github.com/helix-editor/helix/pull/6517))

282+- Robustly handle invalid LSP ranges ([#6512](https://github.com/helix-editor/helix/pull/6512))

283+- Fix line number display for LSP goto pickers ([#6559](https://github.com/helix-editor/helix/pull/6559))

284+- Fix toggling of `soft-wrap.enable` option ([#6656](https://github.com/helix-editor/helix/pull/6656), [58e457a](https://github.com/helix-editor/helix/commit/58e457a), [#6742](https://github.com/helix-editor/helix/pull/6742))

285+- Handle `workspace/configuration` requests from stopped language servers ([#6693](https://github.com/helix-editor/helix/pull/6693))

286+- Fix possible crash from opening the jumplist picker ([#6672](https://github.com/helix-editor/helix/pull/6672))

287+- Fix theme preview returning to current theme on line and word deletions ([#6694](https://github.com/helix-editor/helix/pull/6694))

288+- Re-run crate build scripts on changes to revision and grammar repositories ([#6743](https://github.com/helix-editor/helix/pull/6743))

289+- Fix crash on opening from suspended state ([#6764](https://github.com/helix-editor/helix/pull/6764))

290+- Fix unwrap bug in DAP ([#6786](https://github.com/helix-editor/helix/pull/6786))

291+- Always build tree-sitter parsers with C++14 and C11 ([#6792](https://github.com/helix-editor/helix/pull/6792), [#6834](https://github.com/helix-editor/helix/pull/6834), [#6845](https://github.com/helix-editor/helix/pull/6845))

292+- Exit with a non-zero statuscode when tree-sitter parser builds fail ([#6795](https://github.com/helix-editor/helix/pull/6795))

293+- Flip symbol range in LSP goto commands ([#6794](https://github.com/helix-editor/helix/pull/6794))

294+- Fix runtime toggling of the `mouse` option ([#6675](https://github.com/helix-editor/helix/pull/6675))

295+- Fix panic in inlay hint computation when view anchor is out of bounds ([#6883](https://github.com/helix-editor/helix/pull/6883))

296+- Significantly improve performance of git discovery on slow file systems ([#6890](https://github.com/helix-editor/helix/pull/6890))

297+- Downgrade gix log level to info ([#6915](https://github.com/helix-editor/helix/pull/6915))

298+- Conserve BOM and properly support saving UTF16 files ([#6497](https://github.com/helix-editor/helix/pull/6497))

299+- Correctly handle completion re-request ([#6594](https://github.com/helix-editor/helix/pull/6594))

300+- Fix offset encoding in LSP `didChange` notifications ([#6921](https://github.com/helix-editor/helix/pull/6921))

301+- Change `gix` logging level to info ([#6915](https://github.com/helix-editor/helix/pull/6915))

302+- Improve error message when writes fail because parent directories do not exist ([#7014](https://github.com/helix-editor/helix/pull/7014))

303+- Replace DAP variables popup instead of pushing more popups ([#7034](https://github.com/helix-editor/helix/pull/7034))

304+- Disable tree-sitter for files after parsing for 500ms ([#7028](https://github.com/helix-editor/helix/pull/7028))

305+- Fix crash when deleting with multiple cursors ([#6024](https://github.com/helix-editor/helix/pull/6024))

306+- Fix selection sliding when deleting forwards in append mode ([#6024](https://github.com/helix-editor/helix/pull/6024))

307+- Fix completion on paths containing spaces ([#6779](https://github.com/helix-editor/helix/pull/6779))

308+

309+Themes:

310+

311+- Style inlay hints in `dracula` theme ([#6515](https://github.com/helix-editor/helix/pull/6515))

312+- Style inlay hints in `onedark` theme ([#6503](https://github.com/helix-editor/helix/pull/6503))

313+- Style inlay hints and the soft-wrap indicator in `varua` ([#6568](https://github.com/helix-editor/helix/pull/6568), [#6589](https://github.com/helix-editor/helix/pull/6589))

314+- Style inlay hints in `emacs` theme ([#6569](https://github.com/helix-editor/helix/pull/6569))

315+- Update `base16_transparent` and `dark_high_contrast` themes ([#6577](https://github.com/helix-editor/helix/pull/6577))

316+- Style inlay hints for `mellow` and `rasmus` themes ([#6583](https://github.com/helix-editor/helix/pull/6583))

317+- Dim pane divider for `base16_transparent` theme ([#6534](https://github.com/helix-editor/helix/pull/6534))

318+- Style inlay hints in `zenburn` theme ([#6593](https://github.com/helix-editor/helix/pull/6593))

319+- Style inlay hints in `boo_berry` theme ([#6625](https://github.com/helix-editor/helix/pull/6625))

320+- Add `ferra` theme ([#6619](https://github.com/helix-editor/helix/pull/6619), [#6776](https://github.com/helix-editor/helix/pull/6776))

321+- Style inlay hints in `nightfox` theme ([#6655](https://github.com/helix-editor/helix/pull/6655))

322+- Fix `ayu` theme family markup code block background ([#6538](https://github.com/helix-editor/helix/pull/6538))

323+- Improve whitespace and search match colors in `rose_pine` theme ([#6679](https://github.com/helix-editor/helix/pull/6679))

324+- Highlight selected items in `base16_transparent` theme ([#6716](https://github.com/helix-editor/helix/pull/6716))

325+- Adjust everforest to resemble original more closely ([#5866](https://github.com/helix-editor/helix/pull/5866))

326+- Refactor `dracula` theme ([#6552](https://github.com/helix-editor/helix/pull/6552), [#6767](https://github.com/helix-editor/helix/pull/6767), [#6855](https://github.com/helix-editor/helix/pull/6855), [#6987](https://github.com/helix-editor/helix/pull/6987))

327+- Style inlay hints in `darcula` theme ([#6732](https://github.com/helix-editor/helix/pull/6732))

328+- Style inlay hints in `kanagawa` theme ([#6773](https://github.com/helix-editor/helix/pull/6773))

329+- Improve `ayu_dark` theme ([#6622](https://github.com/helix-editor/helix/pull/6622))

330+- Refactor `noctis` theme multiple cursor highlighting ([96720e7](https://github.com/helix-editor/helix/commit/96720e7))

331+- Refactor `noctis` theme whitespace rendering and indent guides ([f2ccc03](https://github.com/helix-editor/helix/commit/f2ccc03))

332+- Add `amberwood` theme ([#6924](https://github.com/helix-editor/helix/pull/6924))

333+- Update `nightfox` theme ([#7061](https://github.com/helix-editor/helix/pull/7061))

334+

335+Language support:

336+

337+- R language server: use the `--no-echo` flag to silence output ([#6570](https://github.com/helix-editor/helix/pull/6570))

338+- Recognize CUDA files as C++ ([#6521](https://github.com/helix-editor/helix/pull/6521))

339+- Add support for Hurl ([#6450](https://github.com/helix-editor/helix/pull/6450))

340+- Add textobject queries for Julia ([#6588](https://github.com/helix-editor/helix/pull/6588))

341+- Update Ruby highlight queries ([#6587](https://github.com/helix-editor/helix/pull/6587))

342+- Add xsd to XML file-types ([#6631](https://github.com/helix-editor/helix/pull/6631))

343+- Support Robot Framework ([#6611](https://github.com/helix-editor/helix/pull/6611))

344+- Update Gleam tree-sitter parser ([#6641](https://github.com/helix-editor/helix/pull/6641))

345+- Update git-commit tree-sitter parser ([#6692](https://github.com/helix-editor/helix/pull/6692))

346+- Update Haskell tree-sitter parser ([#6317](https://github.com/helix-editor/helix/pull/6317))

347+- Add injection queries for Haskell quasiquotes ([#6474](https://github.com/helix-editor/helix/pull/6474))

348+- Highlight C/C++ escape sequences ([#6724](https://github.com/helix-editor/helix/pull/6724))

349+- Support Markdoc ([#6432](https://github.com/helix-editor/helix/pull/6432))

350+- Support OpenCL ([#6473](https://github.com/helix-editor/helix/pull/6473))

351+- Support DTD ([#6644](https://github.com/helix-editor/helix/pull/6644))

352+- Fix constant highlighting in Python queries ([#6751](https://github.com/helix-editor/helix/pull/6751))

353+- Support Just ([#6453](https://github.com/helix-editor/helix/pull/6453))

354+- Fix Go locals query for `var_spec` identifiers ([#6763](https://github.com/helix-editor/helix/pull/6763))

355+- Update Markdown tree-sitter parser ([#6785](https://github.com/helix-editor/helix/pull/6785))

356+- Fix Haskell workspace root for cabal projects ([#6828](https://github.com/helix-editor/helix/pull/6828))

357+- Avoid extra indentation in Go switches ([#6817](https://github.com/helix-editor/helix/pull/6817))

358+- Fix Go workspace roots ([#6884](https://github.com/helix-editor/helix/pull/6884))

359+- Set PerlNavigator as the default Perl language server ([#6860](https://github.com/helix-editor/helix/pull/6860))

360+- Highlight more sqlx macros in Rust ([#6793](https://github.com/helix-editor/helix/pull/6793))

361+- Switch Odin tree-sitter grammar ([#6766](https://github.com/helix-editor/helix/pull/6766))

362+- Recognize `poetry.lock` as TOML ([#6928](https://github.com/helix-editor/helix/pull/6928))

363+- Recognize Jupyter notebooks as JSON ([#6927](https://github.com/helix-editor/helix/pull/6927))

364+- Add language server configuration for Crystal ([#6948](https://github.com/helix-editor/helix/pull/6948))

365+- Add `build.gradle.kts` to Java and Scala roots ([#6970](https://github.com/helix-editor/helix/pull/6970))

366+- Recognize `sty` and `cls` files as latex ([#6986](https://github.com/helix-editor/helix/pull/6986))

367+- Update Dockerfile tree-sitter grammar ([#6895](https://github.com/helix-editor/helix/pull/6895))

368+- Add comment injections for Odin ([#7027](https://github.com/helix-editor/helix/pull/7027))

369+- Recognize `gml` as XML ([#7055](https://github.com/helix-editor/helix/pull/7055))

370+- Recognize `geojson` as JSON ([#7054](https://github.com/helix-editor/helix/pull/7054))

371+

372+Packaging:

373+

374+- Update the Nix flake dependencies, remove a deprecated option ([#6546](https://github.com/helix-editor/helix/pull/6546))

375+- Fix and re-enable aarch64-macos release binary builds ([#6504](https://github.com/helix-editor/helix/pull/6504))

376+- The git dependency on `tree-sitter` has been replaced with a regular crates.io dependency ([#6608](https://github.com/helix-editor/helix/pull/6608))

377+

378+# 23.03 (2023-03-31)

379+

380+23.03 brings some long-awaited and exciting features. Thank you to everyone involved! This release saw changes from 102 contributors.

381+

382+For the full log, check out the [git log](https://github.com/helix-editor/helix/compare/22.12..23.03).

383+Also check out the [release notes](https://helix-editor.com/news/release-23-03-highlights/) for more commentary on larger features.

384+

385+Breaking changes:

386+

387+- Select diagnostic range in `goto_*_diag` commands ([#4713](https://github.com/helix-editor/helix/pull/4713), [#5164](https://github.com/helix-editor/helix/pull/5164), [#6193](https://github.com/helix-editor/helix/pull/6193))

388+- Remove jump behavior from `increment`/`decrement` ([#4123](https://github.com/helix-editor/helix/pull/4123), [#5929](https://github.com/helix-editor/helix/pull/5929))

389+- Select change range in `goto_*_change` commands ([#5206](https://github.com/helix-editor/helix/pull/5206))

390+- Split file modification indicator from filename statusline elements ([#4731](https://github.com/helix-editor/helix/pull/4731), [#6036](https://github.com/helix-editor/helix/pull/6036))

391+- Jump to symbol ranges in LSP goto commands ([#5986](https://github.com/helix-editor/helix/pull/5986))

392+- Workspace detection now stops at the first `.helix/` directory (merging multiple `.helix/languages.toml` configurations is no longer supported) ([#5748](https://github.com/helix-editor/helix/pull/5748))

393+

394+Features:

395+

396+- Dynamic workspace symbol picker ([#5055](https://github.com/helix-editor/helix/pull/5055))

397+- Soft-wrap ([#5420](https://github.com/helix-editor/helix/pull/5420), [#5786](https://github.com/helix-editor/helix/pull/5786), [#5893](https://github.com/helix-editor/helix/pull/5893), [#6142](https://github.com/helix-editor/helix/pull/6142), [#6440](https://github.com/helix-editor/helix/pull/6440))

398+- Initial support for LSP snippet completions ([#5864](https://github.com/helix-editor/helix/pull/5864), [b1f7528](https://github.com/helix-editor/helix/commit/b1f7528), [#6263](https://github.com/helix-editor/helix/pull/6263), [bbf4800](https://github.com/helix-editor/helix/commit/bbf4800), [90348b8](https://github.com/helix-editor/helix/commit/90348b8), [f87299f](https://github.com/helix-editor/helix/commit/f87299f), [#6371](https://github.com/helix-editor/helix/pull/6371), [9fe3adc](https://github.com/helix-editor/helix/commit/9fe3adc))

399+- Add a statusline element for showing the current version control HEAD ([#5682](https://github.com/helix-editor/helix/pull/5682))

400+- Display LSP type hints ([#5420](https://github.com/helix-editor/helix/pull/5420), [#5934](https://github.com/helix-editor/helix/pull/5934), [#6312](https://github.com/helix-editor/helix/pull/6312))

401+- Enable the Kitty keyboard protocol on terminals with support ([#4939](https://github.com/helix-editor/helix/pull/4939), [#6170](https://github.com/helix-editor/helix/pull/6170), [#6194](https://github.com/helix-editor/helix/pull/6194), [#6438](https://github.com/helix-editor/helix/pull/6438))

402+- Add a statusline element for the basename of the current file ([#5318](https://github.com/helix-editor/helix/pull/5318))

403+- Add substring matching syntax for the picker ([#5658](https://github.com/helix-editor/helix/pull/5658))

404+- Support LSP `textDocument/prepareRename` ([#6103](https://github.com/helix-editor/helix/pull/6103))

405+- Allow multiple runtime directories with priorities ([#5411](https://github.com/helix-editor/helix/pull/5411))

406+- Allow configuring whether to insert or replace completions ([#5728](https://github.com/helix-editor/helix/pull/5728))

407+- Allow per-workspace config file `.helix/config.toml` ([#5748](https://github.com/helix-editor/helix/pull/5748))

408+- Add `workspace-lsp-roots` config option to support multiple LSP roots for use with monorepos ([#5748](https://github.com/helix-editor/helix/pull/5748))

409+

410+Commands:

411+

412+- `:pipe-to` which pipes selections into a shell command and ignores output ([#4931](https://github.com/helix-editor/helix/pull/4931))

413+- `merge_consecutive_selections` (`A-_`) combines all consecutive selections ([#5047](https://github.com/helix-editor/helix/pull/5047))

414+- `rotate_view_reverse` which focuses the previous view ([#5356](https://github.com/helix-editor/helix/pull/5356))

415+- `goto_declaration` (`gD`, requires LSP) which jumps to a symbol's declaration ([#5646](https://github.com/helix-editor/helix/pull/5646))

416+- `file_picker_in_current_buffer_directory` ([#4666](https://github.com/helix-editor/helix/pull/4666))

417+- `:character-info` which shows information about the character under the cursor ([#4000](https://github.com/helix-editor/helix/pull/4000))

418+- `:toggle-option` for toggling config options at runtime ([#4085](https://github.com/helix-editor/helix/pull/4085))

419+- `dap_restart` for restarting a debug session in DAP ([#5651](https://github.com/helix-editor/helix/pull/5651))

420+- `:lsp-stop` to stop the language server of the current buffer ([#5964](https://github.com/helix-editor/helix/pull/5964))

421+- `:reset-diff-change` for resetting a diff hunk to its original text ([#4974](https://github.com/helix-editor/helix/pull/4974))

422+- `:config-open-workspace` for opening the config file local to the current workspace ([#5748](https://github.com/helix-editor/helix/pull/5748))

423+

424+Usability improvements:

425+

426+- Remove empty detail section in completion menu when LSP doesn't send details ([#4902](https://github.com/helix-editor/helix/pull/4902))

427+- Pass client information on LSP initialization ([#4904](https://github.com/helix-editor/helix/pull/4904))

428+- Allow specifying environment variables for language servers in language config ([#4004](https://github.com/helix-editor/helix/pull/4004))

429+- Allow detached git worktrees to be recognized as root paths ([#5097](https://github.com/helix-editor/helix/pull/5097))

430+- Improve error message handling for theme loading failures ([#5073](https://github.com/helix-editor/helix/pull/5073))

431+- Print the names of binaries required for LSP/DAP in health-check ([#5195](https://github.com/helix-editor/helix/pull/5195))

432+- Improve sorting in the picker in cases of ties ([#5169](https://github.com/helix-editor/helix/pull/5169))

433+- Add theming for prompt suggestions ([#5104](https://github.com/helix-editor/helix/pull/5104))

434+- Open a file picker when using `:open` on directories ([#2707](https://github.com/helix-editor/helix/pull/2707), [#5278](https://github.com/helix-editor/helix/pull/5278))

435+- Reload language config with `:config-reload` ([#5239](https://github.com/helix-editor/helix/pull/5239), [#5381](https://github.com/helix-editor/helix/pull/5381), [#5431](https://github.com/helix-editor/helix/pull/5431))

436+- Improve indent queries for python when the tree is errored ([#5332](https://github.com/helix-editor/helix/pull/5332))

437+- Picker: Open files without closing the picker with `A-ret` ([#4435](https://github.com/helix-editor/helix/pull/4435))

438+- Allow theming cursors by primary/secondary and by mode ([#5130](https://github.com/helix-editor/helix/pull/5130))

439+- Allow configuration of the minimum width for the line-numbers gutter ([#4724](https://github.com/helix-editor/helix/pull/4724), [#5696](https://github.com/helix-editor/helix/pull/5696))

440+- Use filename completer for `:run-shell-command` command ([#5729](https://github.com/helix-editor/helix/pull/5729))

441+- Surround with line-endings with `ms<ret>` ([#4571](https://github.com/helix-editor/helix/pull/4571))

442+- Hide duplicate symlinks in file pickers ([#5658](https://github.com/helix-editor/helix/pull/5658))

443+- Tabulate buffer picker contents ([#5777](https://github.com/helix-editor/helix/pull/5777))

444+- Add an option to disable LSP ([#4425](https://github.com/helix-editor/helix/pull/4425))

445+- Short-circuit tree-sitter and word object motions ([#5851](https://github.com/helix-editor/helix/pull/5851))

446+- Add exit code to failed command message ([#5898](https://github.com/helix-editor/helix/pull/5898))

447+- Make `m` textobject look for pairs enclosing selections ([#3344](https://github.com/helix-editor/helix/pull/3344))

448+- Negotiate LSP position encoding ([#5894](https://github.com/helix-editor/helix/pull/5894), [a48d1a4](https://github.com/helix-editor/helix/commit/a48d1a4))

449+- Display deprecated LSP completions with strikethrough ([#5932](https://github.com/helix-editor/helix/pull/5932))

450+- Add JSONRPC request ID to failed LSP/DAP request log messages ([#6010](https://github.com/helix-editor/helix/pull/6010), [#6018](https://github.com/helix-editor/helix/pull/6018))

451+- Ignore case when filtering LSP completions ([#6008](https://github.com/helix-editor/helix/pull/6008))

452+- Show current language when no arguments are passed to `:set-language` ([#5895](https://github.com/helix-editor/helix/pull/5895))

453+- Refactor and rewrite all book documentation ([#5534](https://github.com/helix-editor/helix/pull/5534))

454+- Separate diagnostic picker message and code ([#6095](https://github.com/helix-editor/helix/pull/6095))

455+- Add a config option to bypass undercurl detection ([#6253](https://github.com/helix-editor/helix/pull/6253))

456+- Only complete appropriate arguments for typed commands ([#5966](https://github.com/helix-editor/helix/pull/5966))

457+- Discard outdated LSP diagnostics ([3c9d5d0](https://github.com/helix-editor/helix/commit/3c9d5d0))

458+- Discard outdated LSP workspace edits ([b6a4927](https://github.com/helix-editor/helix/commit/b6a4927))

459+- Run shell commands asynchronously ([#6373](https://github.com/helix-editor/helix/pull/6373))

460+- Show diagnostic codes in LSP diagnostic messages ([#6378](https://github.com/helix-editor/helix/pull/6378))

461+- Highlight the current line in a DAP debug session ([#5957](https://github.com/helix-editor/helix/pull/5957))

462+- Hide signature help if it overlaps with the completion menu ([#5523](https://github.com/helix-editor/helix/pull/5523), [7a69c40](https://github.com/helix-editor/helix/commit/7a69c40))

463+

464+Fixes:

465+

466+- Fix behavior of `auto-completion` flag for completion-on-trigger ([#5042](https://github.com/helix-editor/helix/pull/5042))

467+- Reset editor mode when changing buffers ([#5072](https://github.com/helix-editor/helix/pull/5072))

468+- Respect scrolloff settings in mouse movements ([#5255](https://github.com/helix-editor/helix/pull/5255))

469+- Avoid trailing `s` when only one file is opened ([#5189](https://github.com/helix-editor/helix/pull/5189))

470+- Fix erroneous indent between closers of auto-pairs ([#5330](https://github.com/helix-editor/helix/pull/5330))

471+- Expand `~` when parsing file paths in `:open` ([#5329](https://github.com/helix-editor/helix/pull/5329))

472+- Fix theme inheritance for default themes ([#5218](https://github.com/helix-editor/helix/pull/5218))

473+- Fix `extend_line` with a count when the current line(s) are selected ([#5288](https://github.com/helix-editor/helix/pull/5288))

474+- Prompt: Fix autocompletion for paths containing periods ([#5175](https://github.com/helix-editor/helix/pull/5175))

475+- Skip serializing JSONRPC params if params is null ([#5471](https://github.com/helix-editor/helix/pull/5471))

476+- Fix interaction with the `xclip` clipboard provider ([#5426](https://github.com/helix-editor/helix/pull/5426))

477+- Fix undo/redo execution from the command palette ([#5294](https://github.com/helix-editor/helix/pull/5294))

478+- Fix highlighting of non-block cursors ([#5575](https://github.com/helix-editor/helix/pull/5575))

479+- Fix panic when nooping in `join_selections` and `join_selections_space` ([#5423](https://github.com/helix-editor/helix/pull/5423))

480+- Fix selecting a changed file in global search ([#5639](https://github.com/helix-editor/helix/pull/5639))

481+- Fix initial syntax highlight layer sort order ([#5196](https://github.com/helix-editor/helix/pull/5196))

482+- Fix UTF-8 length handling for shellwords ([#5738](https://github.com/helix-editor/helix/pull/5738))

483+- Remove C-j and C-k bindings from the completion menu ([#5070](https://github.com/helix-editor/helix/pull/5070))

484+- Always commit to history when pasting ([#5790](https://github.com/helix-editor/helix/pull/5790))

485+- Properly handle LSP position encoding ([#5711](https://github.com/helix-editor/helix/pull/5711))

486+- Fix infinite loop in `copy_selection_on_prev_line` ([#5888](https://github.com/helix-editor/helix/pull/5888))

487+- Fix completion popup positioning ([#5842](https://github.com/helix-editor/helix/pull/5842))

488+- Fix a panic when uncommenting a line with only a comment token ([#5933](https://github.com/helix-editor/helix/pull/5933))

489+- Fix panic in `goto_window_center` at EOF ([#5987](https://github.com/helix-editor/helix/pull/5987))

490+- Ignore invalid file URIs sent by a language server ([#6000](https://github.com/helix-editor/helix/pull/6000))

491+- Decode LSP URIs for the workspace diagnostics picker ([#6016](https://github.com/helix-editor/helix/pull/6016))

492+- Fix incorrect usages of `tab_width` with `indent_width` ([#5918](https://github.com/helix-editor/helix/pull/5918))

493+- DAP: Send Disconnect if the Terminated event is received ([#5532](https://github.com/helix-editor/helix/pull/5532))

494+- DAP: Validate key and index exist when requesting variables ([#5628](https://github.com/helix-editor/helix/pull/5628))

495+- Check LSP renaming support before prompting for rename text ([#6257](https://github.com/helix-editor/helix/pull/6257))

496+- Fix indent guide rendering ([#6136](https://github.com/helix-editor/helix/pull/6136))

497+- Fix division by zero panic ([#6155](https://github.com/helix-editor/helix/pull/6155))

498+- Fix lacking space panic ([#6109](https://github.com/helix-editor/helix/pull/6109))

499+- Send error replies for malformed and unhandled LSP requests ([#6058](https://github.com/helix-editor/helix/pull/6058))

500+- Fix table column calculations for dynamic pickers ([#5920](https://github.com/helix-editor/helix/pull/5920))

501+- Skip adding jumplist entries for `:<n>` line number previews ([#5751](https://github.com/helix-editor/helix/pull/5751))

502+- Fix completion race conditions ([#6173](https://github.com/helix-editor/helix/pull/6173))

503+- Fix `shrink_selection` with multiple cursors ([#6093](https://github.com/helix-editor/helix/pull/6093))

504+- Fix indentation calculation for lines with mixed tabs/spaces ([#6278](https://github.com/helix-editor/helix/pull/6278))

505+- No-op `client/registerCapability` LSP requests ([#6258](https://github.com/helix-editor/helix/pull/6258))

506+- Send the STOP signal to all processes in the process group ([#3546](https://github.com/helix-editor/helix/pull/3546))

507+- Fix workspace edit client capabilities declaration ([7bf168d](https://github.com/helix-editor/helix/commit/7bf168d))

508+- Fix highlighting in picker results with multiple columns ([#6333](https://github.com/helix-editor/helix/pull/6333))

509+- Canonicalize paths before stripping the current dir as a prefix ([#6290](https://github.com/helix-editor/helix/pull/6290))

510+- Fix truncation behavior for long path names in the file picker ([#6410](https://github.com/helix-editor/helix/pull/6410), [67783dd](https://github.com/helix-editor/helix/commit/67783dd))

511+- Fix theme reloading behavior in `:config-reload` ([ab819d8](https://github.com/helix-editor/helix/commit/ab819d8))

512+

513+Themes:

514+

515+- Update `serika` ([#5038](https://github.com/helix-editor/helix/pull/5038), [#6344](https://github.com/helix-editor/helix/pull/6344))

516+- Update `flatwhite` ([#5036](https://github.com/helix-editor/helix/pull/5036), [#6323](https://github.com/helix-editor/helix/pull/6323))

517+- Update `autumn` ([#5051](https://github.com/helix-editor/helix/pull/5051), [#5397](https://github.com/helix-editor/helix/pull/5397), [#6280](https://github.com/helix-editor/helix/pull/6280), [#6316](https://github.com/helix-editor/helix/pull/6316))

518+- Update `acme` ([#5019](https://github.com/helix-editor/helix/pull/5019), [#5486](https://github.com/helix-editor/helix/pull/5486), [#5488](https://github.com/helix-editor/helix/pull/5488))

519+- Update `gruvbox` themes ([#5066](https://github.com/helix-editor/helix/pull/5066), [#5333](https://github.com/helix-editor/helix/pull/5333), [#5540](https://github.com/helix-editor/helix/pull/5540), [#6285](https://github.com/helix-editor/helix/pull/6285), [#6295](https://github.com/helix-editor/helix/pull/6295))

520+- Update `base16_transparent` ([#5105](https://github.com/helix-editor/helix/pull/5105))

521+- Update `dark_high_contrast` ([#5105](https://github.com/helix-editor/helix/pull/5105))

522+- Update `dracula` ([#5236](https://github.com/helix-editor/helix/pull/5236), [#5627](https://github.com/helix-editor/helix/pull/5627), [#6414](https://github.com/helix-editor/helix/pull/6414))

523+- Update `monokai_pro_spectrum` ([#5250](https://github.com/helix-editor/helix/pull/5250), [#5602](https://github.com/helix-editor/helix/pull/5602))

524+- Update `rose_pine` ([#5267](https://github.com/helix-editor/helix/pull/5267), [#5489](https://github.com/helix-editor/helix/pull/5489), [#6384](https://github.com/helix-editor/helix/pull/6384))

525+- Update `kanagawa` ([#5273](https://github.com/helix-editor/helix/pull/5273), [#5571](https://github.com/helix-editor/helix/pull/5571), [#6085](https://github.com/helix-editor/helix/pull/6085))

526+- Update `emacs` ([#5334](https://github.com/helix-editor/helix/pull/5334))

527+- Add `github` themes ([#5353](https://github.com/helix-editor/helix/pull/5353), [efeec12](https://github.com/helix-editor/helix/commit/efeec12))

528+ - Dark themes: `github_dark`, `github_dark_colorblind`, `github_dark_dimmed`, `github_dark_high_contrast`, `github_dark_tritanopia`

529+ - Light themes: `github_light`, `github_light_colorblind`, `github_light_dimmed`, `github_light_high_contrast`, `github_light_tritanopia`

530+- Update `solarized` variants ([#5445](https://github.com/helix-editor/helix/pull/5445), [#6327](https://github.com/helix-editor/helix/pull/6327))

531+- Update `catppuccin` variants ([#5404](https://github.com/helix-editor/helix/pull/5404), [#6107](https://github.com/helix-editor/helix/pull/6107), [#6269](https://github.com/helix-editor/helix/pull/6269), [#6464](https://github.com/helix-editor/helix/pull/6464))

532+- Use curly underlines in built-in themes ([#5419](https://github.com/helix-editor/helix/pull/5419))

533+- Update `zenburn` ([#5573](https://github.com/helix-editor/helix/pull/5573))

534+- Rewrite `snazzy` ([#3971](https://github.com/helix-editor/helix/pull/3971))

535+- Add `monokai_aqua` ([#5578](https://github.com/helix-editor/helix/pull/5578))

536+- Add `markup.strikethrough` to existing themes ([#5619](https://github.com/helix-editor/helix/pull/5619))

537+- Update `sonokai` ([#5440](https://github.com/helix-editor/helix/pull/5440))

538+- Update `onedark` ([#5755](https://github.com/helix-editor/helix/pull/5755))

539+- Add `ayu_evolve` ([#5638](https://github.com/helix-editor/helix/pull/5638), [#6028](https://github.com/helix-editor/helix/pull/6028), [#6225](https://github.com/helix-editor/helix/pull/6225))

540+- Add `jellybeans` ([#5719](https://github.com/helix-editor/helix/pull/5719))

541+- Update `fleet_dark` ([#5605](https://github.com/helix-editor/helix/pull/5605), [#6266](https://github.com/helix-editor/helix/pull/6266), [#6324](https://github.com/helix-editor/helix/pull/6324), [#6375](https://github.com/helix-editor/helix/pull/6375))

542+- Add `darcula-solid` ([#5778](https://github.com/helix-editor/helix/pull/5778))

543+- Remove text background from monokai themes ([#6009](https://github.com/helix-editor/helix/pull/6009))

544+- Update `pop_dark` ([#5992](https://github.com/helix-editor/helix/pull/5992), [#6208](https://github.com/helix-editor/helix/pull/6208), [#6227](https://github.com/helix-editor/helix/pull/6227), [#6292](https://github.com/helix-editor/helix/pull/6292))

545+- Add `everblush` ([#6086](https://github.com/helix-editor/helix/pull/6086))

546+- Add `adwaita-dark` ([#6042](https://github.com/helix-editor/helix/pull/6042), [#6342](https://github.com/helix-editor/helix/pull/6342))

547+- Update `papercolor` ([#6162](https://github.com/helix-editor/helix/pull/6162))

548+- Update `onelight` ([#6192](https://github.com/helix-editor/helix/pull/6192), [#6276](https://github.com/helix-editor/helix/pull/6276))

549+- Add `molokai` ([#6260](https://github.com/helix-editor/helix/pull/6260))

550+- Update `ayu` variants ([#6329](https://github.com/helix-editor/helix/pull/6329))

551+- Update `tokyonight` variants ([#6349](https://github.com/helix-editor/helix/pull/6349))

552+- Update `nord` variants ([#6376](https://github.com/helix-editor/helix/pull/6376))

553+

554+New languages:

555+

556+- BibTeX ([#5064](https://github.com/helix-editor/helix/pull/5064))

557+- Mermaid.js ([#5147](https://github.com/helix-editor/helix/pull/5147))

558+- Crystal ([#4993](https://github.com/helix-editor/helix/pull/4993), [#5205](https://github.com/helix-editor/helix/pull/5205))

559+- MATLAB/Octave ([#5192](https://github.com/helix-editor/helix/pull/5192))

560+- `tfvars` (uses HCL) ([#5396](https://github.com/helix-editor/helix/pull/5396))

561+- Ponylang ([#5416](https://github.com/helix-editor/helix/pull/5416))

562+- DHall ([1f6809c](https://github.com/helix-editor/helix/commit/1f6809c))

563+- Sagemath ([#5649](https://github.com/helix-editor/helix/pull/5649))

564+- MSBuild ([#5793](https://github.com/helix-editor/helix/pull/5793))

565+- pem ([#5797](https://github.com/helix-editor/helix/pull/5797))

566+- passwd ([#4959](https://github.com/helix-editor/helix/pull/4959))

567+- hosts ([#4950](https://github.com/helix-editor/helix/pull/4950), [#5914](https://github.com/helix-editor/helix/pull/5914))

568+- uxntal ([#6047](https://github.com/helix-editor/helix/pull/6047))

569+- Yuck ([#6064](https://github.com/helix-editor/helix/pull/6064), [#6242](https://github.com/helix-editor/helix/pull/6242))

570+- GNU gettext PO ([#5996](https://github.com/helix-editor/helix/pull/5996))

571+- Sway ([#6023](https://github.com/helix-editor/helix/pull/6023))

572+- NASM ([#6068](https://github.com/helix-editor/helix/pull/6068))

573+- PRQL ([#6126](https://github.com/helix-editor/helix/pull/6126))

574+- reStructuredText ([#6180](https://github.com/helix-editor/helix/pull/6180))

575+- Smithy ([#6370](https://github.com/helix-editor/helix/pull/6370))

576+- VHDL ([#5826](https://github.com/helix-editor/helix/pull/5826))

577+- Rego (OpenPolicy Agent) ([#6415](https://github.com/helix-editor/helix/pull/6415))

578+- Nim ([#6123](https://github.com/helix-editor/helix/pull/6123))

579+

580+Updated languages and queries:

581+

582+- Use diff syntax for patch files ([#5085](https://github.com/helix-editor/helix/pull/5085))

583+- Add Haskell textobjects ([#5061](https://github.com/helix-editor/helix/pull/5061))

584+- Fix commonlisp configuration ([#5091](https://github.com/helix-editor/helix/pull/5091))

585+- Update Scheme ([bae890d](https://github.com/helix-editor/helix/commit/bae890d))

586+- Add indent queries for Bash ([#5149](https://github.com/helix-editor/helix/pull/5149))

587+- Recognize `c++` as a C++ extension ([#5183](https://github.com/helix-editor/helix/pull/5183))

588+- Enable HTTP server in `metals` (Scala) config ([#5551](https://github.com/helix-editor/helix/pull/5551))

589+- Change V-lang language server to `v ls` from `vls` ([#5677](https://github.com/helix-editor/helix/pull/5677))

590+- Inject comment grammar into Nix ([#5208](https://github.com/helix-editor/helix/pull/5208))

591+- Update Rust highlights ([#5238](https://github.com/helix-editor/helix/pull/5238), [#5349](https://github.com/helix-editor/helix/pull/5349))

592+- Fix HTML injection within Markdown ([#5265](https://github.com/helix-editor/helix/pull/5265))

593+- Fix comment token for godot ([#5276](https://github.com/helix-editor/helix/pull/5276))

594+- Expand injections for Vue ([#5268](https://github.com/helix-editor/helix/pull/5268))

595+- Add `.bash_aliases` as a Bash file-type ([#5347](https://github.com/helix-editor/helix/pull/5347))

596+- Fix comment token for sshclientconfig ([#5351](https://github.com/helix-editor/helix/pull/5351))

597+- Update Prisma ([#5417](https://github.com/helix-editor/helix/pull/5417))

598+- Update C++ ([#5457](https://github.com/helix-editor/helix/pull/5457))

599+- Add more file-types for Python ([#5593](https://github.com/helix-editor/helix/pull/5593))

600+- Update tree-sitter-scala ([#5576](https://github.com/helix-editor/helix/pull/5576))

601+- Add an injection regex for Lua ([#5606](https://github.com/helix-editor/helix/pull/5606))

602+- Add `build.gradle` to java roots configuration ([#5641](https://github.com/helix-editor/helix/pull/5641))

603+- Add Hub PR files to markdown file-types ([#5634](https://github.com/helix-editor/helix/pull/5634))

604+- Add an external formatter configuration for Cue ([#5679](https://github.com/helix-editor/helix/pull/5679))

605+- Add injections for builders and writers to Nix ([#5629](https://github.com/helix-editor/helix/pull/5629))

606+- Update tree-sitter-xml to fix whitespace parsing ([#5685](https://github.com/helix-editor/helix/pull/5685))

607+- Add `Justfile` to the make file-types configuration ([#5687](https://github.com/helix-editor/helix/pull/5687))

608+- Update tree-sitter-sql and highlight queries ([#5683](https://github.com/helix-editor/helix/pull/5683), [#5772](https://github.com/helix-editor/helix/pull/5772))

609+- Use the bash grammar and queries for env language ([#5720](https://github.com/helix-editor/helix/pull/5720))

610+- Add podspec files to ruby file-types ([#5811](https://github.com/helix-editor/helix/pull/5811))

611+- Recognize `.C` and `.H` file-types as C++ ([#5808](https://github.com/helix-editor/helix/pull/5808))

612+- Recognize plist and mobileconfig files as XML ([#5863](https://github.com/helix-editor/helix/pull/5863))

613+- Fix `select` indentation in Go ([#5713](https://github.com/helix-editor/helix/pull/5713))

614+- Check for external file modifications when writing ([#5805](https://github.com/helix-editor/helix/pull/5805))

615+- Recognize containerfiles as dockerfile syntax ([#5873](https://github.com/helix-editor/helix/pull/5873))

616+- Update godot grammar and queries ([#5944](https://github.com/helix-editor/helix/pull/5944), [#6186](https://github.com/helix-editor/helix/pull/6186))

617+- Improve DHall highlights ([#5959](https://github.com/helix-editor/helix/pull/5959))

618+- Recognize `.env.dist` and `source.env` as env language ([#6003](https://github.com/helix-editor/helix/pull/6003))

619+- Update tree-sitter-git-rebase ([#6030](https://github.com/helix-editor/helix/pull/6030), [#6094](https://github.com/helix-editor/helix/pull/6094))

620+- Improve SQL highlights ([#6041](https://github.com/helix-editor/helix/pull/6041))

621+- Improve markdown highlights and inject LaTeX ([#6100](https://github.com/helix-editor/helix/pull/6100))

622+- Add textobject queries for Elm ([#6084](https://github.com/helix-editor/helix/pull/6084))

623+- Recognize graphql schema file type ([#6159](https://github.com/helix-editor/helix/pull/6159))

624+- Improve highlighting in comments ([#6143](https://github.com/helix-editor/helix/pull/6143))

625+- Improve highlighting for JavaScript/TypeScript/ECMAScript languages ([#6205](https://github.com/helix-editor/helix/pull/6205))

626+- Improve PHP highlights ([#6203](https://github.com/helix-editor/helix/pull/6203), [#6250](https://github.com/helix-editor/helix/pull/6250), [#6299](https://github.com/helix-editor/helix/pull/6299))

627+- Improve Go highlights ([#6204](https://github.com/helix-editor/helix/pull/6204))

628+- Highlight unchecked sqlx functions as SQL in Rust ([#6256](https://github.com/helix-editor/helix/pull/6256))

629+- Improve Erlang highlights ([cdd6c8d](https://github.com/helix-editor/helix/commit/cdd6c8d))

630+- Improve Nix highlights ([fb4d703](https://github.com/helix-editor/helix/commit/fb4d703))

631+- Improve gdscript highlights ([#6311](https://github.com/helix-editor/helix/pull/6311))

632+- Improve Vlang highlights ([#6279](https://github.com/helix-editor/helix/pull/6279))

633+- Improve Makefile highlights ([#6339](https://github.com/helix-editor/helix/pull/6339))

634+- Remove auto-pair for `'` in OCaml ([#6381](https://github.com/helix-editor/helix/pull/6381))

635+- Fix indents in switch statements in ECMA languages ([#6369](https://github.com/helix-editor/helix/pull/6369))

636+- Recognize xlb and storyboard file-types as XML ([#6407](https://github.com/helix-editor/helix/pull/6407))

637+- Recognize cts and mts file-types as TypeScript ([#6424](https://github.com/helix-editor/helix/pull/6424))

638+- Recognize SVG file-type as XML ([#6431](https://github.com/helix-editor/helix/pull/6431))

639+- Add theme scopes for (un)checked list item markup scopes ([#6434](https://github.com/helix-editor/helix/pull/6434))

640+- Update git commit grammar and add the comment textobject ([#6439](https://github.com/helix-editor/helix/pull/6439), [#6493](https://github.com/helix-editor/helix/pull/6493))

641+- Recognize ARB file-type as JSON ([#6452](https://github.com/helix-editor/helix/pull/6452))

642+- Inject markdown into markdown strings in Julia ([#6489](https://github.com/helix-editor/helix/pull/6489))

643+

644+Packaging:

645+

646+- Fix Nix flake devShell for darwin hosts ([#5368](https://github.com/helix-editor/helix/pull/5368))

647+- Add Appstream metadata file to `contrib/` ([#5643](https://github.com/helix-editor/helix/pull/5643))

648+- Increase the MSRV to 1.65 ([#5570](https://github.com/helix-editor/helix/pull/5570), [#6185](https://github.com/helix-editor/helix/pull/6185))

649+- Expose the Nix flake's `wrapper` ([#5994](https://github.com/helix-editor/helix/pull/5994))

650+

651+# 22.12 (2022-12-06)

652+

653+This is a great big release filled with changes from a 99 contributors. A big _thank you_ to you all!

654+

655+As usual, the following is a summary of each of the changes since the last release.

656+For the full log, check out the [git log](https://github.com/helix-editor/helix/compare/22.08.1..22.12).

657+

658+Breaking changes:

659+

660+- Remove readline-like navigation bindings from the default insert mode keymap ([e12690e](https://github.com/helix-editor/helix/commit/e12690e), [#3811](https://github.com/helix-editor/helix/pull/3811), [#3827](https://github.com/helix-editor/helix/pull/3827), [#3915](https://github.com/helix-editor/helix/pull/3915), [#4088](https://github.com/helix-editor/helix/pull/4088))

661+- Rename `append_to_line` as `insert_at_line_end` and `prepend_to_line` as `insert_at_line_start` ([#3753](https://github.com/helix-editor/helix/pull/3753))

662+- Swap diagnostic picker and debug mode bindings in the space keymap ([#4229](https://github.com/helix-editor/helix/pull/4229))

663+- Select newly inserted text on paste or from shell commands ([#4458](https://github.com/helix-editor/helix/pull/4458), [#4608](https://github.com/helix-editor/helix/pull/4608), [#4619](https://github.com/helix-editor/helix/pull/4619), [#4824](https://github.com/helix-editor/helix/pull/4824))

664+- Select newly inserted surrounding characters on `ms<char>` ([#4752](https://github.com/helix-editor/helix/pull/4752))

665+- Exit select-mode after executing `replace_*` commands ([#4554](https://github.com/helix-editor/helix/pull/4554))

666+- Exit select-mode after executing surround commands ([#4858](https://github.com/helix-editor/helix/pull/4858))

667+- Change tree-sitter text-object keys ([#3782](https://github.com/helix-editor/helix/pull/3782))

668+- Rename `fleetish` theme to `fleet_dark` ([#4997](https://github.com/helix-editor/helix/pull/4997))

669+

670+Features:

671+

672+- Bufferline ([#2759](https://github.com/helix-editor/helix/pull/2759))

673+- Support underline styles and colors ([#4061](https://github.com/helix-editor/helix/pull/4061), [98c121c](https://github.com/helix-editor/helix/commit/98c121c))

674+- Inheritance for themes ([#3067](https://github.com/helix-editor/helix/pull/3067), [#4096](https://github.com/helix-editor/helix/pull/4096))

675+- Cursorcolumn ([#4084](https://github.com/helix-editor/helix/pull/4084))

676+- Overhauled system for writing files and quiting ([#2267](https://github.com/helix-editor/helix/pull/2267), [#4397](https://github.com/helix-editor/helix/pull/4397))

677+- Autosave when terminal loses focus ([#3178](https://github.com/helix-editor/helix/pull/3178))

678+- Use OSC52 as a fallback for the system clipboard ([#3220](https://github.com/helix-editor/helix/pull/3220))

679+- Show git diffs in the gutter ([#3890](https://github.com/helix-editor/helix/pull/3890), [#5012](https://github.com/helix-editor/helix/pull/5012), [#4995](https://github.com/helix-editor/helix/pull/4995))

680+- Add a logo ([dc1ec56](https://github.com/helix-editor/helix/commit/dc1ec56))

681+- Multi-cursor completion ([#4496](https://github.com/helix-editor/helix/pull/4496))

682+

683+Commands:

684+

685+- `file_picker_in_current_directory` (`<space>F`) ([#3701](https://github.com/helix-editor/helix/pull/3701))

686+- `:lsp-restart` to restart the current document's language server ([#3435](https://github.com/helix-editor/helix/pull/3435), [#3972](https://github.com/helix-editor/helix/pull/3972))

687+- `join_selections_space` (`A-j`) which joins selections and selects the joining whitespace ([#3549](https://github.com/helix-editor/helix/pull/3549))

688+- `:update` to write the current file if it is modified ([#4426](https://github.com/helix-editor/helix/pull/4426))

689+- `:lsp-workspace-command` for picking LSP commands to execute ([#3140](https://github.com/helix-editor/helix/pull/3140))

690+- `extend_prev_word_end` - the extend variant for `move_prev_word_end` ([7468fa2](https://github.com/helix-editor/helix/commit/7468fa2))

691+- `make_search_word_bounded` which adds regex word boundaries to the current search register value ([#4322](https://github.com/helix-editor/helix/pull/4322))

692+- `:reload-all` - `:reload` for all open buffers ([#4663](https://github.com/helix-editor/helix/pull/4663), [#4901](https://github.com/helix-editor/helix/pull/4901))

693+- `goto_next_change` (`]g`), `goto_prev_change` (`[g`), `goto_first_change` (`[G`), `goto_last_change` (`]G`) textobjects for jumping between VCS changes ([#4650](https://github.com/helix-editor/helix/pull/4650))

694+

695+Usability improvements and fixes:

696+

697+- Don't log 'LSP not defined' errors in the logfile ([1caba2d](https://github.com/helix-editor/helix/commit/1caba2d))

698+- Look for the external formatter program before invoking it ([#3670](https://github.com/helix-editor/helix/pull/3670))

699+- Don't send LSP didOpen events for documents without URLs ([44b4479](https://github.com/helix-editor/helix/commit/44b4479))

700+- Fix off-by-one in `extend_line_above` command ([#3689](https://github.com/helix-editor/helix/pull/3689))

701+- Use the original scroll offset when opening a split ([1acdfaa](https://github.com/helix-editor/helix/commit/1acdfaa))

702+- Handle auto-formatting failures and save the file anyway ([#3684](https://github.com/helix-editor/helix/pull/3684))

703+- Ensure the cursor is in view after `:reflow` ([#3733](https://github.com/helix-editor/helix/pull/3733))

704+- Add default rulers and reflow config for git commit messages ([#3738](https://github.com/helix-editor/helix/pull/3738))

705+- Improve grammar fetching and building output ([#3773](https://github.com/helix-editor/helix/pull/3773))

706+- Add a `text` language to language completion ([cc47d3f](https://github.com/helix-editor/helix/commit/cc47d3f))

707+- Improve error handling for `:set-language` ([e8add6f](https://github.com/helix-editor/helix/commit/e8add6f))

708+- Improve error handling for `:config-reload` ([#3668](https://github.com/helix-editor/helix/pull/3668))

709+- Improve error handling when passing improper ranges to syntax highlighting ([#3826](https://github.com/helix-editor/helix/pull/3826))

710+- Render `<code>` tags as raw markup in markdown ([#3425](https://github.com/helix-editor/helix/pull/3425))

711+- Remove border around the LSP code-actions popup ([#3444](https://github.com/helix-editor/helix/pull/3444))

712+- Canonicalize the path to the runtime directory ([#3794](https://github.com/helix-editor/helix/pull/3794))

713+- Add a `themelint` xtask for linting themes ([#3234](https://github.com/helix-editor/helix/pull/3234))

714+- Re-sort LSP diagnostics after applying transactions ([#3895](https://github.com/helix-editor/helix/pull/3895), [#4319](https://github.com/helix-editor/helix/pull/4319))

715+- Add a command-line flag to specify the log file ([#3807](https://github.com/helix-editor/helix/pull/3807))

716+- Track source and tag information in LSP diagnostics ([#3898](https://github.com/helix-editor/helix/pull/3898), [1df32c9](https://github.com/helix-editor/helix/commit/1df32c9))

717+- Fix theme returning to normal when exiting the `:theme` completion ([#3644](https://github.com/helix-editor/helix/pull/3644))

718+- Improve error messages for invalid commands in the keymap ([#3931](https://github.com/helix-editor/helix/pull/3931))

719+- Deduplicate regexs in `search_selection` command ([#3941](https://github.com/helix-editor/helix/pull/3941))

720+- Split the finding of LSP root and config roots ([#3929](https://github.com/helix-editor/helix/pull/3929))

721+- Ensure that the cursor is within view after auto-formatting ([#4047](https://github.com/helix-editor/helix/pull/4047))

722+- Add pseudo-pending to commands with on-next-key callbacks ([#4062](https://github.com/helix-editor/helix/pull/4062), [#4077](https://github.com/helix-editor/helix/pull/4077))

723+- Add live preview to `:goto` ([#2982](https://github.com/helix-editor/helix/pull/2982))

724+- Show regex compilation failure in a popup ([#3049](https://github.com/helix-editor/helix/pull/3049))

725+- Add 'cycled to end' and 'no more matches' for search ([#3176](https://github.com/helix-editor/helix/pull/3176), [#4101](https://github.com/helix-editor/helix/pull/4101))

726+- Add extending behavior to tree-sitter textobjects ([#3266](https://github.com/helix-editor/helix/pull/3266))

727+- Add `ui.gutter.selected` option for themes ([#3303](https://github.com/helix-editor/helix/pull/3303))

728+- Make statusline mode names configurable ([#3311](https://github.com/helix-editor/helix/pull/3311))

729+- Add a statusline element for total line count ([#3960](https://github.com/helix-editor/helix/pull/3960))

730+- Add extending behavior to `goto_window_*` commands ([#3985](https://github.com/helix-editor/helix/pull/3985))

731+- Fix a panic in signature help when the preview is too large ([#4030](https://github.com/helix-editor/helix/pull/4030))

732+- Add command names to the command palette ([#4071](https://github.com/helix-editor/helix/pull/4071), [#4223](https://github.com/helix-editor/helix/pull/4223), [#4495](https://github.com/helix-editor/helix/pull/4495))

733+- Find the LSP workspace root from the current document's path ([#3553](https://github.com/helix-editor/helix/pull/3553))

734+- Add an option to skip indent-guide levels ([#3819](https://github.com/helix-editor/helix/pull/3819), [2c36e33](https://github.com/helix-editor/helix/commit/2c36e33))

735+- Change focus to modified docs on quit ([#3872](https://github.com/helix-editor/helix/pull/3872))

736+- Respond to `USR1` signal by reloading config ([#3952](https://github.com/helix-editor/helix/pull/3952))

737+- Exit gracefully when the close operation fails ([#4081](https://github.com/helix-editor/helix/pull/4081))

738+- Fix goto/view center mismatch ([#4135](https://github.com/helix-editor/helix/pull/4135))

739+- Highlight the current file picker document on idle-timeout ([#3172](https://github.com/helix-editor/helix/pull/3172), [a85e386](https://github.com/helix-editor/helix/commit/a85e386))

740+- Apply transactions to jumplist selections ([#4186](https://github.com/helix-editor/helix/pull/4186), [#4227](https://github.com/helix-editor/helix/pull/4227), [#4733](https://github.com/helix-editor/helix/pull/4733), [#4865](https://github.com/helix-editor/helix/pull/4865), [#4912](https://github.com/helix-editor/helix/pull/4912), [#4965](https://github.com/helix-editor/helix/pull/4965), [#4981](https://github.com/helix-editor/helix/pull/4981))

741+- Use space as a separator for fuzzy matcher ([#3969](https://github.com/helix-editor/helix/pull/3969))

742+- Overlay all diagnostics with highest severity on top ([#4113](https://github.com/helix-editor/helix/pull/4113))

743+- Avoid re-parsing unmodified tree-sitter injections ([#4146](https://github.com/helix-editor/helix/pull/4146))

744+- Add extending captures for indentation, re-enable python indentation ([#3382](https://github.com/helix-editor/helix/pull/3382), [3e84434](https://github.com/helix-editor/helix/commit/3e84434))

745+- Only allow either `--vsplit` or `--hsplit` CLI flags at once ([#4202](https://github.com/helix-editor/helix/pull/4202))

746+- Fix append cursor location when selection anchor is at the end of the document ([#4147](https://github.com/helix-editor/helix/pull/4147))

747+- Improve selection yanking message ([#4275](https://github.com/helix-editor/helix/pull/4275))

748+- Log failures to load tree-sitter grammars as errors ([#4315](https://github.com/helix-editor/helix/pull/4315))

749+- Fix rendering of lines longer than 65,536 columns ([#4172](https://github.com/helix-editor/helix/pull/4172))

750+- Skip searching `.git` in `global_search` ([#4334](https://github.com/helix-editor/helix/pull/4334))

751+- Display tree-sitter scopes in a popup ([#4337](https://github.com/helix-editor/helix/pull/4337))

752+- Fix deleting a word from the end of the buffer ([#4328](https://github.com/helix-editor/helix/pull/4328))

753+- Pretty print the syntax tree in `:tree-sitter-subtree` ([#4295](https://github.com/helix-editor/helix/pull/4295), [#4606](https://github.com/helix-editor/helix/pull/4606))

754+- Allow specifying suffixes for file-type detection ([#2455](https://github.com/helix-editor/helix/pull/2455), [#4414](https://github.com/helix-editor/helix/pull/4414))

755+- Fix multi-byte auto-pairs ([#4024](https://github.com/helix-editor/helix/pull/4024))

756+- Improve sort scoring for LSP code-actions and completions ([#4134](https://github.com/helix-editor/helix/pull/4134))

757+- Fix the handling of quotes within shellwords ([#4098](https://github.com/helix-editor/helix/pull/4098))

758+- Fix `delete_word_backward` and `delete_word_forward` on newlines ([#4392](https://github.com/helix-editor/helix/pull/4392))

759+- Fix 'no entry found for key' crash on `:write-all` ([#4384](https://github.com/helix-editor/helix/pull/4384))

760+- Remove lowercase requirement for tree-sitter grammars ([#4346](https://github.com/helix-editor/helix/pull/4346))

761+- Resolve LSP completion items on idle-timeout ([#4406](https://github.com/helix-editor/helix/pull/4406), [#4797](https://github.com/helix-editor/helix/pull/4797))

762+- Render diagnostics in the file picker preview ([#4324](https://github.com/helix-editor/helix/pull/4324))

763+- Fix terminal freezing on `shell_insert_output` ([#4156](https://github.com/helix-editor/helix/pull/4156))

764+- Allow use of the count in the repeat operator (`.`) ([#4450](https://github.com/helix-editor/helix/pull/4450))

765+- Show the current theme name on `:theme` with no arguments ([#3740](https://github.com/helix-editor/helix/pull/3740))

766+- Fix rendering in very large terminals ([#4318](https://github.com/helix-editor/helix/pull/4318))

767+- Sort LSP preselected items to the top of the completion menu ([#4480](https://github.com/helix-editor/helix/pull/4480))

768+- Trim braces and quotes from paths in goto-file ([#4370](https://github.com/helix-editor/helix/pull/4370))

769+- Prevent automatic signature help outside of insert mode ([#4456](https://github.com/helix-editor/helix/pull/4456))

770+- Fix freezes with external programs that process stdin and stdout concurrently ([#4180](https://github.com/helix-editor/helix/pull/4180))

771+- Make `scroll` aware of tabs and wide characters ([#4519](https://github.com/helix-editor/helix/pull/4519))

772+- Correctly handle escaping in `command_mode` completion ([#4316](https://github.com/helix-editor/helix/pull/4316), [#4587](https://github.com/helix-editor/helix/pull/4587), [#4632](https://github.com/helix-editor/helix/pull/4632))

773+- Fix `delete_char_backward` for paired characters ([#4558](https://github.com/helix-editor/helix/pull/4558))

774+- Fix crash from two windows editing the same document ([#4570](https://github.com/helix-editor/helix/pull/4570))

775+- Fix pasting from the blackhole register ([#4497](https://github.com/helix-editor/helix/pull/4497))

776+- Support LSP insertReplace completion items ([1312682](https://github.com/helix-editor/helix/commit/1312682))

777+- Dynamically resize the line number gutter width ([#3469](https://github.com/helix-editor/helix/pull/3469))

778+- Fix crash for unknown completion item kinds ([#4658](https://github.com/helix-editor/helix/pull/4658))

779+- Re-enable `format_selections` for single selection ranges ([d4f5cab](https://github.com/helix-editor/helix/commit/d4f5cab))

780+- Limit the number of in-progress tree-sitter query matches ([#4707](https://github.com/helix-editor/helix/pull/4707), [#4830](https://github.com/helix-editor/helix/pull/4830))

781+- Use the special `#` register with `increment`/`decrement` to change by range number ([#4418](https://github.com/helix-editor/helix/pull/4418))

782+- Add a statusline element to show number of selected chars ([#4682](https://github.com/helix-editor/helix/pull/4682))

783+- Add a statusline element showing global LSP diagnostic warning and error counts ([#4569](https://github.com/helix-editor/helix/pull/4569))

784+- Add a scrollbar to popups ([#4449](https://github.com/helix-editor/helix/pull/4449))

785+- Prefer shorter matches in fuzzy matcher scoring ([#4698](https://github.com/helix-editor/helix/pull/4698))

786+- Use key-sequence format for command palette keybinds ([#4712](https://github.com/helix-editor/helix/pull/4712))

787+- Remove prefix filtering from autocompletion menu ([#4578](https://github.com/helix-editor/helix/pull/4578))

788+- Focus on the parent buffer when closing a split ([#4766](https://github.com/helix-editor/helix/pull/4766))

789+- Handle language server termination ([#4797](https://github.com/helix-editor/helix/pull/4797), [#4852](https://github.com/helix-editor/helix/pull/4852))

790+- Allow `r`/`t`/`f` to work on tab characters ([#4817](https://github.com/helix-editor/helix/pull/4817))

791+- Show a preview for scratch buffers in the buffer picker ([#3454](https://github.com/helix-editor/helix/pull/3454))

792+- Set a limit of entries in the jumplist ([#4750](https://github.com/helix-editor/helix/pull/4750))

793+- Re-use shell outputs when inserting or appending shell output ([#3465](https://github.com/helix-editor/helix/pull/3465))

794+- Check LSP server provider capabilities ([#3554](https://github.com/helix-editor/helix/pull/3554))

795+- Improve tree-sitter parsing performance on files with many language layers ([#4716](https://github.com/helix-editor/helix/pull/4716))

796+- Move indentation to the next line when using `<ret>` on a line with only whitespace ([#4854](https://github.com/helix-editor/helix/pull/4854))

797+- Remove selections for closed views from all documents ([#4888](https://github.com/helix-editor/helix/pull/4888))

798+- Improve performance of the `:reload` command ([#4457](https://github.com/helix-editor/helix/pull/4457))

799+- Properly handle media keys ([#4887](https://github.com/helix-editor/helix/pull/4887))

800+- Support LSP diagnostic data field ([#4935](https://github.com/helix-editor/helix/pull/4935))

801+- Handle C-i keycode as tab ([#4961](https://github.com/helix-editor/helix/pull/4961))

802+- Fix view alignment for jumplist picker jumps ([#3743](https://github.com/helix-editor/helix/pull/3743))

803+- Use OSC52 for tmux clipboard provider ([#5027](https://github.com/helix-editor/helix/pull/5027))

804+

805+Themes:

806+

807+- Add `varua` ([#3610](https://github.com/helix-editor/helix/pull/3610), [#4964](https://github.com/helix-editor/helix/pull/4964))

808+- Update `boo_berry` ([#3653](https://github.com/helix-editor/helix/pull/3653))

809+- Add `rasmus` ([#3728](https://github.com/helix-editor/helix/pull/3728))

810+- Add `papercolor_dark` ([#3742](https://github.com/helix-editor/helix/pull/3742))

811+- Update `monokai_pro_spectrum` ([#3814](https://github.com/helix-editor/helix/pull/3814))

812+- Update `nord` ([#3792](https://github.com/helix-editor/helix/pull/3792))

813+- Update `fleetish` ([#3844](https://github.com/helix-editor/helix/pull/3844), [#4487](https://github.com/helix-editor/helix/pull/4487), [#4813](https://github.com/helix-editor/helix/pull/4813))

814+- Update `flatwhite` ([#3843](https://github.com/helix-editor/helix/pull/3843))

815+- Add `darcula` ([#3739](https://github.com/helix-editor/helix/pull/3739))

816+- Update `papercolor` ([#3938](https://github.com/helix-editor/helix/pull/3938), [#4317](https://github.com/helix-editor/helix/pull/4317))

817+- Add bufferline colors to multiple themes ([#3881](https://github.com/helix-editor/helix/pull/3881))

818+- Add `gruvbox_dark_hard` ([#3948](https://github.com/helix-editor/helix/pull/3948))

819+- Add `onedarker` ([#3980](https://github.com/helix-editor/helix/pull/3980), [#4060](https://github.com/helix-editor/helix/pull/4060))

820+- Add `dark_high_contrast` ([#3312](https://github.com/helix-editor/helix/pull/3312))

821+- Update `bogster` ([#4121](https://github.com/helix-editor/helix/pull/4121), [#4264](https://github.com/helix-editor/helix/pull/4264))

822+- Update `sonokai` ([#4089](https://github.com/helix-editor/helix/pull/4089))

823+- Update `ayu_*` themes ([#4140](https://github.com/helix-editor/helix/pull/4140), [#4109](https://github.com/helix-editor/helix/pull/4109), [#4662](https://github.com/helix-editor/helix/pull/4662), [#4764](https://github.com/helix-editor/helix/pull/4764))

824+- Update `everforest` ([#3998](https://github.com/helix-editor/helix/pull/3998))

825+- Update `monokai_pro_octagon` ([#4247](https://github.com/helix-editor/helix/pull/4247))

826+- Add `heisenberg` ([#4209](https://github.com/helix-editor/helix/pull/4209))

827+- Add `bogster_light` ([#4265](https://github.com/helix-editor/helix/pull/4265))

828+- Update `pop-dark` ([#4323](https://github.com/helix-editor/helix/pull/4323))

829+- Update `rose_pine` ([#4221](https://github.com/helix-editor/helix/pull/4221))

830+- Add `kanagawa` ([#4300](https://github.com/helix-editor/helix/pull/4300))

831+- Add `hex_steel`, `hex_toxic` and `hex_lavendar` ([#4367](https://github.com/helix-editor/helix/pull/4367), [#4990](https://github.com/helix-editor/helix/pull/4990))

832+- Update `tokyonight` and `tokyonight_storm` ([#4415](https://github.com/helix-editor/helix/pull/4415))

833+- Update `gruvbox` ([#4626](https://github.com/helix-editor/helix/pull/4626))

834+- Update `dark_plus` ([#4661](https://github.com/helix-editor/helix/pull/4661), [#4678](https://github.com/helix-editor/helix/pull/4678))

835+- Add `zenburn` ([#4613](https://github.com/helix-editor/helix/pull/4613), [#4977](https://github.com/helix-editor/helix/pull/4977))

836+- Update `monokai_pro` ([#4789](https://github.com/helix-editor/helix/pull/4789))

837+- Add `mellow` ([#4770](https://github.com/helix-editor/helix/pull/4770))

838+- Add `nightfox` ([#4769](https://github.com/helix-editor/helix/pull/4769), [#4966](https://github.com/helix-editor/helix/pull/4966))

839+- Update `doom_acario_dark` ([#4979](https://github.com/helix-editor/helix/pull/4979))

840+- Update `autumn` ([#4996](https://github.com/helix-editor/helix/pull/4996))

841+- Update `acme` ([#4999](https://github.com/helix-editor/helix/pull/4999))

842+- Update `nord_light` ([#4999](https://github.com/helix-editor/helix/pull/4999))

843+- Update `serika_*` ([#5015](https://github.com/helix-editor/helix/pull/5015))

844+

845+LSP configurations:

846+

847+- Switch to `openscad-lsp` for OpenScad ([#3750](https://github.com/helix-editor/helix/pull/3750))

848+- Support Jsonnet ([#3748](https://github.com/helix-editor/helix/pull/3748))

849+- Support Markdown ([#3499](https://github.com/helix-editor/helix/pull/3499))

850+- Support Bass ([#3771](https://github.com/helix-editor/helix/pull/3771))

851+- Set roots configuration for Elixir and HEEx ([#3917](https://github.com/helix-editor/helix/pull/3917), [#3959](https://github.com/helix-editor/helix/pull/3959))

852+- Support Purescript ([#4242](https://github.com/helix-editor/helix/pull/4242))

853+- Set roots configuration for Julia ([#4361](https://github.com/helix-editor/helix/pull/4361))

854+- Support D ([#4372](https://github.com/helix-editor/helix/pull/4372))

855+- Increase default language server timeout for Julia ([#4575](https://github.com/helix-editor/helix/pull/4575))

856+- Use ElixirLS for HEEx ([#4679](https://github.com/helix-editor/helix/pull/4679))

857+- Support Bicep ([#4403](https://github.com/helix-editor/helix/pull/4403))

858+- Switch to `nil` for Nix ([433ccef](https://github.com/helix-editor/helix/commit/433ccef))

859+- Support QML ([#4842](https://github.com/helix-editor/helix/pull/4842))

860+- Enable auto-format for CSS ([#4987](https://github.com/helix-editor/helix/pull/4987))

861+- Support CommonLisp ([4176769](https://github.com/helix-editor/helix/commit/4176769))

862+

863+New languages:

864+

865+- SML ([#3692](https://github.com/helix-editor/helix/pull/3692))

866+- Jsonnet ([#3714](https://github.com/helix-editor/helix/pull/3714))

867+- Godot resource ([#3759](https://github.com/helix-editor/helix/pull/3759))

868+- Astro ([#3829](https://github.com/helix-editor/helix/pull/3829))

869+- SSH config ([#2455](https://github.com/helix-editor/helix/pull/2455), [#4538](https://github.com/helix-editor/helix/pull/4538))

870+- Bass ([#3771](https://github.com/helix-editor/helix/pull/3771))

871+- WAT (WebAssembly text format) ([#4040](https://github.com/helix-editor/helix/pull/4040), [#4542](https://github.com/helix-editor/helix/pull/4542))

872+- Purescript ([#4242](https://github.com/helix-editor/helix/pull/4242))

873+- D ([#4372](https://github.com/helix-editor/helix/pull/4372), [#4562](https://github.com/helix-editor/helix/pull/4562))

874+- VHS ([#4486](https://github.com/helix-editor/helix/pull/4486))

875+- KDL ([#4481](https://github.com/helix-editor/helix/pull/4481))

876+- XML ([#4518](https://github.com/helix-editor/helix/pull/4518))

877+- WIT ([#4525](https://github.com/helix-editor/helix/pull/4525))

878+- ENV ([#4536](https://github.com/helix-editor/helix/pull/4536))

879+- INI ([#4538](https://github.com/helix-editor/helix/pull/4538))

880+- Bicep ([#4403](https://github.com/helix-editor/helix/pull/4403), [#4751](https://github.com/helix-editor/helix/pull/4751))

881+- QML ([#4842](https://github.com/helix-editor/helix/pull/4842))

882+- CommonLisp ([4176769](https://github.com/helix-editor/helix/commit/4176769))

883+

884+Updated languages and queries:

885+

886+- Zig ([#3621](https://github.com/helix-editor/helix/pull/3621), [#4745](https://github.com/helix-editor/helix/pull/4745))

887+- Rust ([#3647](https://github.com/helix-editor/helix/pull/3647), [#3729](https://github.com/helix-editor/helix/pull/3729), [#3927](https://github.com/helix-editor/helix/pull/3927), [#4073](https://github.com/helix-editor/helix/pull/4073), [#4510](https://github.com/helix-editor/helix/pull/4510), [#4659](https://github.com/helix-editor/helix/pull/4659), [#4717](https://github.com/helix-editor/helix/pull/4717))

888+- Solidity ([20ed8c2](https://github.com/helix-editor/helix/commit/20ed8c2))

889+- Fish ([#3704](https://github.com/helix-editor/helix/pull/3704))

890+- Elixir ([#3645](https://github.com/helix-editor/helix/pull/3645), [#4333](https://github.com/helix-editor/helix/pull/4333), [#4821](https://github.com/helix-editor/helix/pull/4821))

891+- Diff ([#3708](https://github.com/helix-editor/helix/pull/3708))

892+- Nix ([665e27f](https://github.com/helix-editor/helix/commit/665e27f), [1fe3273](https://github.com/helix-editor/helix/commit/1fe3273))

893+- Markdown ([#3749](https://github.com/helix-editor/helix/pull/3749), [#4078](https://github.com/helix-editor/helix/pull/4078), [#4483](https://github.com/helix-editor/helix/pull/4483), [#4478](https://github.com/helix-editor/helix/pull/4478))

894+- GDScript ([#3760](https://github.com/helix-editor/helix/pull/3760))

895+- JSX and TSX ([#3853](https://github.com/helix-editor/helix/pull/3853), [#3973](https://github.com/helix-editor/helix/pull/3973))

896+- Ruby ([#3976](https://github.com/helix-editor/helix/pull/3976), [#4601](https://github.com/helix-editor/helix/pull/4601))

897+- R ([#4031](https://github.com/helix-editor/helix/pull/4031))

898+- WGSL ([#3996](https://github.com/helix-editor/helix/pull/3996), [#4079](https://github.com/helix-editor/helix/pull/4079))

899+- C# ([#4118](https://github.com/helix-editor/helix/pull/4118), [#4281](https://github.com/helix-editor/helix/pull/4281), [#4213](https://github.com/helix-editor/helix/pull/4213))

900+- Twig ([#4176](https://github.com/helix-editor/helix/pull/4176))

901+- Lua ([#3552](https://github.com/helix-editor/helix/pull/3552))

902+- C/C++ ([#4079](https://github.com/helix-editor/helix/pull/4079), [#4278](https://github.com/helix-editor/helix/pull/4278), [#4282](https://github.com/helix-editor/helix/pull/4282))

903+- Cairo ([17488f1](https://github.com/helix-editor/helix/commit/17488f1), [431f9c1](https://github.com/helix-editor/helix/commit/431f9c1), [09a6df1](https://github.com/helix-editor/helix/commit/09a6df1))

904+- Rescript ([#4356](https://github.com/helix-editor/helix/pull/4356))

905+- Zig ([#4409](https://github.com/helix-editor/helix/pull/4409))

906+- Scala ([#4353](https://github.com/helix-editor/helix/pull/4353), [#4697](https://github.com/helix-editor/helix/pull/4697), [#4701](https://github.com/helix-editor/helix/pull/4701))

907+- LaTeX ([#4528](https://github.com/helix-editor/helix/pull/4528), [#4922](https://github.com/helix-editor/helix/pull/4922))

908+- SQL ([#4529](https://github.com/helix-editor/helix/pull/4529))

909+- Python ([#4560](https://github.com/helix-editor/helix/pull/4560))

910+- Bash/Zsh ([#4582](https://github.com/helix-editor/helix/pull/4582))

911+- Nu ([#4583](https://github.com/helix-editor/helix/pull/4583))

912+- Julia ([#4588](https://github.com/helix-editor/helix/pull/4588))

913+- Typescript ([#4703](https://github.com/helix-editor/helix/pull/4703))

914+- Meson ([#4572](https://github.com/helix-editor/helix/pull/4572))

915+- Haskell ([#4800](https://github.com/helix-editor/helix/pull/4800))

916+- CMake ([#4809](https://github.com/helix-editor/helix/pull/4809))

917+- HTML ([#4829](https://github.com/helix-editor/helix/pull/4829), [#4881](https://github.com/helix-editor/helix/pull/4881))

918+- Java ([#4886](https://github.com/helix-editor/helix/pull/4886))

919+- Go ([#4906](https://github.com/helix-editor/helix/pull/4906), [#4969](https://github.com/helix-editor/helix/pull/4969), [#5010](https://github.com/helix-editor/helix/pull/5010))

920+- CSS ([#4882](https://github.com/helix-editor/helix/pull/4882))

921+- Racket ([#4915](https://github.com/helix-editor/helix/pull/4915))

922+- SCSS ([#5003](https://github.com/helix-editor/helix/pull/5003))

923+

924+Packaging:

925+

926+- Filter relevant source files in the Nix flake ([#3657](https://github.com/helix-editor/helix/pull/3657))

927+- Build a binary for `aarch64-linux` in the release CI ([038a91d](https://github.com/helix-editor/helix/commit/038a91d))

928+- Build an AppImage for `aarch64-linux` in the release CI ([b738031](https://github.com/helix-editor/helix/commit/b738031))

929+- Enable CI builds for `riscv64-linux` ([#3685](https://github.com/helix-editor/helix/pull/3685))

930+- Support preview releases in CI ([0090a2d](https://github.com/helix-editor/helix/commit/0090a2d))

931+- Strip binaries built in CI ([#3780](https://github.com/helix-editor/helix/pull/3780))

932+- Fix the development shell for the Nix Flake on `aarch64-darwin` ([#3810](https://github.com/helix-editor/helix/pull/3810))

933+- Raise the MSRV and create an MSRV policy ([#3896](https://github.com/helix-editor/helix/pull/3896), [#3913](https://github.com/helix-editor/helix/pull/3913), [#3961](https://github.com/helix-editor/helix/pull/3961))

934+- Fix Fish completions for `--config` and `--log` flags ([#3912](https://github.com/helix-editor/helix/pull/3912))

935+- Use builtin filenames option in Bash completion ([#4648](https://github.com/helix-editor/helix/pull/4648))

936+

937+# 22.08.1 (2022-09-01)

938+

939+This is a patch release that fixes a panic caused by closing splits or buffers. ([#3633](https://github.com/helix-editor/helix/pull/3633))

940+

941+# 22.08 (2022-08-31)

942+

943+A big _thank you_ to our contributors! This release had 87 contributors.

944+

945+As usual, the following is a summary of each of the changes since the last release.

946+For the full log, check out the [git log](https://github.com/helix-editor/helix/compare/22.05..22.08).

947+

948+Breaking changes:

949+

950+- Special keymap names for `+`, `;` and `%` have been replaced with those literal characters ([#2677](https://github.com/helix-editor/helix/pull/2677), [#3556](https://github.com/helix-editor/helix/pull/3556))

951+- `A-Left` and `A-Right` have become `C-Left` and `C-Right` for word-wise motion ([#2500](https://github.com/helix-editor/helix/pull/2500))

952+- The `catppuccin` theme's name has been corrected from `catpuccin` ([#2713](https://github.com/helix-editor/helix/pull/2713))

953+- `catppuccin` has been replaced by its variants, `catppuccin_frappe`, `catppuccin_latte`, `catppuccin_macchiato`, `catppuccin_mocha` ([#3281](https://github.com/helix-editor/helix/pull/3281))

954+- `C-n` and `C-p` have been removed from the default insert mode keymap ([#3340](https://github.com/helix-editor/helix/pull/3340))

955+- The `extend_line` command has been replaced with `extend_line_below` and a new `extend_line` command now exists ([#3046](https://github.com/helix-editor/helix/pull/3046))

956+

957+Features:

958+

959+- Add an integration testing harness ([#2359](https://github.com/helix-editor/helix/pull/2359))

960+- Indent guides ([#1796](https://github.com/helix-editor/helix/pull/1796), [906259c](https://github.com/helix-editor/helix/commit/906259c))

961+- Cursorline ([#2170](https://github.com/helix-editor/helix/pull/2170), [fde9e03](https://github.com/helix-editor/helix/commit/fde9e03))

962+- Select all instances of the symbol under the cursor (`<space>h`) ([#2738](https://github.com/helix-editor/helix/pull/2738))

963+- A picker for document and workspace LSP diagnostics (`<space>g`/`<space>G`) ([#2013](https://github.com/helix-editor/helix/pull/2013), [#2984](https://github.com/helix-editor/helix/pull/2984))

964+- Allow styling the mode indicator per-mode ([#2676](https://github.com/helix-editor/helix/pull/2676))

965+- Live preview for the theme picker ([#1798](https://github.com/helix-editor/helix/pull/1798))

966+- Configurable statusline ([#2434](https://github.com/helix-editor/helix/pull/2434))

967+- LSP SignatureHelp ([#1755](https://github.com/helix-editor/helix/pull/1755), [a8b123f](https://github.com/helix-editor/helix/commit/a8b123f))

968+- A picker for the jumplist ([#3033](https://github.com/helix-editor/helix/pull/3033))

969+- Configurable external formatter binaries ([#2942](https://github.com/helix-editor/helix/pull/2942))

970+- Bracketed paste support ([#3233](https://github.com/helix-editor/helix/pull/3233), [12ddd03](https://github.com/helix-editor/helix/commit/12ddd03))

971+

972+Commands:

973+

974+- `:insert-output` and `:append-output` which insert/append output from a shell command ([#2589](https://github.com/helix-editor/helix/pull/2589))

975+- The `t` textobject (`]t`/`[t`/`mit`/`mat`) for navigating tests ([#2807](https://github.com/helix-editor/helix/pull/2807))

976+- `C-Backspace` and `C-Delete` for word-wise deletion in prompts and pickers ([#2500](https://github.com/helix-editor/helix/pull/2500))

977+- `A-Delete` for forward word-wise deletion in insert mode ([#2500](https://github.com/helix-editor/helix/pull/2500))

978+- `C-t` for toggling the preview pane in pickers ([#3021](https://github.com/helix-editor/helix/pull/3021))

979+- `extend_line` now extends in the direction of the cursor ([#3046](https://github.com/helix-editor/helix/pull/3046))

980+

981+Usability improvements and fixes:

982+

983+- Fix tree-sitter parser builds on illumos ([#2602](https://github.com/helix-editor/helix/pull/2602))

984+- Remove empty stratch buffer from jumplists when removing ([5ed6223](https://github.com/helix-editor/helix/commit/5ed6223))

985+- Fix panic on undo after `shell_append_output` ([#2625](https://github.com/helix-editor/helix/pull/2625))

986+- Sort LSP edits by start range ([3d91c99](https://github.com/helix-editor/helix/commit/3d91c99))

987+- Be more defensive about LSP URI conversions ([6de6a3e](https://github.com/helix-editor/helix/commit/6de6a3e), [378f438](https://github.com/helix-editor/helix/commit/378f438))

988+- Ignore SendErrors when grammar builds fail ([#2641](https://github.com/helix-editor/helix/pull/2641))

989+- Append `set_line_ending` to document history ([#2649](https://github.com/helix-editor/helix/pull/2649))

990+- Use last prompt entry when empty ([b14c258](https://github.com/helix-editor/helix/commit/b14c258), [#2870](https://github.com/helix-editor/helix/pull/2870))

991+- Do not add extra line breaks in markdown lists ([#2689](https://github.com/helix-editor/helix/pull/2689))

992+- Disable dialyzer by default for ElixirLS ([#2710](https://github.com/helix-editor/helix/pull/2710))

993+- Refactor textobject node capture ([#2741](https://github.com/helix-editor/helix/pull/2741))

994+- Prevent re-selecting the same range with `expand_selection` ([#2760](https://github.com/helix-editor/helix/pull/2760))

995+- Introduce `keyword.storage` highlight scope ([#2731](https://github.com/helix-editor/helix/pull/2731))

996+- Handle symlinks more consistently ([#2718](https://github.com/helix-editor/helix/pull/2718))

997+- Improve markdown list rendering ([#2687](https://github.com/helix-editor/helix/pull/2687))

998+- Update auto-pairs and idle-timout settings when the config is reloaded ([#2736](https://github.com/helix-editor/helix/pull/2736))

999+- Fix panic on closing last buffer ([#2658](https://github.com/helix-editor/helix/pull/2658))

1000+- Prevent modifying jumplist until jumping to a reference ([#2670](https://github.com/helix-editor/helix/pull/2670))

1001+- Ensure `:quit` and `:quit!` take no arguments ([#2654](https://github.com/helix-editor/helix/pull/2654))

1002+- Fix crash due to cycles when replaying macros ([#2647](https://github.com/helix-editor/helix/pull/2647))

1003+- Pass LSP FormattingOptions ([#2635](https://github.com/helix-editor/helix/pull/2635))

1004+- Prevent showing colors when the health-check is piped ([#2836](https://github.com/helix-editor/helix/pull/2836))

1005+- Use character indexing for mouse selection ([#2839](https://github.com/helix-editor/helix/pull/2839))

1006+- Display the highest severity diagnostic for a line in the gutter ([#2835](https://github.com/helix-editor/helix/pull/2835))

1007+- Default the ruler color to red background ([#2669](https://github.com/helix-editor/helix/pull/2669))

1008+- Make `move_vertically` aware of tabs and wide characters ([#2620](https://github.com/helix-editor/helix/pull/2620))

1009+- Enable shellwords for Windows ([#2767](https://github.com/helix-editor/helix/pull/2767))

1010+- Add history suggestions to global search ([#2717](https://github.com/helix-editor/helix/pull/2717))

1011+- Fix the scrollbar's length proportional to total menu items ([#2860](https://github.com/helix-editor/helix/pull/2860))

1012+- Reset terminal modifiers for diagnostic text ([#2861](https://github.com/helix-editor/helix/pull/2861), [#2900](https://github.com/helix-editor/helix/pull/2900))

1013+- Redetect indents and line-endings after a Language Server replaces the document ([#2778](https://github.com/helix-editor/helix/pull/2778))

1014+- Check selection's visible width when copying on mouse click ([#2711](https://github.com/helix-editor/helix/pull/2711))

1015+- Fix edge-case in tree-sitter `expand_selection` command ([#2877](https://github.com/helix-editor/helix/pull/2877))

1016+- Add a single-width left margin for the completion popup ([#2728](https://github.com/helix-editor/helix/pull/2728))

1017+- Right-align the scrollbar in the completion popup ([#2754](https://github.com/helix-editor/helix/pull/2754))

1018+- Fix recursive macro crash and empty macro lockout ([#2902](https://github.com/helix-editor/helix/pull/2902))

1019+- Fix backwards character deletion on other whitespaces ([#2855](https://github.com/helix-editor/helix/pull/2855))

1020+- Add search and space/backspace bindings to view modes ([#2803](https://github.com/helix-editor/helix/pull/2803))

1021+- Add `--vsplit` and `--hsplit` CLI arguments for opening in splits ([#2773](https://github.com/helix-editor/helix/pull/2773), [#3073](https://github.com/helix-editor/helix/pull/3073))

1022+- Sort themes, languages and files inputs by score and name ([#2675](https://github.com/helix-editor/helix/pull/2675))

1023+- Highlight entire rows in ([#2939](https://github.com/helix-editor/helix/pull/2939))

1024+- Fix backwards selection duplication widening bug ([#2945](https://github.com/helix-editor/helix/pull/2945), [#3024](https://github.com/helix-editor/helix/pull/3024))

1025+- Skip serializing Option type DAP fields ([44f5963](https://github.com/helix-editor/helix/commit/44f5963))

1026+- Fix required `cwd` field in DAP `RunTerminalArguments` type ([85411be](https://github.com/helix-editor/helix/commit/85411be), [#3240](https://github.com/helix-editor/helix/pull/3240))

1027+- Add LSP `workspace/applyEdit` to client capabilities ([#3012](https://github.com/helix-editor/helix/pull/3012))

1028+- Respect count for repeating motion ([#3057](https://github.com/helix-editor/helix/pull/3057))

1029+- Respect count for selecting next/previous match ([#3056](https://github.com/helix-editor/helix/pull/3056))

1030+- Respect count for tree-sitter motions ([#3058](https://github.com/helix-editor/helix/pull/3058))

1031+- Make gutters padding optional ([#2996](https://github.com/helix-editor/helix/pull/2996))

1032+- Support pre-filling prompts ([#2459](https://github.com/helix-editor/helix/pull/2459), [#3259](https://github.com/helix-editor/helix/pull/3259))

1033+- Add statusline element to display file line-endings ([#3113](https://github.com/helix-editor/helix/pull/3113))

1034+- Keep jump and file history when using `:split` ([#3031](https://github.com/helix-editor/helix/pull/3031), [#3160](https://github.com/helix-editor/helix/pull/3160))

1035+- Make tree-sitter query `; inherits <language>` feature imperative ([#2470](https://github.com/helix-editor/helix/pull/2470))

1036+- Indent with tabs by default ([#3095](https://github.com/helix-editor/helix/pull/3095))

1037+- Fix non-msvc grammar compilation on Windows ([#3190](https://github.com/helix-editor/helix/pull/3190))

1038+- Add spacer element to the statusline ([#3165](https://github.com/helix-editor/helix/pull/3165), [255c173](https://github.com/helix-editor/helix/commit/255c173))

1039+- Make gutters padding automatic ([#3163](https://github.com/helix-editor/helix/pull/3163))

1040+- Add `code` for LSP `Diagnostic` type ([#3096](https://github.com/helix-editor/helix/pull/3096))

1041+- Add position percentage to the statusline ([#3168](https://github.com/helix-editor/helix/pull/3168))

1042+- Add a configurable and themable statusline separator string ([#3175](https://github.com/helix-editor/helix/pull/3175))

1043+- Use OR of all selections when `search_selection` acts on multiple selections ([#3138](https://github.com/helix-editor/helix/pull/3138))

1044+- Add clipboard information to logs and the healthcheck ([#3271](https://github.com/helix-editor/helix/pull/3271))

1045+- Fix align selection behavior on tabs ([#3276](https://github.com/helix-editor/helix/pull/3276))

1046+- Fix terminal cursor shape reset ([#3289](https://github.com/helix-editor/helix/pull/3289))

1047+- Add an `injection.include-unnamed-children` predicate to injections queries ([#3129](https://github.com/helix-editor/helix/pull/3129))

1048+- Add a `-c`/`--config` CLI flag for specifying config file location ([#2666](https://github.com/helix-editor/helix/pull/2666))

1049+- Detect indent-style in `:set-language` command ([#3330](https://github.com/helix-editor/helix/pull/3330))

1050+- Fix non-deterministic highlighting ([#3275](https://github.com/helix-editor/helix/pull/3275))

1051+- Avoid setting the stdin handle when not necessary ([#3248](https://github.com/helix-editor/helix/pull/3248), [#3379](https://github.com/helix-editor/helix/pull/3379))

1052+- Fix indent guide styling ([#3324](https://github.com/helix-editor/helix/pull/3324))

1053+- Fix tab highlight when tab is partially visible ([#3313](https://github.com/helix-editor/helix/pull/3313))

1054+- Add completion for nested settings ([#3183](https://github.com/helix-editor/helix/pull/3183))

1055+- Advertise WorkspaceSymbolClientCapabilities LSP client capability ([#3361](https://github.com/helix-editor/helix/pull/3361))

1056+- Remove duplicate entries from the theme picker ([#3439](https://github.com/helix-editor/helix/pull/3439))

1057+- Shorted output for grammar fetching and building ([#3396](https://github.com/helix-editor/helix/pull/3396))

1058+- Add a `tabpad` option for visible tab padding whitespace characters ([#3458](https://github.com/helix-editor/helix/pull/3458))

1059+- Make DAP external terminal provider configurable ([cb7615e](https://github.com/helix-editor/helix/commit/cb7615e))

1060+- Use health checkmark character with shorter width ([#3505](https://github.com/helix-editor/helix/pull/3505))

1061+- Reset document mode to normal on view focus loss ([e4c9d40](https://github.com/helix-editor/helix/commit/e4c9d40))

1062+- Render indented code-blocks in markdown ([#3503](https://github.com/helix-editor/helix/pull/3503))

1063+- Add WezTerm to DAP terminal provider defaults ([#3588](https://github.com/helix-editor/helix/pull/3588))

1064+- Derive `Document` language name from `languages.toml` `name` key ([#3338](https://github.com/helix-editor/helix/pull/3338))

1065+- Fix process spawning error handling ([#3349](https://github.com/helix-editor/helix/pull/3349))

1066+- Don't resolve links for `:o` completion ([8a4fbf6](https://github.com/helix-editor/helix/commit/8a4fbf6))

1067+- Recalculate completion after pasting into prompt ([e77b7d1](https://github.com/helix-editor/helix/commit/e77b7d1))

1068+- Fix extra selections with regex anchors ([#3598](https://github.com/helix-editor/helix/pull/3598))

1069+- Move mode transition logic to `handle_keymap_event` ([#2634](https://github.com/helix-editor/helix/pull/2634))

1070+- Add documents to view history when using the jumplist ([#3593](https://github.com/helix-editor/helix/pull/3593))

1071+- Prevent panic when loading tree-sitter queries ([fa1dc7e](https://github.com/helix-editor/helix/commit/fa1dc7e))

1072+- Discard LSP publishDiagnostic when LS is not initialized ([#3403](https://github.com/helix-editor/helix/pull/3403))

1073+- Refactor tree-sitter textobject motions as repeatable motions ([#3264](https://github.com/helix-editor/helix/pull/3264))

1074+- Avoid command execution hooks on closed docs ([#3613](https://github.com/helix-editor/helix/pull/3613))

1075+- Share `restore_term` code between panic and normal exits ([#2612](https://github.com/helix-editor/helix/pull/2612))

1076+- Show clipboard info in `--health` output ([#2947](https://github.com/helix-editor/helix/pull/2947))

1077+- Recalculate completion when going through prompt history ([#3193](https://github.com/helix-editor/helix/pull/3193))

1078+

1079+Themes:

1080+

1081+- Update `tokyonight` and `tokyonight_storm` themes ([#2606](https://github.com/helix-editor/helix/pull/2606))

1082+- Update `solarized_light` themes ([#2626](https://github.com/helix-editor/helix/pull/2626))

1083+- Fix `catpuccin` `ui.popup` theme ([#2644](https://github.com/helix-editor/helix/pull/2644))

1084+- Update selection style of `night_owl` ([#2668](https://github.com/helix-editor/helix/pull/2668))

1085+- Fix spelling of `catppuccin` theme ([#2713](https://github.com/helix-editor/helix/pull/2713))

1086+- Update `base16_default`'s `ui.menu` ([#2794](https://github.com/helix-editor/helix/pull/2794))

1087+- Add `noctis_bordo` ([#2830](https://github.com/helix-editor/helix/pull/2830))

1088+- Add `acme` ([#2876](https://github.com/helix-editor/helix/pull/2876))

1089+- Add `meliora` ([#2884](https://github.com/helix-editor/helix/pull/2884), [#2890](https://github.com/helix-editor/helix/pull/2890))

1090+- Add cursorline scopes to various themes ([33d287a](https://github.com/helix-editor/helix/commit/33d287a), [#2892](https://github.com/helix-editor/helix/pull/2892), [#2915](https://github.com/helix-editor/helix/pull/2915), [#2916](https://github.com/helix-editor/helix/pull/2916), [#2918](https://github.com/helix-editor/helix/pull/2918), [#2927](https://github.com/helix-editor/helix/pull/2927), [#2925](https://github.com/helix-editor/helix/pull/2925), [#2938](https://github.com/helix-editor/helix/pull/2938), [#2962](https://github.com/helix-editor/helix/pull/2962), [#3054](https://github.com/helix-editor/helix/pull/3054))

1091+- Add mode colors to various themes ([#2926](https://github.com/helix-editor/helix/pull/2926), [#2933](https://github.com/helix-editor/helix/pull/2933), [#2929](https://github.com/helix-editor/helix/pull/2929), [#3098](https://github.com/helix-editor/helix/pull/3098), [#3104](https://github.com/helix-editor/helix/pull/3104), [#3128](https://github.com/helix-editor/helix/pull/3128), [#3135](https://github.com/helix-editor/helix/pull/3135), [#3200](https://github.com/helix-editor/helix/pull/3200))

1092+- Add `nord_light` ([#2908](https://github.com/helix-editor/helix/pull/2908))

1093+- Update `night_owl` ([#2929](https://github.com/helix-editor/helix/pull/2929))

1094+- Update `autumn` ([2e70985](https://github.com/helix-editor/helix/commit/2e70985), [936ed3a](https://github.com/helix-editor/helix/commit/936ed3a))

1095+- Update `one_dark` ([#3011](https://github.com/helix-editor/helix/pull/3011))

1096+- Add `noctis` ([#3043](https://github.com/helix-editor/helix/pull/3043), [#3128](https://github.com/helix-editor/helix/pull/3128))

1097+- Update `boo_berry` ([#3191](https://github.com/helix-editor/helix/pull/3191))

1098+- Update `monokai` ([#3131](https://github.com/helix-editor/helix/pull/3131))

1099+- Add `ayu_dark`, `ayu_light`, `ayu_mirage` ([#3184](https://github.com/helix-editor/helix/pull/3184))

1100+- Update `onelight` ([#3226](https://github.com/helix-editor/helix/pull/3226))

1101+- Add `base16_transparent` ([#3216](https://github.com/helix-editor/helix/pull/3216), [b565fff](https://github.com/helix-editor/helix/commit/b565fff))

1102+- Add `flatwhite` ([#3236](https://github.com/helix-editor/helix/pull/3236))

1103+- Update `dark_plus` ([#3302](https://github.com/helix-editor/helix/pull/3302))

1104+- Add `doom_acario_dark` ([#3308](https://github.com/helix-editor/helix/pull/3308), [#3539](https://github.com/helix-editor/helix/pull/3539))

1105+- Add `rose_pine_moon` ([#3229](https://github.com/helix-editor/helix/pull/3229))

1106+- Update `spacebones_light` ([#3342](https://github.com/helix-editor/helix/pull/3342))

1107+- Fix typos in themes ([8deaebd](https://github.com/helix-editor/helix/commit/8deaebd), [#3412](https://github.com/helix-editor/helix/pull/3412))

1108+- Add `emacs` ([#3410](https://github.com/helix-editor/helix/pull/3410))

1109+- Add `papercolor-light` ([#3426](https://github.com/helix-editor/helix/pull/3426), [#3470](https://github.com/helix-editor/helix/pull/3470), [#3585](https://github.com/helix-editor/helix/pull/3585))

1110+- Add `penumbra+` ([#3398](https://github.com/helix-editor/helix/pull/3398))

1111+- Add `fleetish` ([#3591](https://github.com/helix-editor/helix/pull/3591), [#3607](https://github.com/helix-editor/helix/pull/3607))

1112+- Add `sonokai` ([#3595](https://github.com/helix-editor/helix/pull/3595))

1113+- Update all themes for theme lints ([#3587](https://github.com/helix-editor/helix/pull/3587))

1114+

1115+LSP:

1116+

1117+- V ([#2526](https://github.com/helix-editor/helix/pull/2526))

1118+- Prisma ([#2703](https://github.com/helix-editor/helix/pull/2703))

1119+- Clojure ([#2780](https://github.com/helix-editor/helix/pull/2780))

1120+- WGSL ([#2872](https://github.com/helix-editor/helix/pull/2872))

1121+- Elvish ([#2948](https://github.com/helix-editor/helix/pull/2948))

1122+- Idris ([#2971](https://github.com/helix-editor/helix/pull/2971))

1123+- Fortran ([#3025](https://github.com/helix-editor/helix/pull/3025))

1124+- Gleam ([#3139](https://github.com/helix-editor/helix/pull/3139))

1125+- Odin ([#3214](https://github.com/helix-editor/helix/pull/3214))

1126+

1127+New languages:

1128+

1129+- V ([#2526](https://github.com/helix-editor/helix/pull/2526))

1130+- EDoc ([#2640](https://github.com/helix-editor/helix/pull/2640))

1131+- JSDoc ([#2650](https://github.com/helix-editor/helix/pull/2650))

1132+- OpenSCAD ([#2680](https://github.com/helix-editor/helix/pull/2680))

1133+- Prisma ([#2703](https://github.com/helix-editor/helix/pull/2703))

1134+- Clojure ([#2780](https://github.com/helix-editor/helix/pull/2780))

1135+- Starlark ([#2903](https://github.com/helix-editor/helix/pull/2903))

1136+- Elvish ([#2948](https://github.com/helix-editor/helix/pull/2948))

1137+- Fortran ([#3025](https://github.com/helix-editor/helix/pull/3025))

1138+- Ungrammar ([#3048](https://github.com/helix-editor/helix/pull/3048))

1139+- SCSS ([#3074](https://github.com/helix-editor/helix/pull/3074))

1140+- Go Template ([#3091](https://github.com/helix-editor/helix/pull/3091))

1141+- Graphviz dot ([#3241](https://github.com/helix-editor/helix/pull/3241))

1142+- Cue ([#3262](https://github.com/helix-editor/helix/pull/3262))

1143+- Slint ([#3355](https://github.com/helix-editor/helix/pull/3355))

1144+- Beancount ([#3297](https://github.com/helix-editor/helix/pull/3297))

1145+- Taskwarrior ([#3468](https://github.com/helix-editor/helix/pull/3468))

1146+- xit ([#3521](https://github.com/helix-editor/helix/pull/3521))

1147+- ESDL ([#3526](https://github.com/helix-editor/helix/pull/3526))

1148+- Awk ([#3528](https://github.com/helix-editor/helix/pull/3528), [#3535](https://github.com/helix-editor/helix/pull/3535))

1149+- Pascal ([#3542](https://github.com/helix-editor/helix/pull/3542))

1150+

1151+Updated languages and queries:

1152+

1153+- Nix ([#2472](https://github.com/helix-editor/helix/pull/2472))

1154+- Elixir ([#2619](https://github.com/helix-editor/helix/pull/2619))

1155+- CPON ([#2643](https://github.com/helix-editor/helix/pull/2643))

1156+- Textobjects queries for Erlang, Elixir, Gleam ([#2661](https://github.com/helix-editor/helix/pull/2661))

1157+- Capture rust closures as function textobjects ([4a27e2d](https://github.com/helix-editor/helix/commit/4a27e2d))

1158+- Heex ([#2800](https://github.com/helix-editor/helix/pull/2800), [#3170](https://github.com/helix-editor/helix/pull/3170))

1159+- Add `<<=` operator highlighting for Rust ([#2805](https://github.com/helix-editor/helix/pull/2805))

1160+- Fix comment injection in JavaScript/TypeScript ([#2763](https://github.com/helix-editor/helix/pull/2763))

1161+- Nickel ([#2859](https://github.com/helix-editor/helix/pull/2859))

1162+- Add `Rakefile` and `Gemfile` to Ruby file-types ([#2875](https://github.com/helix-editor/helix/pull/2875))

1163+- Erlang ([#2910](https://github.com/helix-editor/helix/pull/2910), [ac669ad](https://github.com/helix-editor/helix/commit/ac669ad))

1164+- Markdown ([#2910](https://github.com/helix-editor/helix/pull/2910), [#3108](https://github.com/helix-editor/helix/pull/3108), [#3400](https://github.com/helix-editor/helix/pull/3400))

1165+- Bash ([#2910](https://github.com/helix-editor/helix/pull/2910))

1166+- Rust ([#2910](https://github.com/helix-editor/helix/pull/2910), [#3397](https://github.com/helix-editor/helix/pull/3397))

1167+- Edoc ([#2910](https://github.com/helix-editor/helix/pull/2910))

1168+- HTML ([#2910](https://github.com/helix-editor/helix/pull/2910))

1169+- Make ([#2910](https://github.com/helix-editor/helix/pull/2910))

1170+- TSQ ([#2910](https://github.com/helix-editor/helix/pull/2910), [#2960](https://github.com/helix-editor/helix/pull/2960))

1171+- git-commit ([#2910](https://github.com/helix-editor/helix/pull/2910))

1172+- Use default fallback for Python indents ([9ae70cc](https://github.com/helix-editor/helix/commit/9ae70cc))

1173+- Add Haskell LSP roots ([#2954](https://github.com/helix-editor/helix/pull/2954))

1174+- Ledger ([#2936](https://github.com/helix-editor/helix/pull/2936), [#2988](https://github.com/helix-editor/helix/pull/2988))

1175+- Nickel ([#2987](https://github.com/helix-editor/helix/pull/2987))

1176+- JavaScript/TypeScript ([#2961](https://github.com/helix-editor/helix/pull/2961), [#3219](https://github.com/helix-editor/helix/pull/3219), [#3213](https://github.com/helix-editor/helix/pull/3213), [#3280](https://github.com/helix-editor/helix/pull/3280), [#3301](https://github.com/helix-editor/helix/pull/3301))

1177+- GLSL ([#3051](https://github.com/helix-editor/helix/pull/3051))

1178+- Fix locals tracking in Rust ([#3027](https://github.com/helix-editor/helix/pull/3027), [#3212](https://github.com/helix-editor/helix/pull/3212), [#3345](https://github.com/helix-editor/helix/pull/3345))

1179+- Verilog ([#3158](https://github.com/helix-editor/helix/pull/3158))

1180+- Ruby ([#3173](https://github.com/helix-editor/helix/pull/3173), [#3527](https://github.com/helix-editor/helix/pull/3527))

1181+- Svelte ([#3147](https://github.com/helix-editor/helix/pull/3147))

1182+- Add Elixir and HEEx comment textobjects ([#3179](https://github.com/helix-editor/helix/pull/3179))

1183+- Python ([#3103](https://github.com/helix-editor/helix/pull/3103), [#3201](https://github.com/helix-editor/helix/pull/3201), [#3284](https://github.com/helix-editor/helix/pull/3284))

1184+- PHP ([#3317](https://github.com/helix-editor/helix/pull/3317))

1185+- Latex ([#3370](https://github.com/helix-editor/helix/pull/3370))

1186+- Clojure ([#3387](https://github.com/helix-editor/helix/pull/3387))

1187+- Swift ([#3461](https://github.com/helix-editor/helix/pull/3461))

1188+- C# ([#3480](https://github.com/helix-editor/helix/pull/3480), [#3494](https://github.com/helix-editor/helix/pull/3494))

1189+- Org ([#3489](https://github.com/helix-editor/helix/pull/3489))

1190+- Elm ([#3497](https://github.com/helix-editor/helix/pull/3497))

1191+- Dart ([#3419](https://github.com/helix-editor/helix/pull/3419))

1192+- Julia ([#3507](https://github.com/helix-editor/helix/pull/3507))

1193+- Fix Rust textobjects ([#3590](https://github.com/helix-editor/helix/pull/3590))

1194+- C ([00d88e5](https://github.com/helix-editor/helix/commit/00d88e5))

1195+- Update Rust ([0ef0ef9](https://github.com/helix-editor/helix/commit/0ef0ef9))

1196+

1197+Packaging:

1198+

1199+- Add `rust-analyzer` to Nix flake devShell ([#2739](https://github.com/helix-editor/helix/pull/2739))

1200+- Add cachix information to the Nix flake ([#2999](https://github.com/helix-editor/helix/pull/2999))

1201+- Pass makeWrapperArgs to wrapProgram in the Nix flake ([#3003](https://github.com/helix-editor/helix/pull/3003))

1202+- Add a way to override which grammars are built by Nix ([#3141](https://github.com/helix-editor/helix/pull/3141))

1203+- Add a GitHub actions release for `aarch64-macos` ([#3137](https://github.com/helix-editor/helix/pull/3137))

1204+- Add shell auto-completions for Elvish ([#3331](https://github.com/helix-editor/helix/pull/3331))

1205+

1206+# 22.05 (2022-05-28)

1207+

1208+An even bigger shout out than usual to all the contributors - we had a whopping

1209+110 contributors in this release! That's more than double the number of

1210+contributors as last release!

1211+

1212+Check out some of the highlights in the [news section](https://helix-editor.com/news/release-22-05-highlights/).

1213+

1214+As usual, the following is a summary of each of the changes since the last release.

1215+For the full log, check out the [git log](https://github.com/helix-editor/helix/compare/22.03..22.05).

1216+

1217+Breaking Changes:

1218+

1219+- Removed `C-j`, `C-k` bindings from file picker ([#1792](https://github.com/helix-editor/helix/pull/1792))

1220+- Replaced `C-f` with `C-d` and `C-b` with `C-u` bindings in file picker ([#1792](https://github.com/helix-editor/helix/pull/1792))

1221+- `A-hjkl` bindings have been moved to `A-pion` ([#2205](https://github.com/helix-editor/helix/pull/2205))

1222+- `A-Left`/`A-Right` have been moved to `C-Left`/`C-Right` ([#2193](https://github.com/helix-editor/helix/pull/2193))

1223+

1224+Features:

1225+

1226+- The indentation mechanism has been reworked ([#1562](https://github.com/helix-editor/helix/pull/1562), [#1908](https://github.com/helix-editor/helix/pull/1908))

1227+- Configurable gutters ([#1967](https://github.com/helix-editor/helix/pull/1967))

1228+- Support for local language configuration ([#1249](https://github.com/helix-editor/helix/pull/1249))

1229+- Configurable themed rulers ([#2060](https://github.com/helix-editor/helix/pull/2060))

1230+- Render visible whitespace ([e6b865e](https://github.com/helix-editor/helix/commit/e6b865e), [#2322](https://github.com/helix-editor/helix/pull/2322), [#2331](https://github.com/helix-editor/helix/pull/2331))

1231+

1232+Commands:

1233+

1234+- Paragraph motion and textobject (`]p`, `[p`) ([#1627](https://github.com/helix-editor/helix/pull/1627), [#1956](https://github.com/helix-editor/helix/pull/1956), [#1969](https://github.com/helix-editor/helix/pull/1969), [#1992](https://github.com/helix-editor/helix/pull/1992), [#2226](https://github.com/helix-editor/helix/pull/2226))

1235+- `:buffer-next`, `:buffer-previous` ([#1940](https://github.com/helix-editor/helix/pull/1940))

1236+- `:set-language` to set the buffers language ([#1866](https://github.com/helix-editor/helix/pull/1866), [#1996](https://github.com/helix-editor/helix/pull/1996))

1237+- Command for picking files from the current working directory (`Space-F`) ([#1600](https://github.com/helix-editor/helix/pull/1600), [#2308](https://github.com/helix-editor/helix/pull/2308))

1238+- `:write!` which creates non-existent subdirectories ([#1839](https://github.com/helix-editor/helix/pull/1839))

1239+- Add `m` textobject that selects closest surrounding pair ([de15d70](https://github.com/helix-editor/helix/commit/de15d70), [76175db](https://github.com/helix-editor/helix/commit/76175db))

1240+- `:pipe` typable command for piping selections ([#1972](https://github.com/helix-editor/helix/pull/1972))

1241+- `extend_line_above` which extends to previous lines ([#2117](https://github.com/helix-editor/helix/pull/2117))

1242+- `set_line_ending` which replaces line endings ([#1871](https://github.com/helix-editor/helix/pull/1871))

1243+- `:get-option` for getting the current value of an option (`:get`) ([#2231](https://github.com/helix-editor/helix/pull/2231))

1244+- `:run-shell-command` which does not interact with selections ([#1682](https://github.com/helix-editor/helix/pull/1682))

1245+- `:reflow` which hard-wraps selected text ([#2128](https://github.com/helix-editor/helix/pull/2128))

1246+- `commit_undo_checkpoint` which adds an undo checkpoint ([#2115](https://github.com/helix-editor/helix/pull/2115))

1247+- `:log-open` which opens the log file ([#2422](https://github.com/helix-editor/helix/pull/2422))

1248+- `transpose_view` which transposes window splits ([#2461](https://github.com/helix-editor/helix/pull/2461))

1249+- View-swapping: `swap_view_right`, `swap_view_left`, `swap_view_up`, `swap_view_down` ([#2445](https://github.com/helix-editor/helix/pull/2445))

1250+- `shrink_to_line_bounds` which shrinks selections to line-bounds ([#2450](https://github.com/helix-editor/helix/pull/2450))

1251+

1252+Usability improvements and fixes:

1253+

1254+- Handle broken pipes when piping `hx --health` through `head` ([#1876](https://github.com/helix-editor/helix/pull/1876))

1255+- Fix for `copy_selection` on newlines ([ab7885e](https://github.com/helix-editor/helix/commit/ab7885e), [236c6b7](https://github.com/helix-editor/helix/commit/236c6b7))

1256+- Use `win32yank` clipboard provider on WSL2 ([#1912](https://github.com/helix-editor/helix/pull/1912))

1257+- Jump to the next number on the line before incrementing ([#1778](https://github.com/helix-editor/helix/pull/1778))

1258+- Fix start position of next search ([#1904](https://github.com/helix-editor/helix/pull/1904))

1259+- Use check and X marks for health check output ([#1918](https://github.com/helix-editor/helix/pull/1918))

1260+- Clear terminal after switching to alternate screens ([#1944](https://github.com/helix-editor/helix/pull/1944))

1261+- Fix `toggle_comments` command on multiple selections ([#1882](https://github.com/helix-editor/helix/pull/1882))

1262+- Apply `ui.gutter` theming to empty gutter spans ([#2032](https://github.com/helix-editor/helix/pull/2032))

1263+- Use checkboxes in `hx --health` output ([#1947](https://github.com/helix-editor/helix/pull/1947))

1264+- Pass unmapped keys through prompt regardless of modifiers ([764adbd](https://github.com/helix-editor/helix/commit/764adbd))

1265+- LSP: pull formatting options from config ([c18de0e](https://github.com/helix-editor/helix/commit/c18de0e))

1266+- LSP: provide `rootPath` ([84e799f](https://github.com/helix-editor/helix/commit/84e799f))

1267+- LSP: implement `workspace_folders` ([8adf0c1](https://github.com/helix-editor/helix/commit/8adf0c1))

1268+- LSP: fix auto-import ([#2088](https://github.com/helix-editor/helix/pull/2088))

1269+- Send active diagnostic to LSP when requesting code actions ([#2005](https://github.com/helix-editor/helix/pull/2005))

1270+- Prevent panic when parsing malformed LSP `PublishDiagnostic` ([#2160](https://github.com/helix-editor/helix/pull/2160))

1271+- Restore document state on completion cancel ([#2096](https://github.com/helix-editor/helix/pull/2096))

1272+- Only merge top-level array when merging `languages.toml` ([#2145](https://github.com/helix-editor/helix/pull/2145), [#2215](https://github.com/helix-editor/helix/pull/2215))

1273+- Fix open on multiline selection ([#2161](https://github.com/helix-editor/helix/pull/2161))

1274+- Allow re-binding `0` if it is not used in a count ([#2174](https://github.com/helix-editor/helix/pull/2174))

1275+- Fix `ctrl-u` behavior in insert mode ([#1957](https://github.com/helix-editor/helix/pull/1957))

1276+- Check LSP rename capabilities before sending rename action ([#2203](https://github.com/helix-editor/helix/pull/2203))

1277+- Register the `publish_diagnostics` LSP capability ([#2241](https://github.com/helix-editor/helix/pull/2241))

1278+- Fix paste direction for typed paste commands ([#2288](https://github.com/helix-editor/helix/pull/2288))

1279+- Improve handling of buffer-close ([#1397](https://github.com/helix-editor/helix/pull/1397))

1280+- Extend the tutor file ([#2133](https://github.com/helix-editor/helix/pull/2133))

1281+- Treat slashes as word separators in prompts ([#2315](https://github.com/helix-editor/helix/pull/2315))

1282+- Auto-complete directory members ([#1682](https://github.com/helix-editor/helix/pull/1682))

1283+- Allow disabling format-on-save as a global editor setting ([#2321](https://github.com/helix-editor/helix/pull/2321))

1284+- Wrap command palette in overlay ([#2378](https://github.com/helix-editor/helix/pull/2378))

1285+- Prevent selections from collapsing when inserting newlines ([#2414](https://github.com/helix-editor/helix/pull/2414))

1286+- Allow configuration of LSP request timeout ([#2405](https://github.com/helix-editor/helix/pull/2405))

1287+- Use debug console on Windows for DAP terminal ([#2294](https://github.com/helix-editor/helix/pull/2294))

1288+- Exclude cursor when deleting with `C-w` in insert mode ([#2431](https://github.com/helix-editor/helix/pull/2431))

1289+- Prevent panics from LSP parsing errors ([7ae6cad](https://github.com/helix-editor/helix/commit/7ae6cad))

1290+- Prevent panics from LSP responses without requests ([#2475](https://github.com/helix-editor/helix/pull/2475))

1291+- Fix scroll rate for documentation popups ([#2497](https://github.com/helix-editor/helix/pull/2497))

1292+- Support inserting into prompts from registers ([#2458](https://github.com/helix-editor/helix/pull/2458))

1293+- Separate theme scopes for diagnostic types ([#2437](https://github.com/helix-editor/helix/pull/2437))

1294+- Use `ui.menu` instead of `ui.statusline` for command completion menu theming ([82fb217](https://github.com/helix-editor/helix/commit/82fb217))

1295+- Panic when reloading a shrunk file ([#2506](https://github.com/helix-editor/helix/pull/2506))

1296+- Add theme key for picker separator ([#2523](https://github.com/helix-editor/helix/pull/2523))

1297+

1298+Themes:

1299+

1300+- Remove `ui.text` background from dark_plus ([#1950](https://github.com/helix-editor/helix/pull/1950))

1301+- Add `boo_berry` ([#1962](https://github.com/helix-editor/helix/pull/1962))

1302+- Update `dark_plus` markup colors ([#1989](https://github.com/helix-editor/helix/pull/1989))

1303+- Update `dark_plus` `tag` and `ui.menu.selected` colors ([#2014](https://github.com/helix-editor/helix/pull/2014))

1304+- Add `dracula_at_night` ([#2008](https://github.com/helix-editor/helix/pull/2008))

1305+- Improve `dracula` selection theming ([#2077](https://github.com/helix-editor/helix/pull/2077))

1306+- Remove dim attribute on `onedark` line-number gutter ([#2155](https://github.com/helix-editor/helix/pull/2155))

1307+- Add `tokyonight` ([#2162](https://github.com/helix-editor/helix/pull/2162))

1308+- Use border colors from the original `dark_plus` theme ([#2186](https://github.com/helix-editor/helix/pull/2186))

1309+- Add `autumn` ([#2212](https://github.com/helix-editor/helix/pull/2212), [#2270](https://github.com/helix-editor/helix/pull/2270), [#2531](https://github.com/helix-editor/helix/pull/2531))

1310+- Add `tokyonight_storm` ([#2240](https://github.com/helix-editor/helix/pull/2240))

1311+- Add `pop-dark` ([#2189](https://github.com/helix-editor/helix/pull/2189))

1312+- Fix `base16_terminal` theme using incorrect ansi-color ([#2279](https://github.com/helix-editor/helix/pull/2279))

1313+- Add `onelight` ([#2287](https://github.com/helix-editor/helix/pull/2287), [#2323](https://github.com/helix-editor/helix/pull/2323))

1314+- Add `ui.virtual` scopes to `onedark` theme ([3626e38](https://github.com/helix-editor/helix/commit/3626e38))

1315+- Add `night_owl` ([#2330](https://github.com/helix-editor/helix/pull/2330))

1316+- Use yellow foreground and red background for `monokai_pro_spectrum` ([#2433](https://github.com/helix-editor/helix/pull/2433))

1317+- Add `snazzy` ([#2473](https://github.com/helix-editor/helix/pull/2473))

1318+- Update `dark_plus` constructor color ([8e8d4ba](https://github.com/helix-editor/helix/commit/8e8d4ba))

1319+- Add `ui.menu` to the default theme ([e7e13dc](https://github.com/helix-editor/helix/commit/e7e13dc))

1320+- Add `ui.menu` to any themes missing the key ([9be810f](https://github.com/helix-editor/helix/commit/9be810f))

1321+- Add `catppuccin` ([#2546](https://github.com/helix-editor/helix/pull/2546), [7160e74](https://github.com/helix-editor/helix/commit/7160e74))

1322+

1323+LSP:

1324+

1325+- Use texlab for latex ([#1922](https://github.com/helix-editor/helix/pull/1922))

1326+- HTML ([#2018](https://github.com/helix-editor/helix/pull/2018))

1327+- JSON ([#2024](https://github.com/helix-editor/helix/pull/2024))

1328+- CSS ([#2025](https://github.com/helix-editor/helix/pull/2025))

1329+- PHP ([#2031](https://github.com/helix-editor/helix/pull/2031))

1330+- Swift ([#2033](https://github.com/helix-editor/helix/pull/2033))

1331+- OCaml ([#2035](https://github.com/helix-editor/helix/pull/2035))

1332+- Vue ([#2043](https://github.com/helix-editor/helix/pull/2043))

1333+- Yaml ([#2234](https://github.com/helix-editor/helix/pull/2234))

1334+- Vala ([#2243](https://github.com/helix-editor/helix/pull/2243))

1335+- TOML ([#2302](https://github.com/helix-editor/helix/pull/2302))

1336+- Java ([#2511](https://github.com/helix-editor/helix/pull/2511))

1337+- Lua ([#2560](https://github.com/helix-editor/helix/pull/2560))

1338+- Verilog ([#2552](https://github.com/helix-editor/helix/pull/2552))

1339+

1340+New Languages:

1341+

1342+- JSX ([#1906](https://github.com/helix-editor/helix/pull/1906), [a24fb17](https://github.com/helix-editor/helix/commit/a24fb17), [855e438](https://github.com/helix-editor/helix/commit/855e438), [#1921](https://github.com/helix-editor/helix/pull/1921))

1343+- Rust Object Notation (RON) ([#1925](https://github.com/helix-editor/helix/pull/1925))

1344+- R and R Markdown ([#1998](https://github.com/helix-editor/helix/pull/1998))

1345+- Swift ([#2033](https://github.com/helix-editor/helix/pull/2033))

1346+- EJS and ERB ([#2055](https://github.com/helix-editor/helix/pull/2055))

1347+- EEx ([9d095e0](https://github.com/helix-editor/helix/commit/9d095e0))

1348+- HEEx ([4836bb3](https://github.com/helix-editor/helix/commit/4836bb3), [#2149](https://github.com/helix-editor/helix/pull/2149))

1349+- SQL ([#2097](https://github.com/helix-editor/helix/pull/2097))

1350+- GDScript ([#1985](https://github.com/helix-editor/helix/pull/1985))

1351+- Nickel ([#2173](https://github.com/helix-editor/helix/pull/2173), [#2320](https://github.com/helix-editor/helix/pull/2320))

1352+- `go.mod` and `go.work` ([#2197](https://github.com/helix-editor/helix/pull/2197))

1353+- Nushell ([#2225](https://github.com/helix-editor/helix/pull/2225))

1354+- Vala ([#2243](https://github.com/helix-editor/helix/pull/2243))

1355+- Hare ([#2289](https://github.com/helix-editor/helix/pull/2289), [#2480](https://github.com/helix-editor/helix/pull/2480))

1356+- DeviceTree ([#2329](https://github.com/helix-editor/helix/pull/2329))

1357+- Cairo ([7387905](https://github.com/helix-editor/helix/commit/7387905))

1358+- CPON ([#2355](https://github.com/helix-editor/helix/pull/2355), [#2424](https://github.com/helix-editor/helix/pull/2424))

1359+- git-ignore ([#2397](https://github.com/helix-editor/helix/pull/2397))

1360+- git-attributes ([#2397](https://github.com/helix-editor/helix/pull/2397))

1361+- Odin ([#2399](https://github.com/helix-editor/helix/pull/2399), [#2464](https://github.com/helix-editor/helix/pull/2464))

1362+- Meson ([#2314](https://github.com/helix-editor/helix/pull/2314))

1363+- SSH Client Config ([#2498](https://github.com/helix-editor/helix/pull/2498))

1364+- Scheme ([d25bae8](https://github.com/helix-editor/helix/commit/d25bae8))

1365+- Verilog ([#2552](https://github.com/helix-editor/helix/pull/2552))

1366+

1367+Updated Languages and Queries:

1368+

1369+- Erlang ([e2a5071](https://github.com/helix-editor/helix/commit/e2a5071), [#2149](https://github.com/helix-editor/helix/pull/2149), [82da9bd](https://github.com/helix-editor/helix/commit/82da9bd))

1370+- Elixir ([1819478](https://github.com/helix-editor/helix/commit/1819478), [8c3c901](https://github.com/helix-editor/helix/commit/8c3c901), [4ac94a5](https://github.com/helix-editor/helix/commit/4ac94a5))

1371+- Gleam ([7cd6050](https://github.com/helix-editor/helix/commit/7cd6050), [45dd540](https://github.com/helix-editor/helix/commit/45dd540))

1372+- Bash ([#1917](https://github.com/helix-editor/helix/pull/1917))

1373+- JavaScript ([#2140](https://github.com/helix-editor/helix/pull/2140))

1374+- Ruby textobject queries ([#2143](https://github.com/helix-editor/helix/pull/2143))

1375+- Fix Golang textobject queries ([#2153](https://github.com/helix-editor/helix/pull/2153))

1376+- Add more bash and HCL file extensions ([#2201](https://github.com/helix-editor/helix/pull/2201))

1377+- Divide HCL and tfvars into separate languages ([#2244](https://github.com/helix-editor/helix/pull/2244))

1378+- Use JavaScript for `cjs` files ([#2387](https://github.com/helix-editor/helix/pull/2387))

1379+- Use Perl for `t` files ([#2395](https://github.com/helix-editor/helix/pull/2395))

1380+- Use `markup.list` scopes for lists ([#2401](https://github.com/helix-editor/helix/pull/2401))

1381+- Use PHP for `inc` files ([#2440](https://github.com/helix-editor/helix/pull/2440))

1382+- Improve Rust textobjects ([#2494](https://github.com/helix-editor/helix/pull/2494), [10463fe](https://github.com/helix-editor/helix/commit/10463fe))

1383+- Python ([#2451](https://github.com/helix-editor/helix/pull/2451))

1384+

1385+Packaging:

1386+

1387+- Use `builtins.fromTOML` in Nix Flake on Nix 2.6+ ([#1892](https://github.com/helix-editor/helix/pull/1892))

1388+- Shell auto-completion files are now available ([#2022](https://github.com/helix-editor/helix/pull/2022))

1389+- Create an AppImage on release ([#2089](https://github.com/helix-editor/helix/pull/2089))

1390+

11391# 22.03 (2022-03-28)

21392

31393A big shout out to all the contributors! We had 51 contributors in this release.

@@ -230,7 +1620,7 @@ Usability improvements and fixes:

2301620- File picker configuration ([#988](https://github.com/helix-editor/helix/pull/988))

2311621- Fix surround cursor position calculation ([#1183](https://github.com/helix-editor/helix/pull/1183))

2321622- Accept count for goto_window ([#1033](https://github.com/helix-editor/helix/pull/1033))

233−- Make kill_to_line_end behave like emacs ([#1235](https://github.com/helix-editor/helix/pull/1235))

1623+- Make kill_to_line_end behave like Emacs ([#1235](https://github.com/helix-editor/helix/pull/1235))

2341624- Only use a single documentation popup ([#1241](https://github.com/helix-editor/helix/pull/1241))

2351625- ui: popup: Don't allow scrolling past the end of content ([`3307f44c`](https://github.com/helix-editor/helix/commit/3307f44c))

2361626- Open files with spaces in filename, allow opening multiple files ([#1231](https://github.com/helix-editor/helix/pull/1231))

@@ -445,7 +1835,7 @@ Fixes:

4451835- A bunch of bugs regarding `o`/`O` behavior ([#281](https://github.com/helix-editor/helix/pull/281))

4461836- `~` expansion now works in file completion ([#284](https://github.com/helix-editor/helix/pull/284))

4471837- Several UI related overflow crashes ([#318](https://github.com/helix-editor/helix/pull/318))

448−- Fix a test failure occuring only on `test --release` ([`4f108ab1`](https://github.com/helix-editor/helix/commit/4f108ab1b2197809506bd7305ad903a3525eabfa))

1838+- Fix a test failure occurring only on `test --release` ([`4f108ab1`](https://github.com/helix-editor/helix/commit/4f108ab1b2197809506bd7305ad903a3525eabfa))

4491839- Prompts now support unicode input ([#295](https://github.com/helix-editor/helix/pull/295))

4501840- Completion documentation no longer overlaps the popup ([#322](https://github.com/helix-editor/helix/pull/322))

4511841- Fix a crash when trying to select `^` ([`9c534614`](https://github.com/helix-editor/helix/commit/9c53461429a3e72e3b1fb87d7ca490e168d7dee2))

@@ -466,9 +1856,9 @@ to distinguish it in bug reports..

4661856

4671857- The `runtime/` directory is now properly detected on binary releases and

4681858 on cargo run. `~/.config/helix/runtime` can also be used.

469−- Registers can now be selected via " (for example `"ay`)

1859+- Registers can now be selected via " (for example, `"ay`)

4701860- Support for Nix files was added

471−- Movement is now fully tested and matches kakoune implementation

1861+- Movement is now fully tested and matches Kakoune implementation

4721862- A per-file LSP symbol picker was added to space+s

4731863- Selection can be replaced with yanked text via R

4741864

@@ -492,7 +1882,7 @@ Keymaps:

4921882- The runtime/ can now optionally be embedded in the binary

4931883- Haskell syntax added

4941884- Window mode (ctrl-w) added

495−- Show matching bracket (vim's matchbrackets)

1885+- Show matching bracket (Vim's matchbrackets)

4961886- Themes now support style modifiers

4971887- First user contributed theme

4981888- Create a document if it doesn't exist yet on save

Cargo.lock+1660−351

@@ -2,26 +2,75 @@

22# It is not intended for manual editing.

33version = 3

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]]

15+name = "adler"

16+version = "1.0.2"

17+source = "registry+https://github.com/rust-lang/crates.io-index"

18+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"

19+

20+[[package]]

21+name = "ahash"

22+version = "0.8.6"

23+source = "registry+https://github.com/rust-lang/crates.io-index"

24+checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"

25+dependencies = [

26+ "cfg-if",

27+ "getrandom",

28+ "once_cell",

29+ "version_check",

30+ "zerocopy",

31+]

32+

533[[package]]

634name = "aho-corasick"

7−version = "0.7.18"

35+version = "1.1.2"

836source = "registry+https://github.com/rust-lang/crates.io-index"

9−checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"

37+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"

1038dependencies = [

1139 "memchr",

1240]

1341

42+[[package]]

43+name = "allocator-api2"

44+version = "0.2.14"

45+source = "registry+https://github.com/rust-lang/crates.io-index"

46+checksum = "c4f263788a35611fba42eb41ff811c5d0360c58b97402570312a350736e2542e"

47+

48+[[package]]

49+name = "android-tzdata"

50+version = "0.1.1"

51+source = "registry+https://github.com/rust-lang/crates.io-index"

52+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"

53+

54+[[package]]

55+name = "android_system_properties"

56+version = "0.1.5"

57+source = "registry+https://github.com/rust-lang/crates.io-index"

58+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"

59+dependencies = [

60+ "libc",

61+]

62+

1463[[package]]

1564name = "anyhow"

16−version = "1.0.56"

65+version = "1.0.76"

1766source = "registry+https://github.com/rust-lang/crates.io-index"

18−checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27"

67+checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355"

1968

2069[[package]]

2170name = "arc-swap"

22−version = "1.5.0"

71+version = "1.6.0"

2372source = "registry+https://github.com/rust-lang/crates.io-index"

24−checksum = "c5d78ce20460b82d3fa150275ed9d55e21064fc7951177baacf86a145c4a4b1f"

73+checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"

2574

2675[[package]]

2776name = "autocfg"

@@ -29,34 +78,64 @@ version = "1.1.0"

2978source = "registry+https://github.com/rust-lang/crates.io-index"

3079checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"

3180

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+

3296[[package]]

3397name = "bitflags"

3498version = "1.3.2"

3599source = "registry+https://github.com/rust-lang/crates.io-index"

36100checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

37101

102+[[package]]

103+name = "bitflags"

104+version = "2.4.1"

105+source = "registry+https://github.com/rust-lang/crates.io-index"

106+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"

107+

38108[[package]]

39109name = "bstr"

40−version = "0.2.17"

110+version = "1.8.0"

41111source = "registry+https://github.com/rust-lang/crates.io-index"

42−checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"

112+checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c"

43113dependencies = [

44− "lazy_static",

45114 "memchr",

46115 "regex-automata",

116+ "serde",

47117]

48118

49119[[package]]

50−name = "bytecount"

51−version = "0.6.2"

120+name = "btoi"

121+version = "0.4.3"

52122source = "registry+https://github.com/rust-lang/crates.io-index"

53−checksum = "72feb31ffc86498dacdbd0fcebb56138e7177a8cc5cea4516031d15ae85a742e"

123+checksum = "9dd6407f73a9b8b6162d8a2ef999fe6afd7cc15902ebf42c5cd296addf17e0ad"

124+dependencies = [

125+ "num-traits",

126+]

127+

128+[[package]]

129+name = "bumpalo"

130+version = "3.12.0"

131+source = "registry+https://github.com/rust-lang/crates.io-index"

132+checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"

54133

55134[[package]]

56135name = "bytes"

57−version = "1.1.0"

136+version = "1.4.0"

58137source = "registry+https://github.com/rust-lang/crates.io-index"

59−checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"

138+checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"

60139

61140[[package]]

62141name = "cassowary"

@@ -66,9 +145,12 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"

66145

67146[[package]]

68147name = "cc"

69−version = "1.0.73"

148+version = "1.0.84"

70149source = "registry+https://github.com/rust-lang/crates.io-index"

71−checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"

150+checksum = "0f8e7c90afad890484a21653d08b6e209ae34770fb5ee298f9c699fcc1e5c856"

151+dependencies = [

152+ "libc",

153+]

72154

73155[[package]]

74156name = "cfg-if"

@@ -89,25 +171,39 @@ dependencies = [

89171

90172[[package]]

91173name = "chrono"

92−version = "0.4.19"

174+version = "0.4.31"

93175source = "registry+https://github.com/rust-lang/crates.io-index"

94−checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"

176+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"

95177dependencies = [

96− "libc",

97− "num-integer",

178+ "android-tzdata",

179+ "iana-time-zone",

98180 "num-traits",

99− "winapi",

181+ "windows-targets 0.48.0",

100182]

101183

102184[[package]]

103185name = "clipboard-win"

104−version = "4.4.1"

186+version = "5.0.0"

105187source = "registry+https://github.com/rust-lang/crates.io-index"

106−checksum = "2f3e1238132dc01f081e1cbb9dace14e5ef4c3a51ee244bd982275fb514605db"

188+checksum = "c57002a5d9be777c1ef967e33674dac9ebd310d8893e4e3437b14d5f0f6372cc"

107189dependencies = [

108190 "error-code",

109− "str-buf",

110− "winapi",

191+]

192+

193+[[package]]

194+name = "clru"

195+version = "0.6.1"

196+source = "registry+https://github.com/rust-lang/crates.io-index"

197+checksum = "b8191fa7302e03607ff0e237d4246cc043ff5b3cb9409d995172ba3bea16b807"

198+

199+[[package]]

200+name = "codespan-reporting"

201+version = "0.11.1"

202+source = "registry+https://github.com/rust-lang/crates.io-index"

203+checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"

204+dependencies = [

205+ "termcolor",

206+ "unicode-width",

111207]

112208

113209[[package]]

@@ -119,24 +215,79 @@ dependencies = [

119215 "memchr",

120216]

121217

218+[[package]]

219+name = "core-foundation-sys"

220+version = "0.8.4"

221+source = "registry+https://github.com/rust-lang/crates.io-index"

222+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"

223+

224+[[package]]

225+name = "cov-mark"

226+version = "1.1.0"

227+source = "registry+https://github.com/rust-lang/crates.io-index"

228+checksum = "9ffa3d3e0138386cd4361f63537765cac7ee40698028844635a54495a92f67f3"

229+

230+[[package]]

231+name = "crc32fast"

232+version = "1.3.2"

233+source = "registry+https://github.com/rust-lang/crates.io-index"

234+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"

235+dependencies = [

236+ "cfg-if",

237+]

238+

239+[[package]]

240+name = "crossbeam-channel"

241+version = "0.5.8"

242+source = "registry+https://github.com/rust-lang/crates.io-index"

243+checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"

244+dependencies = [

245+ "cfg-if",

246+ "crossbeam-utils",

247+]

248+

249+[[package]]

250+name = "crossbeam-deque"

251+version = "0.8.3"

252+source = "registry+https://github.com/rust-lang/crates.io-index"

253+checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"

254+dependencies = [

255+ "cfg-if",

256+ "crossbeam-epoch",

257+ "crossbeam-utils",

258+]

259+

260+[[package]]

261+name = "crossbeam-epoch"

262+version = "0.9.15"

263+source = "registry+https://github.com/rust-lang/crates.io-index"

264+checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"

265+dependencies = [

266+ "autocfg",

267+ "cfg-if",

268+ "crossbeam-utils",

269+ "memoffset",

270+ "scopeguard",

271+]

272+

122273[[package]]

123274name = "crossbeam-utils"

124−version = "0.8.8"

275+version = "0.8.16"

125276source = "registry+https://github.com/rust-lang/crates.io-index"

126−checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38"

277+checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"

127278dependencies = [

128279 "cfg-if",

129− "lazy_static",

130280]

131281

132282[[package]]

133283name = "crossterm"

134−version = "0.23.2"

284+version = "0.27.0"

135285source = "registry+https://github.com/rust-lang/crates.io-index"

136−checksum = "a2102ea4f781910f8a5b98dd061f4c2023f479ce7bb1236330099ceb5a93cf17"

286+checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"

137287dependencies = [

138− "bitflags",

288+ "bitflags 2.4.1",

139289 "crossterm_winapi",

290+ "filedescriptor",

140291 "futures-core",

141292 "libc",

142293 "mio",

@@ -148,45 +299,74 @@ dependencies = [

148299

149300[[package]]

150301name = "crossterm_winapi"

151−version = "0.9.0"

302+version = "0.9.1"

152303source = "registry+https://github.com/rust-lang/crates.io-index"

153−checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c"

304+checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"

154305dependencies = [

155306 "winapi",

156307]

157308

158309[[package]]

159−name = "dirs-next"

160−version = "2.0.0"

310+name = "cxx"

311+version = "1.0.94"

161312source = "registry+https://github.com/rust-lang/crates.io-index"

162−checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"

313+checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"

163314dependencies = [

164− "cfg-if",

165− "dirs-sys-next",

315+ "cc",

316+ "cxxbridge-flags",

317+ "cxxbridge-macro",

318+ "link-cplusplus",

166319]

167320

168321[[package]]

169−name = "dirs-sys-next"

170−version = "0.1.2"

322+name = "cxx-build"

323+version = "1.0.94"

171324source = "registry+https://github.com/rust-lang/crates.io-index"

172−checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"

325+checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"

173326dependencies = [

174− "libc",

175− "redox_users",

176− "winapi",

327+ "cc",

328+ "codespan-reporting",

329+ "once_cell",

330+ "proc-macro2",

331+ "quote",

332+ "scratch",

333+ "syn 2.0.38",

177334]

178335

336+[[package]]

337+name = "cxxbridge-flags"

338+version = "1.0.94"

339+source = "registry+https://github.com/rust-lang/crates.io-index"

340+checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"

341+

342+[[package]]

343+name = "cxxbridge-macro"

344+version = "1.0.94"

345+source = "registry+https://github.com/rust-lang/crates.io-index"

346+checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"

347+dependencies = [

348+ "proc-macro2",

349+ "quote",

350+ "syn 2.0.38",

351+]

352+

353+[[package]]

354+name = "dunce"

355+version = "1.0.4"

356+source = "registry+https://github.com/rust-lang/crates.io-index"

357+checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"

358+

179359[[package]]

180360name = "either"

181−version = "1.6.1"

361+version = "1.8.1"

182362source = "registry+https://github.com/rust-lang/crates.io-index"

183−checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"

363+checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"

184364

185365[[package]]

186366name = "encoding_rs"

187−version = "0.8.31"

367+version = "0.8.33"

188368source = "registry+https://github.com/rust-lang/crates.io-index"

189−checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"

369+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"

190370dependencies = [

191371 "cfg-if",

192372]

@@ -201,62 +381,103 @@ dependencies = [

201381]

202382

203383[[package]]

204−name = "error-code"

205−version = "2.3.1"

384+name = "equivalent"

385+version = "1.0.0"

206386source = "registry+https://github.com/rust-lang/crates.io-index"

207−checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21"

387+checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"

388+

389+[[package]]

390+name = "errno"

391+version = "0.3.8"

392+source = "registry+https://github.com/rust-lang/crates.io-index"

393+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"

208394dependencies = [

209395 "libc",

210− "str-buf",

396+ "windows-sys 0.52.0",

211397]

212398

399+[[package]]

400+name = "error-code"

401+version = "3.0.0"

402+source = "registry+https://github.com/rust-lang/crates.io-index"

403+checksum = "281e452d3bad4005426416cdba5ccfd4f5c1280e10099e21db27f7c1c28347fc"

404+

213405[[package]]

214406name = "etcetera"

215−version = "0.3.2"

407+version = "0.8.0"

216408source = "registry+https://github.com/rust-lang/crates.io-index"

217−checksum = "016b04fd1e94fb833d432634245c9bb61cf1c7409668a0e7d4c3ab00c5172dec"

409+checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"

218410dependencies = [

219411 "cfg-if",

220− "dirs-next",

221− "thiserror",

412+ "home",

413+ "windows-sys 0.48.0",

222414]

223415

416+[[package]]

417+name = "faster-hex"

418+version = "0.9.0"

419+source = "registry+https://github.com/rust-lang/crates.io-index"

420+checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183"

421+dependencies = [

422+ "serde",

423+]

424+

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+

224431[[package]]

225432name = "fern"

226−version = "0.6.0"

433+version = "0.6.2"

227434source = "registry+https://github.com/rust-lang/crates.io-index"

228−checksum = "8c9a4820f0ccc8a7afd67c39a0f1a0f4b07ca1725164271a64939d7aeb9af065"

435+checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee"

229436dependencies = [

230437 "log",

231438]

232439

233440[[package]]

234−name = "fnv"

235−version = "1.0.7"

441+name = "filedescriptor"

442+version = "0.8.2"

236443source = "registry+https://github.com/rust-lang/crates.io-index"

237−checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"

444+checksum = "7199d965852c3bac31f779ef99cbb4537f80e952e2d6aa0ffeb30cce00f4f46e"

445+dependencies = [

446+ "libc",

447+ "thiserror",

448+ "winapi",

449+]

450+

451+[[package]]

452+name = "flate2"

453+version = "1.0.27"

454+source = "registry+https://github.com/rust-lang/crates.io-index"

455+checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"

456+dependencies = [

457+ "crc32fast",

458+ "miniz_oxide",

459+]

238460

239461[[package]]

240462name = "form_urlencoded"

241−version = "1.0.1"

463+version = "1.2.1"

242464source = "registry+https://github.com/rust-lang/crates.io-index"

243−checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"

465+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"

244466dependencies = [

245− "matches",

246467 "percent-encoding",

247468]

248469

249470[[package]]

250471name = "futures-core"

251−version = "0.3.21"

472+version = "0.3.30"

252473source = "registry+https://github.com/rust-lang/crates.io-index"

253−checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"

474+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"

254475

255476[[package]]

256477name = "futures-executor"

257−version = "0.3.21"

478+version = "0.3.29"

258479source = "registry+https://github.com/rust-lang/crates.io-index"

259−checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"

480+checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"

260481dependencies = [

261482 "futures-core",

262483 "futures-task",

@@ -265,15 +486,15 @@ dependencies = [

265486

266487[[package]]

267488name = "futures-task"

268−version = "0.3.21"

489+version = "0.3.30"

269490source = "registry+https://github.com/rust-lang/crates.io-index"

270−checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"

491+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"

271492

272493[[package]]

273494name = "futures-util"

274−version = "0.3.21"

495+version = "0.3.30"

275496source = "registry+https://github.com/rust-lang/crates.io-index"

276−checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"

497+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"

277498dependencies = [

278499 "futures-core",

279500 "futures-task",

@@ -283,97 +504,577 @@ dependencies = [

283504]

284505

285506[[package]]

286−name = "fuzzy-matcher"

287−version = "0.3.7"

507+name = "getrandom"

508+version = "0.2.9"

509+source = "registry+https://github.com/rust-lang/crates.io-index"

510+checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"

511+dependencies = [

512+ "cfg-if",

513+ "libc",

514+ "wasi",

515+]

516+

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]]

524+name = "gix"

525+version = "0.57.0"

526+source = "registry+https://github.com/rust-lang/crates.io-index"

527+checksum = "721c7497ab24b665ed5a1eb2b3526936aa60068e61ba260651f7e77c52feec69"

528+dependencies = [

529+ "gix-actor",

530+ "gix-commitgraph",

531+ "gix-config",

532+ "gix-date",

533+ "gix-diff",

534+ "gix-discover",

535+ "gix-features",

536+ "gix-fs",

537+ "gix-glob",

538+ "gix-hash",

539+ "gix-hashtable",

540+ "gix-lock",

541+ "gix-macros",

542+ "gix-object",

543+ "gix-odb",

544+ "gix-pack",

545+ "gix-path",

546+ "gix-ref",

547+ "gix-refspec",

548+ "gix-revision",

549+ "gix-revwalk",

550+ "gix-sec",

551+ "gix-tempfile",

552+ "gix-trace",

553+ "gix-traverse",

554+ "gix-url",

555+ "gix-utils",

556+ "gix-validate",

557+ "once_cell",

558+ "parking_lot",

559+ "smallvec",

560+ "thiserror",

561+ "unicode-normalization",

562+]

563+

564+[[package]]

565+name = "gix-actor"

566+version = "0.29.0"

288567source = "registry+https://github.com/rust-lang/crates.io-index"

289−checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94"

568+checksum = "886014c4865b93ce268f1d3eddd4fd3261242c3f3ee61eb36009f913016a9059"

290569dependencies = [

291− "thread_local",

570+ "bstr",

571+ "btoi",

572+ "gix-date",

573+ "itoa",

574+ "thiserror",

575+ "winnow 0.5.28",

292576]

293577

294578[[package]]

295−name = "getrandom"

296−version = "0.2.6"

579+name = "gix-chunk"

580+version = "0.4.6"

297581source = "registry+https://github.com/rust-lang/crates.io-index"

298−checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"

582+checksum = "2ade37ef69870de0ed966b97c57a3a947a22ff3482a52c3b99b205f77bcb08fb"

299583dependencies = [

300− "cfg-if",

584+ "thiserror",

585+]

586+

587+[[package]]

588+name = "gix-commitgraph"

589+version = "0.23.0"

590+source = "registry+https://github.com/rust-lang/crates.io-index"

591+checksum = "e7559ea9cefee188cd88b05afcc8e3ef7a3cb4a5c647bccf06b981e591b02b77"

592+dependencies = [

593+ "bstr",

594+ "gix-chunk",

595+ "gix-features",

596+ "gix-hash",

597+ "memmap2",

598+ "thiserror",

599+]

600+

601+[[package]]

602+name = "gix-config"

603+version = "0.33.0"

604+source = "registry+https://github.com/rust-lang/crates.io-index"

605+checksum = "9c35dc7f9c00a42bbc9cfa1ca2ec0a78ad1b76ff0736d3d35dfd612962244467"

606+dependencies = [

607+ "bstr",

608+ "gix-config-value",

609+ "gix-features",

610+ "gix-glob",

611+ "gix-path",

612+ "gix-ref",

613+ "gix-sec",

614+ "memchr",

615+ "once_cell",

616+ "smallvec",

617+ "thiserror",

618+ "unicode-bom",

619+ "winnow 0.5.28",

620+]

621+

622+[[package]]

623+name = "gix-config-value"

624+version = "0.14.2"

625+source = "registry+https://github.com/rust-lang/crates.io-index"

626+checksum = "39f388cb2396aee82d6f460a2e7770659bdf8854e9e5478f7d2b1324a9698284"

627+dependencies = [

628+ "bitflags 2.4.1",

629+ "bstr",

630+ "gix-path",

301631 "libc",

302− "wasi 0.10.2+wasi-snapshot-preview1",

632+ "thiserror",

633+]

634+

635+[[package]]

636+name = "gix-date"

637+version = "0.8.2"

638+source = "registry+https://github.com/rust-lang/crates.io-index"

639+checksum = "9d85f4a01e0d05c3de585e28bae514d4baf01655e3fc3f14ce6f30bf62405345"

640+dependencies = [

641+ "bstr",

642+ "itoa",

643+ "thiserror",

644+ "time",

645+]

646+

647+[[package]]

648+name = "gix-diff"

649+version = "0.39.0"

650+source = "registry+https://github.com/rust-lang/crates.io-index"

651+checksum = "ac0e75f5afd2f6c47c800b6b0a000a08045739d0450d20482e8faa42543f62d1"

652+dependencies = [

653+ "bstr",

654+ "gix-hash",

655+ "gix-object",

656+ "thiserror",

657+]

658+

659+[[package]]

660+name = "gix-discover"

661+version = "0.28.0"

662+source = "registry+https://github.com/rust-lang/crates.io-index"

663+checksum = "f0b63ce2ad81632ac1a84ac370f85a5e580c3261580bd85ea17ff35d3a0bba18"

664+dependencies = [

665+ "bstr",

666+ "dunce",

667+ "gix-hash",

668+ "gix-path",

669+ "gix-ref",

670+ "gix-sec",

671+ "thiserror",

672+]

673+

674+[[package]]

675+name = "gix-features"

676+version = "0.37.0"

677+source = "registry+https://github.com/rust-lang/crates.io-index"

678+checksum = "befe7edea299a824504b5acc96d7a3a538125b38c42f3a8379f6912a29c90c81"

679+dependencies = [

680+ "crc32fast",

681+ "flate2",

682+ "gix-hash",

683+ "gix-trace",

684+ "libc",

685+ "once_cell",

686+ "prodash",

687+ "sha1_smol",

688+ "thiserror",

689+ "walkdir",

690+]

691+

692+[[package]]

693+name = "gix-fs"

694+version = "0.9.0"

695+source = "registry+https://github.com/rust-lang/crates.io-index"

696+checksum = "007017ce93b819ea52c0ec68306f7d72212a2d307c3d70f1548c7141c015d0a1"

697+dependencies = [

698+ "gix-features",

699+]

700+

701+[[package]]

702+name = "gix-glob"

703+version = "0.15.0"

704+source = "registry+https://github.com/rust-lang/crates.io-index"

705+checksum = "61fb116c2516d3a1170e010118f639944a6389872c875a008960cdab2a44ac72"

706+dependencies = [

707+ "bitflags 2.4.1",

708+ "bstr",

709+ "gix-features",

710+ "gix-path",

711+]

712+

713+[[package]]

714+name = "gix-hash"

715+version = "0.14.0"

716+source = "registry+https://github.com/rust-lang/crates.io-index"

717+checksum = "c52c3170a17b6031833cd2eb4ad7bc23f2755d06e6e70f78dec21d42e8fe1b30"

718+dependencies = [

719+ "faster-hex",

720+ "thiserror",

721+]

722+

723+[[package]]

724+name = "gix-hashtable"

725+version = "0.5.0"

726+source = "registry+https://github.com/rust-lang/crates.io-index"

727+checksum = "40a838e6366a5e5b84668b6997ce0981b833136468e8ba949f424c0ef2927eba"

728+dependencies = [

729+ "gix-hash",

730+ "hashbrown 0.14.3",

731+ "parking_lot",

732+]

733+

734+[[package]]

735+name = "gix-lock"

736+version = "12.0.0"

737+source = "registry+https://github.com/rust-lang/crates.io-index"

738+checksum = "6cf112ddee94223c119a8534dad027740dc3aba3365ac5edeef8a7f6660c74db"

739+dependencies = [

740+ "gix-tempfile",

741+ "gix-utils",

742+ "thiserror",

743+]

744+

745+[[package]]

746+name = "gix-macros"

747+version = "0.1.2"

748+source = "registry+https://github.com/rust-lang/crates.io-index"

749+checksum = "fc207b64189cf71bcb17fc841ab99a5d63d0845546b611e2703ce467f659323a"

750+dependencies = [

751+ "proc-macro2",

752+ "quote",

753+ "syn 2.0.38",

754+]

755+

756+[[package]]

757+name = "gix-object"

758+version = "0.40.0"

759+source = "registry+https://github.com/rust-lang/crates.io-index"

760+checksum = "e4c77e47ffba92127faf632a841fce23d19547e269bd8b88e68961a70eab4e93"

761+dependencies = [

762+ "bstr",

763+ "btoi",

764+ "gix-actor",

765+ "gix-date",

766+ "gix-features",

767+ "gix-hash",

768+ "gix-validate",

769+ "itoa",

770+ "smallvec",

771+ "thiserror",

772+ "winnow 0.5.28",

773+]

774+

775+[[package]]

776+name = "gix-odb"

777+version = "0.56.0"

778+source = "registry+https://github.com/rust-lang/crates.io-index"

779+checksum = "a3254f2005cc7553ea78e85e816a09150c6f7a64e6b7627b8d1fdc56721bea73"

780+dependencies = [

781+ "arc-swap",

782+ "gix-date",

783+ "gix-features",

784+ "gix-hash",

785+ "gix-object",

786+ "gix-pack",

787+ "gix-path",

788+ "gix-quote",

789+ "parking_lot",

790+ "tempfile",

791+ "thiserror",

792+]

793+

794+[[package]]

795+name = "gix-pack"

796+version = "0.46.0"

797+source = "registry+https://github.com/rust-lang/crates.io-index"

798+checksum = "02ebc8cd657eec207d82d8f876ca402361308ecd3c87a47935b0299506257b4f"

799+dependencies = [

800+ "clru",

801+ "gix-chunk",

802+ "gix-features",

803+ "gix-hash",

804+ "gix-hashtable",

805+ "gix-object",

806+ "gix-path",

807+ "gix-tempfile",

808+ "memmap2",

809+ "parking_lot",

810+ "smallvec",

811+ "thiserror",

812+]

813+

814+[[package]]

815+name = "gix-path"

816+version = "0.10.2"

817+source = "registry+https://github.com/rust-lang/crates.io-index"

818+checksum = "10931652a3da126990ac93bce1b1c600cc99d7c268d712b6360ed52174ce1b68"

819+dependencies = [

820+ "bstr",

821+ "gix-trace",

822+ "home",

823+ "once_cell",

824+ "thiserror",

825+]

826+

827+[[package]]

828+name = "gix-quote"

829+version = "0.4.9"

830+source = "registry+https://github.com/rust-lang/crates.io-index"

831+checksum = "6c43530cb94a7759807e6f8d180e17ac9c65673b891645c6c433831dc0cf4342"

832+dependencies = [

833+ "bstr",

834+ "btoi",

835+ "thiserror",

836+]

837+

838+[[package]]

839+name = "gix-ref"

840+version = "0.40.0"

841+source = "registry+https://github.com/rust-lang/crates.io-index"

842+checksum = "baa951b3b850d6d1be4f900768e49af20b76bf9505beac22af723d57249a2f1d"

843+dependencies = [

844+ "gix-actor",

845+ "gix-date",

846+ "gix-features",

847+ "gix-fs",

848+ "gix-hash",

849+ "gix-lock",

850+ "gix-object",

851+ "gix-path",

852+ "gix-tempfile",

853+ "gix-validate",

854+ "memmap2",

855+ "thiserror",

856+ "winnow 0.5.28",

857+]

858+

859+[[package]]

860+name = "gix-refspec"

861+version = "0.21.0"

862+source = "registry+https://github.com/rust-lang/crates.io-index"

863+checksum = "88c61f849d58c06e3068a0b601cf10127d2a07cdad00a725ed66cf303f76f6b3"

864+dependencies = [

865+ "bstr",

866+ "gix-hash",

867+ "gix-revision",

868+ "gix-validate",

869+ "smallvec",

870+ "thiserror",

871+]

872+

873+[[package]]

874+name = "gix-revision"

875+version = "0.25.0"

876+source = "registry+https://github.com/rust-lang/crates.io-index"

877+checksum = "bcbbf91f4200c5c76802ef5f057b96f5a336827508881fe55a780be71a794d22"

878+dependencies = [

879+ "bstr",

880+ "gix-date",

881+ "gix-hash",

882+ "gix-hashtable",

883+ "gix-object",

884+ "gix-revwalk",

885+ "gix-trace",

886+ "thiserror",

887+]

888+

889+[[package]]

890+name = "gix-revwalk"

891+version = "0.11.0"

892+source = "registry+https://github.com/rust-lang/crates.io-index"

893+checksum = "33ab66354d83f70f2730391747d0c75f94ef3c3dd40ebde2e206db9faaf7a0a7"

894+dependencies = [

895+ "gix-commitgraph",

896+ "gix-date",

897+ "gix-hash",

898+ "gix-hashtable",

899+ "gix-object",

900+ "smallvec",

901+ "thiserror",

902+]

903+

904+[[package]]

905+name = "gix-sec"

906+version = "0.10.2"

907+source = "registry+https://github.com/rust-lang/crates.io-index"

908+checksum = "a9963f38a42144253ed4d571882d7db5ef644c12e6726e4b75135597cc9d0e1a"

909+dependencies = [

910+ "bitflags 2.4.1",

911+ "gix-path",

912+ "libc",

913+ "windows 0.52.0",

914+]

915+

916+[[package]]

917+name = "gix-tempfile"

918+version = "12.0.0"

919+source = "registry+https://github.com/rust-lang/crates.io-index"

920+checksum = "e76a494bd530e1a1309188ff971825a24f159c76c2db0bf71fa5dfb469a2c915"

921+dependencies = [

922+ "gix-fs",

923+ "libc",

924+ "once_cell",

925+ "parking_lot",

926+ "tempfile",

927+]

928+

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]]

936+name = "gix-traverse"

937+version = "0.36.0"

938+source = "registry+https://github.com/rust-lang/crates.io-index"

939+checksum = "8661fab39985c9214e56d81a63ceb5886ac948cec2fba76c39494d1e0e307ea8"

940+dependencies = [

941+ "gix-commitgraph",

942+ "gix-date",

943+ "gix-hash",

944+ "gix-hashtable",

945+ "gix-object",

946+ "gix-revwalk",

947+ "smallvec",

948+ "thiserror",

949+]

950+

951+[[package]]

952+name = "gix-url"

953+version = "0.26.0"

954+source = "registry+https://github.com/rust-lang/crates.io-index"

955+checksum = "10a0129c1e8b52736d7c5128300a4485dbc85863001371e2771ac1754bd89fd7"

956+dependencies = [

957+ "bstr",

958+ "gix-features",

959+ "gix-path",

960+ "home",

961+ "thiserror",

962+ "url",

963+]

964+

965+[[package]]

966+name = "gix-utils"

967+version = "0.1.7"

968+source = "registry+https://github.com/rust-lang/crates.io-index"

969+checksum = "ab9277a5e32e85d53f738096d872a4a9b76067ad471894ad31bd99c8fa2da1dc"

970+dependencies = [

971+ "fastrand",

972+]

973+

974+[[package]]

975+name = "gix-validate"

976+version = "0.8.2"

977+source = "registry+https://github.com/rust-lang/crates.io-index"

978+checksum = "f805ebbdbaa4bfd98e2ee43e6d14099b8a4d9141f5d7b8202fea4d48e44263e7"

979+dependencies = [

980+ "bstr",

981+ "thiserror",

303982]

304983

305984[[package]]

306985name = "globset"

307−version = "0.4.8"

986+version = "0.4.14"

308987source = "registry+https://github.com/rust-lang/crates.io-index"

309−checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd"

988+checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"

310989dependencies = [

311990 "aho-corasick",

312991 "bstr",

313− "fnv",

314992 "log",

315− "regex",

993+ "regex-automata",

994+ "regex-syntax",

316995]

317996

318997[[package]]

319998name = "grep-matcher"

320−version = "0.1.5"

999+version = "0.1.7"

3211000source = "registry+https://github.com/rust-lang/crates.io-index"

322−checksum = "6d27563c33062cd33003b166ade2bb4fd82db1fd6a86db764dfdad132d46c1cc"

1001+checksum = "47a3141a10a43acfedc7c98a60a834d7ba00dfe7bec9071cbfc19b55b292ac02"

3231002dependencies = [

3241003 "memchr",

3251004]

3261005

3271006[[package]]

3281007name = "grep-regex"

329−version = "0.1.9"

1008+version = "0.1.12"

3301009source = "registry+https://github.com/rust-lang/crates.io-index"

331−checksum = "121553c9768c363839b92fc2d7cdbbad44a3b70e8d6e7b1b72b05c977527bd06"

1010+checksum = "f748bb135ca835da5cbc67ca0e6955f968db9c5df74ca4f56b18e1ddbc68230d"

3321011dependencies = [

333− "aho-corasick",

3341012 "bstr",

3351013 "grep-matcher",

3361014 "log",

337− "regex",

1015+ "regex-automata",

3381016 "regex-syntax",

339− "thread_local",

3401017]

3411018

3421019[[package]]

3431020name = "grep-searcher"

344−version = "0.1.8"

1021+version = "0.1.13"

3451022source = "registry+https://github.com/rust-lang/crates.io-index"

346−checksum = "7fbdbde90ba52adc240d2deef7b6ad1f99f53142d074b771fe9b7bede6c4c23d"

1023+checksum = "ba536ae4f69bec62d8839584dd3153d3028ef31bb229f04e09fb5a9e5a193c54"

3471024dependencies = [

3481025 "bstr",

349− "bytecount",

3501026 "encoding_rs",

3511027 "encoding_rs_io",

3521028 "grep-matcher",

3531029 "log",

1030+ "memchr",

3541031 "memmap2",

3551032]

3561033

1034+[[package]]

1035+name = "hashbrown"

1036+version = "0.12.3"

1037+source = "registry+https://github.com/rust-lang/crates.io-index"

1038+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"

1039+

1040+[[package]]

1041+name = "hashbrown"

1042+version = "0.14.3"

1043+source = "registry+https://github.com/rust-lang/crates.io-index"

1044+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"

1045+dependencies = [

1046+ "ahash",

1047+ "allocator-api2",

1048+]

1049+

3571050[[package]]

3581051name = "helix-core"

359−version = "0.6.0"

1052+version = "23.10.0"

3601053dependencies = [

1054+ "ahash",

3611055 "arc-swap",

1056+ "bitflags 2.4.1",

3621057 "chrono",

1058+ "dunce",

3631059 "encoding_rs",

3641060 "etcetera",

1061+ "hashbrown 0.14.3",

3651062 "helix-loader",

1063+ "imara-diff",

1064+ "indoc",

3661065 "log",

1066+ "nucleo",

3671067 "once_cell",

1068+ "parking_lot",

3681069 "quickcheck",

3691070 "regex",

3701071 "ropey",

3711072 "serde",

3721073 "serde_json",

373− "similar",

3741074 "slotmap",

3751075 "smallvec",

3761076 "smartstring",

1077+ "textwrap",

3771078 "toml",

3781079 "tree-sitter",

3791080 "unicode-general-category",

@@ -383,7 +1084,7 @@ dependencies = [

3831084

3841085[[package]]

3851086name = "helix-dap"

386−version = "0.6.0"

1087+version = "23.10.0"

3871088dependencies = [

3881089 "anyhow",

3891090 "fern",

@@ -396,32 +1097,47 @@ dependencies = [

3961097 "which",

3971098]

3981099

1100+[[package]]

1101+name = "helix-event"

1102+version = "23.10.0"

1103+dependencies = [

1104+ "parking_lot",

1105+ "tokio",

1106+]

1107+

3991108[[package]]

4001109name = "helix-loader"

401−version = "0.6.0"

1110+version = "23.10.0"

4021111dependencies = [

4031112 "anyhow",

4041113 "cc",

1114+ "dunce",

4051115 "etcetera",

4061116 "libloading",

1117+ "log",

4071118 "once_cell",

4081119 "serde",

1120+ "tempfile",

4091121 "threadpool",

4101122 "toml",

4111123 "tree-sitter",

1124+ "which",

4121125]

4131126

4141127[[package]]

4151128name = "helix-lsp"

416−version = "0.6.0"

1129+version = "23.10.0"

4171130dependencies = [

4181131 "anyhow",

4191132 "futures-executor",

4201133 "futures-util",

1134+ "globset",

4211135 "helix-core",

422− "jsonrpc-core",

1136+ "helix-loader",

1137+ "helix-parsec",

4231138 "log",

4241139 "lsp-types",

1140+ "parking_lot",

4251141 "serde",

4261142 "serde_json",

4271143 "thiserror",

@@ -430,9 +1146,13 @@ dependencies = [

4301146 "which",

4311147]

4321148

1149+[[package]]

1150+name = "helix-parsec"

1151+version = "23.10.0"

1152+

4331153[[package]]

4341154name = "helix-term"

435−version = "0.6.0"

1155+version = "23.10.0"

4361156dependencies = [

4371157 "anyhow",

4381158 "arc-swap",

@@ -441,61 +1161,92 @@ dependencies = [

4411161 "crossterm",

4421162 "fern",

4431163 "futures-util",

444− "fuzzy-matcher",

4451164 "grep-regex",

4461165 "grep-searcher",

4471166 "helix-core",

4481167 "helix-dap",

1168+ "helix-event",

4491169 "helix-loader",

4501170 "helix-lsp",

4511171 "helix-tui",

1172+ "helix-vcs",

4521173 "helix-view",

4531174 "ignore",

1175+ "indoc",

1176+ "libc",

4541177 "log",

455− "num_cpus",

1178+ "nucleo",

4561179 "once_cell",

1180+ "open",

4571181 "pulldown-cmark",

458− "retain_mut",

4591182 "serde",

4601183 "serde_json",

4611184 "signal-hook",

4621185 "signal-hook-tokio",

1186+ "smallvec",

1187+ "tempfile",

4631188 "tokio",

4641189 "tokio-stream",

4651190 "toml",

1191+ "url",

4661192 "which",

4671193]

4681194

4691195[[package]]

4701196name = "helix-tui"

471−version = "0.6.0"

1197+version = "23.10.0"

4721198dependencies = [

473− "bitflags",

1199+ "bitflags 2.4.1",

4741200 "cassowary",

4751201 "crossterm",

4761202 "helix-core",

4771203 "helix-view",

1204+ "log",

1205+ "once_cell",

4781206 "serde",

1207+ "termini",

4791208 "unicode-segmentation",

4801209]

4811210

1211+[[package]]

1212+name = "helix-vcs"

1213+version = "23.10.0"

1214+dependencies = [

1215+ "anyhow",

1216+ "arc-swap",

1217+ "gix",

1218+ "helix-core",

1219+ "helix-event",

1220+ "imara-diff",

1221+ "log",

1222+ "parking_lot",

1223+ "tempfile",

1224+ "tokio",

1225+]

1226+

4821227[[package]]

4831228name = "helix-view"

484−version = "0.6.0"

1229+version = "23.10.0"

4851230dependencies = [

4861231 "anyhow",

4871232 "arc-swap",

488− "bitflags",

1233+ "bitflags 2.4.1",

4891234 "chardetng",

4901235 "clipboard-win",

4911236 "crossterm",

4921237 "futures-util",

4931238 "helix-core",

4941239 "helix-dap",

1240+ "helix-event",

1241+ "helix-loader",

4951242 "helix-lsp",

4961243 "helix-tui",

1244+ "helix-vcs",

1245+ "libc",

4971246 "log",

4981247 "once_cell",

1248+ "parking_lot",

1249+ "rustix",

4991250 "serde",

5001251 "serde_json",

5011252 "slotmap",

@@ -508,88 +1259,168 @@ dependencies = [

5081259

5091260[[package]]

5101261name = "hermit-abi"

511−version = "0.1.19"

1262+version = "0.2.6"

5121263source = "registry+https://github.com/rust-lang/crates.io-index"

513−checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"

1264+checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"

5141265dependencies = [

5151266 "libc",

5161267]

5171268

1269+[[package]]

1270+name = "home"

1271+version = "0.5.5"

1272+source = "registry+https://github.com/rust-lang/crates.io-index"

1273+checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"

1274+dependencies = [

1275+ "windows-sys 0.48.0",

1276+]

1277+

1278+[[package]]

1279+name = "iana-time-zone"

1280+version = "0.1.56"

1281+source = "registry+https://github.com/rust-lang/crates.io-index"

1282+checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"

1283+dependencies = [

1284+ "android_system_properties",

1285+ "core-foundation-sys",

1286+ "iana-time-zone-haiku",

1287+ "js-sys",

1288+ "wasm-bindgen",

1289+ "windows 0.48.0",

1290+]

1291+

1292+[[package]]

1293+name = "iana-time-zone-haiku"

1294+version = "0.1.1"

1295+source = "registry+https://github.com/rust-lang/crates.io-index"

1296+checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"

1297+dependencies = [

1298+ "cxx",

1299+ "cxx-build",

1300+]

1301+

5181302[[package]]

5191303name = "idna"

520−version = "0.2.3"

1304+version = "0.5.0"

5211305source = "registry+https://github.com/rust-lang/crates.io-index"

522−checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"

1306+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"

5231307dependencies = [

524− "matches",

5251308 "unicode-bidi",

5261309 "unicode-normalization",

5271310]

5281311

5291312[[package]]

5301313name = "ignore"

531−version = "0.4.18"

1314+version = "0.4.21"

5321315source = "registry+https://github.com/rust-lang/crates.io-index"

533−checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d"

1316+checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060"

5341317dependencies = [

535− "crossbeam-utils",

1318+ "crossbeam-deque",

5361319 "globset",

537− "lazy_static",

5381320 "log",

5391321 "memchr",

540− "regex",

1322+ "regex-automata",

5411323 "same-file",

542− "thread_local",

5431324 "walkdir",

5441325 "winapi-util",

5451326]

5461327

5471328[[package]]

548−name = "itoa"

549−version = "1.0.1"

1329+name = "imara-diff"

1330+version = "0.1.5"

5501331source = "registry+https://github.com/rust-lang/crates.io-index"

551−checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"

1332+checksum = "e98c1d0ad70fc91b8b9654b1f33db55e59579d3b3de2bffdced0fdb810570cb8"

1333+dependencies = [

1334+ "ahash",

1335+ "hashbrown 0.12.3",

1336+]

5521337

5531338[[package]]

554−name = "jsonrpc-core"

555−version = "18.0.0"

1339+name = "indexmap"

1340+version = "2.0.0"

5561341source = "registry+https://github.com/rust-lang/crates.io-index"

557−checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb"

1342+checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"

5581343dependencies = [

559− "futures-util",

560− "log",

561− "serde",

562− "serde_derive",

563− "serde_json",

1344+ "equivalent",

1345+ "hashbrown 0.14.3",

5641346]

5651347

5661348[[package]]

567−name = "lazy_static"

568−version = "1.4.0"

1349+name = "indoc"

1350+version = "2.0.4"

1351+source = "registry+https://github.com/rust-lang/crates.io-index"

1352+checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"

1353+

1354+[[package]]

1355+name = "is-docker"

1356+version = "0.2.0"

5691357source = "registry+https://github.com/rust-lang/crates.io-index"

570−checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

1358+checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3"

1359+dependencies = [

1360+ "once_cell",

1361+]

1362+

1363+[[package]]

1364+name = "is-wsl"

1365+version = "0.4.0"

1366+source = "registry+https://github.com/rust-lang/crates.io-index"

1367+checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5"

1368+dependencies = [

1369+ "is-docker",

1370+ "once_cell",

1371+]

1372+

1373+[[package]]

1374+name = "itoa"

1375+version = "1.0.6"

1376+source = "registry+https://github.com/rust-lang/crates.io-index"

1377+checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"

1378+

1379+[[package]]

1380+name = "js-sys"

1381+version = "0.3.61"

1382+source = "registry+https://github.com/rust-lang/crates.io-index"

1383+checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"

1384+dependencies = [

1385+ "wasm-bindgen",

1386+]

5711387

5721388[[package]]

5731389name = "libc"

574−version = "0.2.121"

1390+version = "0.2.151"

5751391source = "registry+https://github.com/rust-lang/crates.io-index"

576−checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f"

1392+checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"

5771393

5781394[[package]]

5791395name = "libloading"

580−version = "0.7.3"

1396+version = "0.8.1"

5811397source = "registry+https://github.com/rust-lang/crates.io-index"

582−checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd"

1398+checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"

5831399dependencies = [

5841400 "cfg-if",

585− "winapi",

1401+ "windows-sys 0.48.0",

1402+]

1403+

1404+[[package]]

1405+name = "link-cplusplus"

1406+version = "1.0.8"

1407+source = "registry+https://github.com/rust-lang/crates.io-index"

1408+checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"

1409+dependencies = [

1410+ "cc",

5861411]

5871412

1413+[[package]]

1414+name = "linux-raw-sys"

1415+version = "0.4.11"

1416+source = "registry+https://github.com/rust-lang/crates.io-index"

1417+checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"

1418+

5881419[[package]]

5891420name = "lock_api"

590−version = "0.4.7"

1421+version = "0.4.9"

5911422source = "registry+https://github.com/rust-lang/crates.io-index"

592−checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"

1423+checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"

5931424dependencies = [

5941425 "autocfg",

5951426 "scopeguard",

@@ -597,119 +1428,149 @@ dependencies = [

5971428

5981429[[package]]

5991430name = "log"

600−version = "0.4.16"

1431+version = "0.4.20"

6011432source = "registry+https://github.com/rust-lang/crates.io-index"

602−checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8"

603−dependencies = [

604− "cfg-if",

605−]

1433+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"

6061434

6071435[[package]]

6081436name = "lsp-types"

609−version = "0.93.0"

1437+version = "0.95.0"

6101438source = "registry+https://github.com/rust-lang/crates.io-index"

611−checksum = "70c74e2173b2b31f8655d33724b4b45ac13f439386f66290f539c22b144c2212"

1439+checksum = "158c1911354ef73e8fe42da6b10c0484cb65c7f1007f28022e847706c1ab6984"

6121440dependencies = [

613− "bitflags",

1441+ "bitflags 1.3.2",

6141442 "serde",

6151443 "serde_json",

6161444 "serde_repr",

6171445 "url",

6181446]

6191447

620−[[package]]

621−name = "matches"

622−version = "0.1.9"

623−source = "registry+https://github.com/rust-lang/crates.io-index"

624−checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"

625−

6261448[[package]]

6271449name = "memchr"

628−version = "2.4.1"

1450+version = "2.6.3"

6291451source = "registry+https://github.com/rust-lang/crates.io-index"

630−checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"

1452+checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"

6311453

6321454[[package]]

6331455name = "memmap2"

634−version = "0.3.1"

1456+version = "0.9.0"

6351457source = "registry+https://github.com/rust-lang/crates.io-index"

636−checksum = "00b6c2ebff6180198788f5db08d7ce3bc1d0b617176678831a7510825973e357"

1458+checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375"

6371459dependencies = [

6381460 "libc",

6391461]

6401462

6411463[[package]]

642−name = "mio"

643−version = "0.8.2"

1464+name = "memoffset"

1465+version = "0.9.0"

6441466source = "registry+https://github.com/rust-lang/crates.io-index"

645−checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9"

1467+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"

6461468dependencies = [

647− "libc",

648− "log",

649− "miow",

650− "ntapi",

651− "wasi 0.11.0+wasi-snapshot-preview1",

652− "winapi",

1469+ "autocfg",

6531470]

6541471

6551472[[package]]

656−name = "miow"

657−version = "0.3.7"

1473+name = "miniz_oxide"

1474+version = "0.7.1"

6581475source = "registry+https://github.com/rust-lang/crates.io-index"

659−checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"

1476+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"

6601477dependencies = [

661− "winapi",

1478+ "adler",

1479+]

1480+

1481+[[package]]

1482+name = "mio"

1483+version = "0.8.9"

1484+source = "registry+https://github.com/rust-lang/crates.io-index"

1485+checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"

1486+dependencies = [

1487+ "libc",

1488+ "log",

1489+ "wasi",

1490+ "windows-sys 0.48.0",

6621491]

6631492

6641493[[package]]

665−name = "ntapi"

666−version = "0.3.7"

1494+name = "nucleo"

1495+version = "0.2.1"

6671496source = "registry+https://github.com/rust-lang/crates.io-index"

668−checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f"

1497+checksum = "ae5331f4bcce475cf28cb29c95366c3091af4b0aa7703f1a6bc858f29718fdf3"

6691498dependencies = [

670− "winapi",

1499+ "nucleo-matcher",

1500+ "parking_lot",

1501+ "rayon",

6711502]

6721503

6731504[[package]]

674−name = "num-integer"

675−version = "0.1.44"

1505+name = "nucleo-matcher"

1506+version = "0.2.0"

6761507source = "registry+https://github.com/rust-lang/crates.io-index"

677−checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"

1508+checksum = "1b702b402fe286162d1f00b552a046ce74365d2ac473a2607ff36ba650f9bd57"

6781509dependencies = [

679− "autocfg",

680− "num-traits",

1510+ "cov-mark",

1511+ "memchr",

1512+ "unicode-segmentation",

6811513]

6821514

6831515[[package]]

6841516name = "num-traits"

685−version = "0.2.14"

1517+version = "0.2.15"

6861518source = "registry+https://github.com/rust-lang/crates.io-index"

687−checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"

1519+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"

6881520dependencies = [

6891521 "autocfg",

6901522]

6911523

6921524[[package]]

6931525name = "num_cpus"

694−version = "1.13.1"

1526+version = "1.15.0"

6951527source = "registry+https://github.com/rust-lang/crates.io-index"

696−checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"

1528+checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"

6971529dependencies = [

6981530 "hermit-abi",

6991531 "libc",

7001532]

7011533

1534+[[package]]

1535+name = "num_threads"

1536+version = "0.1.6"

1537+source = "registry+https://github.com/rust-lang/crates.io-index"

1538+checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"

1539+dependencies = [

1540+ "libc",

1541+]

1542+

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+

7021552[[package]]

7031553name = "once_cell"

704−version = "1.10.0"

1554+version = "1.19.0"

1555+source = "registry+https://github.com/rust-lang/crates.io-index"

1556+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"

1557+

1558+[[package]]

1559+name = "open"

1560+version = "5.0.1"

7051561source = "registry+https://github.com/rust-lang/crates.io-index"

706−checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"

1562+checksum = "90878fb664448b54c4e592455ad02831e23a3f7e157374a8b95654731aac7349"

1563+dependencies = [

1564+ "is-wsl",

1565+ "libc",

1566+ "pathdiff",

1567+]

7071568

7081569[[package]]

7091570name = "parking_lot"

710−version = "0.12.0"

1571+version = "0.12.1"

7111572source = "registry+https://github.com/rust-lang/crates.io-index"

712−checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"

1573+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"

7131574dependencies = [

7141575 "lock_api",

7151576 "parking_lot_core",

@@ -717,28 +1578,34 @@ dependencies = [

7171578

7181579[[package]]

7191580name = "parking_lot_core"

720−version = "0.9.2"

1581+version = "0.9.7"

7211582source = "registry+https://github.com/rust-lang/crates.io-index"

722−checksum = "995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37"

1583+checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"

7231584dependencies = [

7241585 "cfg-if",

7251586 "libc",

726− "redox_syscall",

1587+ "redox_syscall 0.2.16",

7271588 "smallvec",

728− "windows-sys",

1589+ "windows-sys 0.45.0",

7291590]

7301591

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+

7311598[[package]]

7321599name = "percent-encoding"

733−version = "2.1.0"

1600+version = "2.3.1"

7341601source = "registry+https://github.com/rust-lang/crates.io-index"

735−checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"

1602+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"

7361603

7371604[[package]]

7381605name = "pin-project-lite"

739−version = "0.2.8"

1606+version = "0.2.12"

7401607source = "registry+https://github.com/rust-lang/crates.io-index"

741−checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c"

1608+checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05"

7421609

7431610[[package]]

7441611name = "pin-utils"

@@ -748,20 +1615,26 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"

7481615

7491616[[package]]

7501617name = "proc-macro2"

751−version = "1.0.36"

1618+version = "1.0.69"

7521619source = "registry+https://github.com/rust-lang/crates.io-index"

753−checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"

1620+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"

7541621dependencies = [

755− "unicode-xid",

1622+ "unicode-ident",

7561623]

7571624

1625+[[package]]

1626+name = "prodash"

1627+version = "28.0.0"

1628+source = "registry+https://github.com/rust-lang/crates.io-index"

1629+checksum = "744a264d26b88a6a7e37cbad97953fa233b94d585236310bcbc88474b4092d79"

1630+

7581631[[package]]

7591632name = "pulldown-cmark"

760−version = "0.9.1"

1633+version = "0.9.3"

7611634source = "registry+https://github.com/rust-lang/crates.io-index"

762−checksum = "34f197a544b0c9ab3ae46c359a7ec9cbbb5c7bf97054266fecb7ead794a181d6"

1635+checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998"

7631636dependencies = [

764− "bitflags",

1637+ "bitflags 1.3.2",

7651638 "memchr",

7661639 "unicase",

7671640]

@@ -777,9 +1650,9 @@ dependencies = [

7771650

7781651[[package]]

7791652name = "quote"

780−version = "1.0.17"

1653+version = "1.0.29"

7811654source = "registry+https://github.com/rust-lang/crates.io-index"

782−checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58"

1655+checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"

7831656dependencies = [

7841657 "proc-macro2",

7851658]

@@ -795,77 +1668,116 @@ dependencies = [

7951668

7961669[[package]]

7971670name = "rand_core"

798−version = "0.6.3"

1671+version = "0.6.4"

7991672source = "registry+https://github.com/rust-lang/crates.io-index"

800−checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"

1673+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"

8011674dependencies = [

8021675 "getrandom",

8031676]

8041677

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+

8051700[[package]]

8061701name = "redox_syscall"

807−version = "0.2.13"

1702+version = "0.2.16"

8081703source = "registry+https://github.com/rust-lang/crates.io-index"

809−checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"

1704+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"

8101705dependencies = [

811− "bitflags",

1706+ "bitflags 1.3.2",

8121707]

8131708

8141709[[package]]

815−name = "redox_users"

816−version = "0.4.3"

1710+name = "redox_syscall"

1711+version = "0.4.1"

8171712source = "registry+https://github.com/rust-lang/crates.io-index"

818−checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"

1713+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"

8191714dependencies = [

820− "getrandom",

821− "redox_syscall",

822− "thiserror",

1715+ "bitflags 1.3.2",

8231716]

8241717

8251718[[package]]

8261719name = "regex"

827−version = "1.5.5"

1720+version = "1.10.2"

8281721source = "registry+https://github.com/rust-lang/crates.io-index"

829−checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"

1722+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"

8301723dependencies = [

8311724 "aho-corasick",

8321725 "memchr",

1726+ "regex-automata",

8331727 "regex-syntax",

8341728]

8351729

8361730[[package]]

8371731name = "regex-automata"

838−version = "0.1.10"

1732+version = "0.4.3"

8391733source = "registry+https://github.com/rust-lang/crates.io-index"

840−checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"

1734+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"

1735+dependencies = [

1736+ "aho-corasick",

1737+ "memchr",

1738+ "regex-syntax",

1739+]

8411740

8421741[[package]]

8431742name = "regex-syntax"

844−version = "0.6.25"

845−source = "registry+https://github.com/rust-lang/crates.io-index"

846−checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"

847−

848−[[package]]

849−name = "retain_mut"

850−version = "0.1.7"

1743+version = "0.8.2"

8511744source = "registry+https://github.com/rust-lang/crates.io-index"

852−checksum = "8c31b5c4033f8fdde8700e4657be2c497e7288f01515be52168c631e2e4d4086"

1745+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"

8531746

8541747[[package]]

8551748name = "ropey"

856−version = "1.4.1"

1749+version = "1.6.1"

8571750source = "registry+https://github.com/rust-lang/crates.io-index"

858−checksum = "fa0dd9b26e2a102b33d400b7b7d196c81a4014eb96eda90b1c5b48d7215d9633"

1751+checksum = "93411e420bcd1a75ddd1dc3caf18c23155eda2c090631a85af21ba19e97093b5"

8591752dependencies = [

8601753 "smallvec",

8611754 "str_indices",

8621755]

8631756

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]]

1764+name = "rustix"

1765+version = "0.38.28"

1766+source = "registry+https://github.com/rust-lang/crates.io-index"

1767+checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"

1768+dependencies = [

1769+ "bitflags 2.4.1",

1770+ "errno",

1771+ "libc",

1772+ "linux-raw-sys",

1773+ "windows-sys 0.52.0",

1774+]

1775+

8641776[[package]]

8651777name = "ryu"

866−version = "1.0.9"

1778+version = "1.0.13"

8671779source = "registry+https://github.com/rust-lang/crates.io-index"

868−checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"

1780+checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"

8691781

8701782[[package]]

8711783name = "same-file"

@@ -882,31 +1794,37 @@ version = "1.1.0"

8821794source = "registry+https://github.com/rust-lang/crates.io-index"

8831795checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"

8841796

1797+[[package]]

1798+name = "scratch"

1799+version = "1.0.5"

1800+source = "registry+https://github.com/rust-lang/crates.io-index"

1801+checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"

1802+

8851803[[package]]

8861804name = "serde"

887−version = "1.0.136"

1805+version = "1.0.193"

8881806source = "registry+https://github.com/rust-lang/crates.io-index"

889−checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"

1807+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"

8901808dependencies = [

8911809 "serde_derive",

8921810]

8931811

8941812[[package]]

8951813name = "serde_derive"

896−version = "1.0.136"

1814+version = "1.0.193"

8971815source = "registry+https://github.com/rust-lang/crates.io-index"

898−checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"

1816+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"

8991817dependencies = [

9001818 "proc-macro2",

9011819 "quote",

902− "syn",

1820+ "syn 2.0.38",

9031821]

9041822

9051823[[package]]

9061824name = "serde_json"

907−version = "1.0.79"

1825+version = "1.0.108"

9081826source = "registry+https://github.com/rust-lang/crates.io-index"

909−checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95"

1827+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"

9101828dependencies = [

9111829 "itoa",

9121830 "ryu",

@@ -915,20 +1833,35 @@ dependencies = [

9151833

9161834[[package]]

9171835name = "serde_repr"

918−version = "0.1.7"

1836+version = "0.1.12"

9191837source = "registry+https://github.com/rust-lang/crates.io-index"

920−checksum = "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5"

1838+checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"

9211839dependencies = [

9221840 "proc-macro2",

9231841 "quote",

924− "syn",

1842+ "syn 2.0.38",

1843+]

1844+

1845+[[package]]

1846+name = "serde_spanned"

1847+version = "0.6.3"

1848+source = "registry+https://github.com/rust-lang/crates.io-index"

1849+checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"

1850+dependencies = [

1851+ "serde",

9251852]

9261853

1854+[[package]]

1855+name = "sha1_smol"

1856+version = "1.0.0"

1857+source = "registry+https://github.com/rust-lang/crates.io-index"

1858+checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"

1859+

9271860[[package]]

9281861name = "signal-hook"

929−version = "0.3.13"

1862+version = "0.3.17"

9301863source = "registry+https://github.com/rust-lang/crates.io-index"

931−checksum = "647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d"

1864+checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"

9321865dependencies = [

9331866 "libc",

9341867 "signal-hook-registry",

@@ -947,9 +1880,9 @@ dependencies = [

9471880

9481881[[package]]

9491882name = "signal-hook-registry"

950−version = "1.4.0"

1883+version = "1.4.1"

9511884source = "registry+https://github.com/rust-lang/crates.io-index"

952−checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"

1885+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"

9531886dependencies = [

9541887 "libc",

9551888]

@@ -966,32 +1899,29 @@ dependencies = [

9661899 "tokio",

9671900]

9681901

969−[[package]]

970−name = "similar"

971−version = "2.1.0"

972−source = "registry+https://github.com/rust-lang/crates.io-index"

973−checksum = "2e24979f63a11545f5f2c60141afe249d4f19f84581ea2138065e400941d83d3"

974−

9751902[[package]]

9761903name = "slab"

977−version = "0.4.6"

1904+version = "0.4.8"

9781905source = "registry+https://github.com/rust-lang/crates.io-index"

979−checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"

1906+checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"

1907+dependencies = [

1908+ "autocfg",

1909+]

9801910

9811911[[package]]

9821912name = "slotmap"

983−version = "1.0.6"

1913+version = "1.0.7"

9841914source = "registry+https://github.com/rust-lang/crates.io-index"

985−checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342"

1915+checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a"

9861916dependencies = [

9871917 "version_check",

9881918]

9891919

9901920[[package]]

9911921name = "smallvec"

992−version = "1.8.0"

1922+version = "1.11.2"

9931923source = "registry+https://github.com/rust-lang/crates.io-index"

994−checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"

1924+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"

9951925

9961926[[package]]

9971927name = "smartstring"

@@ -1004,14 +1934,20 @@ dependencies = [

10041934 "version_check",

10051935]

10061936

1937+[[package]]

1938+name = "smawk"

1939+version = "0.3.1"

1940+source = "registry+https://github.com/rust-lang/crates.io-index"

1941+checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043"

1942+

10071943[[package]]

10081944name = "socket2"

1009−version = "0.4.4"

1945+version = "0.5.5"

10101946source = "registry+https://github.com/rust-lang/crates.io-index"

1011−checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"

1947+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"

10121948dependencies = [

10131949 "libc",

1014− "winapi",

1950+ "windows-sys 0.48.0",

10151951]

10161952

10171953[[package]]

@@ -1021,117 +1957,183 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

10211957checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"

10221958

10231959[[package]]

1024−name = "str-buf"

1025−version = "1.0.5"

1960+name = "str_indices"

1961+version = "0.4.1"

10261962source = "registry+https://github.com/rust-lang/crates.io-index"

1027−checksum = "d44a3643b4ff9caf57abcee9c2c621d6c03d9135e0d8b589bd9afb5992cb176a"

1963+checksum = "5f026164926842ec52deb1938fae44f83dfdb82d0a5b0270c5bd5935ab74d6dd"

10281964

10291965[[package]]

1030−name = "str_indices"

1031−version = "0.3.2"

1966+name = "syn"

1967+version = "1.0.109"

10321968source = "registry+https://github.com/rust-lang/crates.io-index"

1033−checksum = "adfad63a1b47951101cd667a85b2959a62910cf03f814fff25df89c460b873f8"

1969+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"

1970+dependencies = [

1971+ "proc-macro2",

1972+ "quote",

1973+ "unicode-ident",

1974+]

10341975

10351976[[package]]

10361977name = "syn"

1037−version = "1.0.90"

1978+version = "2.0.38"

10381979source = "registry+https://github.com/rust-lang/crates.io-index"

1039−checksum = "704df27628939572cd88d33f171cd6f896f4eaca85252c6e0a72d8d8287ee86f"

1980+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"

10401981dependencies = [

10411982 "proc-macro2",

10421983 "quote",

1043− "unicode-xid",

1984+ "unicode-ident",

1985+]

1986+

1987+[[package]]

1988+name = "tempfile"

1989+version = "3.8.1"

1990+source = "registry+https://github.com/rust-lang/crates.io-index"

1991+checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"

1992+dependencies = [

1993+ "cfg-if",

1994+ "fastrand",

1995+ "redox_syscall 0.4.1",

1996+ "rustix",

1997+ "windows-sys 0.48.0",

1998+]

1999+

2000+[[package]]

2001+name = "termcolor"

2002+version = "1.2.0"

2003+source = "registry+https://github.com/rust-lang/crates.io-index"

2004+checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"

2005+dependencies = [

2006+ "winapi-util",

2007+]

2008+

2009+[[package]]

2010+name = "termini"

2011+version = "1.0.0"

2012+source = "registry+https://github.com/rust-lang/crates.io-index"

2013+checksum = "2ad441d87dd98bc5eeb31cf2fb7e4839968763006b478efb38668a3bf9da0d59"

2014+dependencies = [

2015+ "home",

2016+]

2017+

2018+[[package]]

2019+name = "textwrap"

2020+version = "0.16.0"

2021+source = "registry+https://github.com/rust-lang/crates.io-index"

2022+checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"

2023+dependencies = [

2024+ "smawk",

2025+ "unicode-linebreak",

2026+ "unicode-width",

10442027]

10452028

10462029[[package]]

10472030name = "thiserror"

1048−version = "1.0.30"

2031+version = "1.0.52"

10492032source = "registry+https://github.com/rust-lang/crates.io-index"

1050−checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"

2033+checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d"

10512034dependencies = [

10522035 "thiserror-impl",

10532036]

10542037

10552038[[package]]

10562039name = "thiserror-impl"

1057−version = "1.0.30"

2040+version = "1.0.52"

10582041source = "registry+https://github.com/rust-lang/crates.io-index"

1059−checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"

2042+checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3"

10602043dependencies = [

10612044 "proc-macro2",

10622045 "quote",

1063− "syn",

2046+ "syn 2.0.38",

10642047]

10652048

10662049[[package]]

1067−name = "thread_local"

1068−version = "1.1.4"

2050+name = "threadpool"

2051+version = "1.8.1"

10692052source = "registry+https://github.com/rust-lang/crates.io-index"

1070−checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"

2053+checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"

10712054dependencies = [

1072− "once_cell",

2055+ "num_cpus",

10732056]

10742057

10752058[[package]]

1076−name = "threadpool"

1077−version = "1.8.1"

2059+name = "time"

2060+version = "0.3.23"

10782061source = "registry+https://github.com/rust-lang/crates.io-index"

1079−checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"

2062+checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446"

10802063dependencies = [

1081− "num_cpus",

2064+ "itoa",

2065+ "libc",

2066+ "num_threads",

2067+ "serde",

2068+ "time-core",

2069+ "time-macros",

2070+]

2071+

2072+[[package]]

2073+name = "time-core"

2074+version = "0.1.1"

2075+source = "registry+https://github.com/rust-lang/crates.io-index"

2076+checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"

2077+

2078+[[package]]

2079+name = "time-macros"

2080+version = "0.2.10"

2081+source = "registry+https://github.com/rust-lang/crates.io-index"

2082+checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4"

2083+dependencies = [

2084+ "time-core",

10822085]

10832086

10842087[[package]]

10852088name = "tinyvec"

1086−version = "1.5.1"

2089+version = "1.6.0"

10872090source = "registry+https://github.com/rust-lang/crates.io-index"

1088−checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2"

2091+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"

10892092dependencies = [

10902093 "tinyvec_macros",

10912094]

10922095

10932096[[package]]

10942097name = "tinyvec_macros"

1095−version = "0.1.0"

2098+version = "0.1.1"

10962099source = "registry+https://github.com/rust-lang/crates.io-index"

1097−checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"

2100+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

10982101

10992102[[package]]

11002103name = "tokio"

1101−version = "1.17.0"

2104+version = "1.35.1"

11022105source = "registry+https://github.com/rust-lang/crates.io-index"

1103−checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee"

2106+checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"

11042107dependencies = [

2108+ "backtrace",

11052109 "bytes",

11062110 "libc",

1107− "memchr",

11082111 "mio",

11092112 "num_cpus",

1110− "once_cell",

11112113 "parking_lot",

11122114 "pin-project-lite",

11132115 "signal-hook-registry",

11142116 "socket2",

11152117 "tokio-macros",

1116− "winapi",

2118+ "windows-sys 0.48.0",

11172119]

11182120

11192121[[package]]

11202122name = "tokio-macros"

1121−version = "1.7.0"

2123+version = "2.2.0"

11222124source = "registry+https://github.com/rust-lang/crates.io-index"

1123−checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"

2125+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"

11242126dependencies = [

11252127 "proc-macro2",

11262128 "quote",

1127− "syn",

2129+ "syn 2.0.38",

11282130]

11292131

11302132[[package]]

11312133name = "tokio-stream"

1132−version = "0.1.8"

2134+version = "0.1.14"

11332135source = "registry+https://github.com/rust-lang/crates.io-index"

1134−checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3"

2136+checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"

11352137dependencies = [

11362138 "futures-core",

11372139 "pin-project-lite",

@@ -1140,18 +2142,42 @@ dependencies = [

11402142

11412143[[package]]

11422144name = "toml"

1143−version = "0.5.8"

2145+version = "0.7.6"

11442146source = "registry+https://github.com/rust-lang/crates.io-index"

1145−checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"

2147+checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"

11462148dependencies = [

11472149 "serde",

2150+ "serde_spanned",

2151+ "toml_datetime",

2152+ "toml_edit",

11482153]

11492154

11502155[[package]]

1151−name = "tree-sitter"

1152−version = "0.20.6"

2156+name = "toml_datetime"

2157+version = "0.6.3"

2158+source = "registry+https://github.com/rust-lang/crates.io-index"

2159+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"

2160+dependencies = [

2161+ "serde",

2162+]

2163+

2164+[[package]]

2165+name = "toml_edit"

2166+version = "0.19.12"

11532167source = "registry+https://github.com/rust-lang/crates.io-index"

1154−checksum = "09b3b781640108d29892e8b9684642d2cda5ea05951fd58f0fea1db9edeb9b71"

2168+checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78"

2169+dependencies = [

2170+ "indexmap",

2171+ "serde",

2172+ "serde_spanned",

2173+ "toml_datetime",

2174+ "winnow 0.4.6",

2175+]

2176+

2177+[[package]]

2178+name = "tree-sitter"

2179+version = "0.20.10"

2180+source = "git+https://github.com/tree-sitter/tree-sitter?rev=ab09ae20d640711174b8da8a654f6b3dec93da1a#ab09ae20d640711174b8da8a654f6b3dec93da1a"

11552181dependencies = [

11562182 "cc",

11572183 "regex",

@@ -1168,52 +2194,63 @@ dependencies = [

11682194

11692195[[package]]

11702196name = "unicode-bidi"

1171−version = "0.3.7"

2197+version = "0.3.13"

2198+source = "registry+https://github.com/rust-lang/crates.io-index"

2199+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"

2200+

2201+[[package]]

2202+name = "unicode-bom"

2203+version = "2.0.2"

11722204source = "registry+https://github.com/rust-lang/crates.io-index"

1173−checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"

2205+checksum = "98e90c70c9f0d4d1ee6d0a7d04aa06cb9bbd53d8cfbdd62a0269a7c2eb640552"

11742206

11752207[[package]]

11762208name = "unicode-general-category"

1177−version = "0.5.1"

2209+version = "0.6.0"

2210+source = "registry+https://github.com/rust-lang/crates.io-index"

2211+checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7"

2212+

2213+[[package]]

2214+name = "unicode-ident"

2215+version = "1.0.8"

2216+source = "registry+https://github.com/rust-lang/crates.io-index"

2217+checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"

2218+

2219+[[package]]

2220+name = "unicode-linebreak"

2221+version = "0.1.5"

11782222source = "registry+https://github.com/rust-lang/crates.io-index"

1179−checksum = "1218098468b8085b19a2824104c70d976491d247ce194bbd9dc77181150cdfd6"

2223+checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"

11802224

11812225[[package]]

11822226name = "unicode-normalization"

1183−version = "0.1.19"

2227+version = "0.1.22"

11842228source = "registry+https://github.com/rust-lang/crates.io-index"

1185−checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"

2229+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"

11862230dependencies = [

11872231 "tinyvec",

11882232]

11892233

11902234[[package]]

11912235name = "unicode-segmentation"

1192−version = "1.9.0"

2236+version = "1.10.1"

11932237source = "registry+https://github.com/rust-lang/crates.io-index"

1194−checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"

2238+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"

11952239

11962240[[package]]

11972241name = "unicode-width"

1198−version = "0.1.9"

1199−source = "registry+https://github.com/rust-lang/crates.io-index"

1200−checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"

1201−

1202−[[package]]

1203−name = "unicode-xid"

1204−version = "0.2.2"

2242+version = "0.1.11"

12052243source = "registry+https://github.com/rust-lang/crates.io-index"

1206−checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"

2244+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"

12072245

12082246[[package]]

12092247name = "url"

1210−version = "2.2.2"

2248+version = "2.5.0"

12112249source = "registry+https://github.com/rust-lang/crates.io-index"

1212−checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"

2250+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"

12132251dependencies = [

12142252 "form_urlencoded",

12152253 "idna",

1216− "matches",

12172254 "percent-encoding",

12182255 "serde",

12192256]

@@ -1226,36 +2263,85 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"

12262263

12272264[[package]]

12282265name = "walkdir"

1229−version = "2.3.2"

2266+version = "2.4.0"

12302267source = "registry+https://github.com/rust-lang/crates.io-index"

1231−checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"

2268+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"

12322269dependencies = [

12332270 "same-file",

1234− "winapi",

12352271 "winapi-util",

12362272]

12372273

12382274[[package]]

12392275name = "wasi"

1240−version = "0.10.2+wasi-snapshot-preview1"

2276+version = "0.11.0+wasi-snapshot-preview1"

12412277source = "registry+https://github.com/rust-lang/crates.io-index"

1242−checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"

2278+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"

12432279

12442280[[package]]

1245−name = "wasi"

1246−version = "0.11.0+wasi-snapshot-preview1"

2281+name = "wasm-bindgen"

2282+version = "0.2.84"

12472283source = "registry+https://github.com/rust-lang/crates.io-index"

1248−checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"

2284+checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"

2285+dependencies = [

2286+ "cfg-if",

2287+ "wasm-bindgen-macro",

2288+]

2289+

2290+[[package]]

2291+name = "wasm-bindgen-backend"

2292+version = "0.2.84"

2293+source = "registry+https://github.com/rust-lang/crates.io-index"

2294+checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"

2295+dependencies = [

2296+ "bumpalo",

2297+ "log",

2298+ "once_cell",

2299+ "proc-macro2",

2300+ "quote",

2301+ "syn 1.0.109",

2302+ "wasm-bindgen-shared",

2303+]

2304+

2305+[[package]]

2306+name = "wasm-bindgen-macro"

2307+version = "0.2.84"

2308+source = "registry+https://github.com/rust-lang/crates.io-index"

2309+checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"

2310+dependencies = [

2311+ "quote",

2312+ "wasm-bindgen-macro-support",

2313+]

2314+

2315+[[package]]

2316+name = "wasm-bindgen-macro-support"

2317+version = "0.2.84"

2318+source = "registry+https://github.com/rust-lang/crates.io-index"

2319+checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"

2320+dependencies = [

2321+ "proc-macro2",

2322+ "quote",

2323+ "syn 1.0.109",

2324+ "wasm-bindgen-backend",

2325+ "wasm-bindgen-shared",

2326+]

2327+

2328+[[package]]

2329+name = "wasm-bindgen-shared"

2330+version = "0.2.84"

2331+source = "registry+https://github.com/rust-lang/crates.io-index"

2332+checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"

12492333

12502334[[package]]

12512335name = "which"

1252−version = "4.2.5"

2336+version = "5.0.0"

12532337source = "registry+https://github.com/rust-lang/crates.io-index"

1254−checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae"

2338+checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14"

12552339dependencies = [

12562340 "either",

1257− "lazy_static",

1258− "libc",

2341+ "home",

2342+ "once_cell",

2343+ "rustix",

2344+ "windows-sys 0.48.0",

12592345]

12602346

12612347[[package]]

@@ -1289,54 +2375,277 @@ version = "0.4.0"

12892375source = "registry+https://github.com/rust-lang/crates.io-index"

12902376checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

12912377

2378+[[package]]

2379+name = "windows"

2380+version = "0.48.0"

2381+source = "registry+https://github.com/rust-lang/crates.io-index"

2382+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"

2383+dependencies = [

2384+ "windows-targets 0.48.0",

2385+]

2386+

2387+[[package]]

2388+name = "windows"

2389+version = "0.52.0"

2390+source = "registry+https://github.com/rust-lang/crates.io-index"

2391+checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"

2392+dependencies = [

2393+ "windows-core",

2394+ "windows-targets 0.52.0",

2395+]

2396+

2397+[[package]]

2398+name = "windows-core"

2399+version = "0.52.0"

2400+source = "registry+https://github.com/rust-lang/crates.io-index"

2401+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"

2402+dependencies = [

2403+ "windows-targets 0.52.0",

2404+]

2405+

2406+[[package]]

2407+name = "windows-sys"

2408+version = "0.45.0"

2409+source = "registry+https://github.com/rust-lang/crates.io-index"

2410+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"

2411+dependencies = [

2412+ "windows-targets 0.42.2",

2413+]

2414+

2415+[[package]]

2416+name = "windows-sys"

2417+version = "0.48.0"

2418+source = "registry+https://github.com/rust-lang/crates.io-index"

2419+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"

2420+dependencies = [

2421+ "windows-targets 0.48.0",

2422+]

2423+

12922424[[package]]

12932425name = "windows-sys"

1294−version = "0.34.0"

2426+version = "0.52.0"

2427+source = "registry+https://github.com/rust-lang/crates.io-index"

2428+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"

2429+dependencies = [

2430+ "windows-targets 0.52.0",

2431+]

2432+

2433+[[package]]

2434+name = "windows-targets"

2435+version = "0.42.2"

12952436source = "registry+https://github.com/rust-lang/crates.io-index"

1296−checksum = "5acdd78cb4ba54c0045ac14f62d8f94a03d10047904ae2a40afa1e99d8f70825"

2437+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"

12972438dependencies = [

1298− "windows_aarch64_msvc",

1299− "windows_i686_gnu",

1300− "windows_i686_msvc",

1301− "windows_x86_64_gnu",

1302− "windows_x86_64_msvc",

2439+ "windows_aarch64_gnullvm 0.42.2",

2440+ "windows_aarch64_msvc 0.42.2",

2441+ "windows_i686_gnu 0.42.2",

2442+ "windows_i686_msvc 0.42.2",

2443+ "windows_x86_64_gnu 0.42.2",

2444+ "windows_x86_64_gnullvm 0.42.2",

2445+ "windows_x86_64_msvc 0.42.2",

13032446]

13042447

2448+[[package]]

2449+name = "windows-targets"

2450+version = "0.48.0"

2451+source = "registry+https://github.com/rust-lang/crates.io-index"

2452+checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"

2453+dependencies = [

2454+ "windows_aarch64_gnullvm 0.48.0",

2455+ "windows_aarch64_msvc 0.48.0",

2456+ "windows_i686_gnu 0.48.0",

2457+ "windows_i686_msvc 0.48.0",

2458+ "windows_x86_64_gnu 0.48.0",

2459+ "windows_x86_64_gnullvm 0.48.0",

2460+ "windows_x86_64_msvc 0.48.0",

2461+]

2462+

2463+[[package]]

2464+name = "windows-targets"

2465+version = "0.52.0"

2466+source = "registry+https://github.com/rust-lang/crates.io-index"

2467+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"

2468+dependencies = [

2469+ "windows_aarch64_gnullvm 0.52.0",

2470+ "windows_aarch64_msvc 0.52.0",

2471+ "windows_i686_gnu 0.52.0",

2472+ "windows_i686_msvc 0.52.0",

2473+ "windows_x86_64_gnu 0.52.0",

2474+ "windows_x86_64_gnullvm 0.52.0",

2475+ "windows_x86_64_msvc 0.52.0",

2476+]

2477+

2478+[[package]]

2479+name = "windows_aarch64_gnullvm"

2480+version = "0.42.2"

2481+source = "registry+https://github.com/rust-lang/crates.io-index"

2482+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"

2483+

2484+[[package]]

2485+name = "windows_aarch64_gnullvm"

2486+version = "0.48.0"

2487+source = "registry+https://github.com/rust-lang/crates.io-index"

2488+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"

2489+

2490+[[package]]

2491+name = "windows_aarch64_gnullvm"

2492+version = "0.52.0"

2493+source = "registry+https://github.com/rust-lang/crates.io-index"

2494+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"

2495+

2496+[[package]]

2497+name = "windows_aarch64_msvc"

2498+version = "0.42.2"

2499+source = "registry+https://github.com/rust-lang/crates.io-index"

2500+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"

2501+

2502+[[package]]

2503+name = "windows_aarch64_msvc"

2504+version = "0.48.0"

2505+source = "registry+https://github.com/rust-lang/crates.io-index"

2506+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"

2507+

13052508[[package]]

13062509name = "windows_aarch64_msvc"

1307−version = "0.34.0"

2510+version = "0.52.0"

2511+source = "registry+https://github.com/rust-lang/crates.io-index"

2512+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"

2513+

2514+[[package]]

2515+name = "windows_i686_gnu"

2516+version = "0.42.2"

2517+source = "registry+https://github.com/rust-lang/crates.io-index"

2518+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"

2519+

2520+[[package]]

2521+name = "windows_i686_gnu"

2522+version = "0.48.0"

13082523source = "registry+https://github.com/rust-lang/crates.io-index"

1309−checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d"

2524+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"

13102525

13112526[[package]]

13122527name = "windows_i686_gnu"

1313−version = "0.34.0"

2528+version = "0.52.0"

2529+source = "registry+https://github.com/rust-lang/crates.io-index"

2530+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"

2531+

2532+[[package]]

2533+name = "windows_i686_msvc"

2534+version = "0.42.2"

2535+source = "registry+https://github.com/rust-lang/crates.io-index"

2536+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"

2537+

2538+[[package]]

2539+name = "windows_i686_msvc"

2540+version = "0.48.0"

13142541source = "registry+https://github.com/rust-lang/crates.io-index"

1315−checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed"

2542+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"

13162543

13172544[[package]]

13182545name = "windows_i686_msvc"

1319−version = "0.34.0"

2546+version = "0.52.0"

2547+source = "registry+https://github.com/rust-lang/crates.io-index"

2548+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"

2549+

2550+[[package]]

2551+name = "windows_x86_64_gnu"

2552+version = "0.42.2"

2553+source = "registry+https://github.com/rust-lang/crates.io-index"

2554+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"

2555+

2556+[[package]]

2557+name = "windows_x86_64_gnu"

2558+version = "0.48.0"

13202559source = "registry+https://github.com/rust-lang/crates.io-index"

1321−checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956"

2560+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"

13222561

13232562[[package]]

13242563name = "windows_x86_64_gnu"

1325−version = "0.34.0"

2564+version = "0.52.0"

2565+source = "registry+https://github.com/rust-lang/crates.io-index"

2566+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"

2567+

2568+[[package]]

2569+name = "windows_x86_64_gnullvm"

2570+version = "0.42.2"

2571+source = "registry+https://github.com/rust-lang/crates.io-index"

2572+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"

2573+

2574+[[package]]

2575+name = "windows_x86_64_gnullvm"

2576+version = "0.48.0"

2577+source = "registry+https://github.com/rust-lang/crates.io-index"

2578+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"

2579+

2580+[[package]]

2581+name = "windows_x86_64_gnullvm"

2582+version = "0.52.0"

2583+source = "registry+https://github.com/rust-lang/crates.io-index"

2584+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"

2585+

2586+[[package]]

2587+name = "windows_x86_64_msvc"

2588+version = "0.42.2"

13262589source = "registry+https://github.com/rust-lang/crates.io-index"

1327−checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4"

2590+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"

13282591

13292592[[package]]

13302593name = "windows_x86_64_msvc"

1331−version = "0.34.0"

2594+version = "0.48.0"

13322595source = "registry+https://github.com/rust-lang/crates.io-index"

1333−checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9"

2596+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"

2597+

2598+[[package]]

2599+name = "windows_x86_64_msvc"

2600+version = "0.52.0"

2601+source = "registry+https://github.com/rust-lang/crates.io-index"

2602+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"

2603+

2604+[[package]]

2605+name = "winnow"

2606+version = "0.4.6"

2607+source = "registry+https://github.com/rust-lang/crates.io-index"

2608+checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699"

2609+dependencies = [

2610+ "memchr",

2611+]

2612+

2613+[[package]]

2614+name = "winnow"

2615+version = "0.5.28"

2616+source = "registry+https://github.com/rust-lang/crates.io-index"

2617+checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2"

2618+dependencies = [

2619+ "memchr",

2620+]

13342621

13352622[[package]]

13362623name = "xtask"

1337−version = "0.6.0"

2624+version = "23.10.0"

13382625dependencies = [

13392626 "helix-core",

2627+ "helix-loader",

13402628 "helix-term",

2629+ "helix-view",

13412630 "toml",

13422631]

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

@@ -1,12 +1,16 @@

11[workspace]

2+resolver = "2"

23members = [

34 "helix-core",

45 "helix-view",

56 "helix-term",

67 "helix-tui",

78 "helix-lsp",

9+ "helix-event",

810 "helix-dap",

911 "helix-loader",

12+ "helix-vcs",

13+ "helix-parsec",

1014 "xtask",

1115]

1216

@@ -14,9 +18,6 @@ default-members = [

1418 "helix-term"

1519]

1620

17−[profile.dev]

18−split-debuginfo = "unpacked"

19−

2021[profile.release]

2122lto = "thin"

2223# debug = true

@@ -27,3 +28,23 @@ lto = "fat"

2728codegen-units = 1

2829# strip = "debuginfo" # TODO: or strip = true

2930opt-level = 3

31+

32+[profile.integration]

33+inherits = "test"

34+package.helix-core.opt-level = 2

35+package.helix-tui.opt-level = 2

36+package.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+24−41

@@ -1,14 +1,27 @@

1−# Helix

1+<div align="center">

3+<h1>

4+<picture>

5+ <source media="(prefers-color-scheme: dark)" srcset="logo_dark.svg">

6+ <source media="(prefers-color-scheme: light)" srcset="logo_light.svg">

7+ <img alt="Helix" height="128" src="logo_light.svg">

8+</picture>

9+</h1>

310

411[![Build status](https://github.com/helix-editor/helix/actions/workflows/build.yml/badge.svg)](https://github.com/helix-editor/helix/actions)

12+[![GitHub Release](https://img.shields.io/github/v/release/helix-editor/helix)](https://github.com/helix-editor/helix/releases/latest)

13+[![Documentation](https://shields.io/badge/-documentation-452859)](https://docs.helix-editor.com/)

14+[![GitHub contributors](https://img.shields.io/github/contributors/helix-editor/helix)](https://github.com/helix-editor/helix/graphs/contributors)

15+[![Matrix Space](https://img.shields.io/matrix/helix-community:matrix.org)](https://matrix.to/#/#helix-community:matrix.org)

16+

17+</div>

518

619![Screenshot](./screenshot.png)

720

8−A kakoune / neovim inspired editor, written in Rust.

21+A [Kakoune](https://github.com/mawww/kakoune) / [Neovim](https://github.com/neovim/neovim) inspired editor, written in Rust.

922

10−The editing model is very heavily based on kakoune; during development I found

11−myself agreeing with most of kakoune's design decisions.

23+The editing model is very heavily based on Kakoune; during development I found

24+myself agreeing with most of Kakoune's design decisions.

1225

1326For more information, see the [website](https://helix-editor.com) or

1427[documentation](https://docs.helix-editor.com/).

@@ -25,51 +38,17 @@ All shortcuts/keymaps can be found [in the documentation on the website](https:/

2538- Smart, incremental syntax highlighting and code editing via tree-sitter

2639

2740It's a terminal-based editor first, but I'd like to explore a custom renderer

28−(similar to emacs) in wgpu or skulpin.

41+(similar to Emacs) in wgpu or skulpin.

2942

3043Note: Only certain languages have indentation definitions at the moment. Check

31−`runtime/queries/<lang>/` for `indents.toml`.

44+`runtime/queries/<lang>/` for `indents.scm`.

3245

3346# Installation

3447

35−We provide packaging for various distributions, but here's a quick method to

36−build from source.

37−

38−```

39−git clone https://github.com/helix-editor/helix

40−cd helix

41−cargo install --path helix-term

42−hx --grammar fetch

43−hx --grammar build

44−```

45−

46−This will install the `hx` binary to `$HOME/.cargo/bin` and build tree-sitter grammars.

47−

48−Helix also needs its runtime files so make sure to copy/symlink the `runtime/` directory into the

49−config directory (for example `~/.config/helix/runtime` on Linux/macOS, or `%AppData%/helix/runtime` on Windows).

50−This location can be overridden via the `HELIX_RUNTIME` environment variable.

51−

52−Packages already solve this for you by wrapping the `hx` binary with a wrapper

53−that sets the variable to the install dir.

54−

55−> NOTE: running via cargo also doesn't require setting explicit `HELIX_RUNTIME` path, it will automatically

56−> detect the `runtime` directory in the project root.

57−

58−In order to use LSP features like auto-complete, you will need to

59−[install the appropriate Language Server](https://github.com/helix-editor/helix/wiki/How-to-install-the-default-language-servers)

60−for a language.

48+[Installation documentation](https://docs.helix-editor.com/install.html).

6149

6250[![Packaging status](https://repology.org/badge/vertical-allrepos/helix.svg)](https://repology.org/project/helix/versions)

6351

64−## MacOS

65−

66−Helix can be installed on MacOS through homebrew via:

67−

68−```

69−brew tap helix-editor/helix

70−brew install helix

71−```

72−

7352# Contributing

7453

7554Contributing guidelines can be found [here](./docs/CONTRIBUTING.md).

@@ -79,3 +58,7 @@ Contributing guidelines can be found [here](./docs/CONTRIBUTING.md).

7958Your question might already be answered on the [FAQ](https://github.com/helix-editor/helix/wiki/FAQ).

8059

8160Discuss the project on the community [Matrix Space](https://matrix.to/#/#helix-community:matrix.org) (make sure to join `#helix-editor:matrix.org` if you're on a client that doesn't support Matrix Spaces yet).

61+

62+# Credits

63+

64+Thanks to [@jakenvac](https://github.com/jakenvac) for designing the logo!

VERSIONdeleted−1

@@ -1 +0,0 @@

1−22.05-dev

base16_theme.toml+2−2

@@ -1,16 +1,16 @@

11# Author: NNB <nnbnh@protonmail.com>

3−"ui.menu" = "black"

3+"ui.menu" = { fg = "black", bg = "white" }

44"ui.menu.selected" = { modifiers = ["reversed"] }

55"ui.linenr" = { fg = "gray", bg = "black" }

66"ui.popup" = { modifiers = ["reversed"] }

77"ui.linenr.selected" = { fg = "white", bg = "black", modifiers = ["bold"] }

88"ui.selection" = { fg = "black", bg = "blue" }

99"ui.selection.primary" = { fg = "white", bg = "blue" }

10+"ui.text.inactive" = { fg = "gray" }

1011"comment" = { fg = "gray" }

1112"ui.statusline" = { fg = "black", bg = "white" }

1213"ui.statusline.inactive" = { fg = "gray", bg = "white" }

13−"ui.help" = { modifiers = ["reversed"] }

1414"ui.cursor" = { fg = "white", modifiers = ["reversed"] }

1515"variable" = "red"

1616"constant.numeric" = "yellow"

book/book.toml+6−1

@@ -3,9 +3,14 @@ authors = ["Blaž Hrastnik"]

33language = "en"

44multilingual = false

55src = "src"

6−edit-url-template = "https://github.com/helix-editor/helix/tree/master/book/{path}?mode=edit"

87[output.html]

98cname = "docs.helix-editor.com"

109default-theme = "colibri"

1110preferred-dark-theme = "colibri"

11+git-repository-url = "https://github.com/helix-editor/helix"

12+edit-url-template = "https://github.com/helix-editor/helix/edit/master/book/{path}"

13+additional-css = ["custom.css"]

14+

15+[output.html.search]

16+use-boolean-and = true

book/custom.cssnew file+231

@@ -0,0 +1,231 @@

1+html {

2+ font-family: "Inter", sans-serif;

3+}

5+.sidebar .sidebar-scrollbox {

6+ padding: 0;

7+}

9+.chapter {

10+ margin: 0.25rem 0;

11+}

12+

13+.chapter li.chapter-item {

14+ line-height: initial;

15+ margin: 0;

16+ padding: 1rem 1.5rem;

17+}

18+

19+.chapter .section li.chapter-item {

20+ line-height: inherit;

21+ padding: .5rem .5rem 0 .5rem;

22+}

23+

24+.content {

25+ overflow-y: auto;

26+ padding: 0 15px;

27+ padding-bottom: 50px;

28+}

29+

30+/* 2 1.75 1.5 1.25 1 .875 */

31+.content h1 { font-size: 2em }

32+.content h2 { font-size: 1.75em }

33+.content h3 { font-size: 1.5em }

34+.content h4 { font-size: 1.25em }

35+.content h5 { font-size: 1em }

36+.content h6 { font-size: .875em }

37+

38+.content h1,

39+.content h2,

40+.content h3,

41+.content h4 {

42+ font-weight: 500;

43+ margin-top: 1.275em;

44+ margin-bottom: .875em;

45+}

46+

47+.content p,

48+.content ol,

49+.content ul,

50+.content table {

51+ margin-top: 0;

52+ margin-bottom: .875em;

53+}

54+

55+.content ul li {

56+ margin-bottom: .25rem;

57+}

58+

59+.content ul {

60+ list-style-type: square;

61+}

62+

63+.content ul ul,

64+.content ol ul {

65+ margin-bottom: .5rem;

66+}

67+

68+.content li p {

69+ margin-bottom: .5em;

70+}

71+

72+blockquote {

73+ margin: 1.5rem 0;

74+ padding: 1rem 1.5rem;

75+ color: var(--fg);

76+ opacity: .9;

77+ background-color: var(--quote-bg);

78+ border-left: 4px solid var(--quote-border);

79+ border-top: none;

80+ border-bottom: none;

81+}

82+

83+blockquote *:last-child {

84+ margin-bottom: 0;

85+}

86+

87+table {

88+ width: 100%;

89+}

90+

91+table thead th {

92+ padding: .75rem;

93+ text-align: left;

94+ font-weight: 500;

95+ line-height: 1.5;

96+ width: auto;

97+}

98+

99+table td {

100+ padding: .75rem;

101+ border: none;

102+}

103+

104+table thead tr {

105+ border: none;

106+ border-bottom: 2px var(--table-border-color) solid;

107+}

108+

109+table tbody tr {

110+ border-bottom: 1px var(--table-border-line) solid;

111+}

112+

113+table tbody tr:nth-child(2n) {

114+ background: unset;

115+}

116+

117+pre code.hljs {

118+ display: block;

119+ overflow-x: auto;

120+ padding: 1em;

121+}

122+

123+code.hljs {

124+ padding: 3px 5px;

125+}

126+

127+.colibri {

128+ --bg: #3b224c;

129+ --fg: #bcbdd0;

130+ --heading-fg: #fff;

131+

132+ --sidebar-bg: #281733;

133+ --sidebar-fg: #c8c9db;

134+ --sidebar-non-existent: #505274;

135+ --sidebar-active: #a4a0e8;

136+ --sidebar-spacer: #2d334f;

137+

138+ --scrollbar: var(--sidebar-fg);

139+

140+ --icons: #737480;

141+ --icons-hover: #b7b9cc;

142+

143+ /* --links: #a4a0e8; */

144+ --links: #ECCDBA;

145+

146+ --inline-code-color: hsl(48.7, 7.8%, 70%);

147+

148+ --theme-popup-bg: #161923;

149+ --theme-popup-border: #737480;

150+ --theme-hover: rgba(0, 0, 0, .2);

151+

152+ --quote-bg: #281733;

153+ --quote-border: hsl(226, 15%, 22%);

154+

155+ --table-border-color: hsl(226, 23%, 76%);

156+ --table-header-bg: hsla(226, 23%, 31%, 0);

157+ --table-alternate-bg: hsl(226, 23%, 14%);

158+ --table-border-line: hsla(201deg, 20%, 92%, 0.2);

159+

160+ --searchbar-border-color: #aaa;

161+ --searchbar-bg: #aeaec6;

162+ --searchbar-fg: #000;

163+ --searchbar-shadow-color: #aaa;

164+ --searchresults-header-fg: #5f5f71;

165+ --searchresults-border-color: #5c5c68;

166+ --searchresults-li-bg: #242430;

167+ --search-mark-bg: #a2cff5;

168+}

169+

170+.colibri .content .header {

171+ color: #fff;

172+}

173+

174+/* highlight.js theme, :where() is used to avoid increasing specificity */

175+

176+:where(.colibri) .hljs {

177+ background: #2f1e2e;

178+ color: #a39e9b;

179+}

180+

181+:where(.colibri) .hljs-comment,

182+:where(.colibri) .hljs-quote {

183+ color: #8d8687;

184+}

185+

186+:where(.colibri) .hljs-link,

187+:where(.colibri) .hljs-meta,

188+:where(.colibri) .hljs-name,

189+:where(.colibri) .hljs-regexp,

190+:where(.colibri) .hljs-selector-class,

191+:where(.colibri) .hljs-selector-id,

192+:where(.colibri) .hljs-tag,

193+:where(.colibri) .hljs-template-variable,

194+:where(.colibri) .hljs-variable {

195+ color: #ef6155;

196+}

197+

198+:where(.colibri) .hljs-built_in,

199+:where(.colibri) .hljs-deletion,

200+:where(.colibri) .hljs-literal,

201+:where(.colibri) .hljs-number,

202+:where(.colibri) .hljs-params,

203+:where(.colibri) .hljs-type {

204+ color: #f99b15;

205+}

206+

207+:where(.colibri) .hljs-attribute,

208+:where(.colibri) .hljs-section,

209+:where(.colibri) .hljs-title {

210+ color: #fec418;

211+}

212+

213+:where(.colibri) .hljs-addition,

214+:where(.colibri) .hljs-bullet,

215+:where(.colibri) .hljs-string,

216+:where(.colibri) .hljs-symbol {

217+ color: #48b685;

218+}

219+

220+:where(.colibri) .hljs-keyword,

221+:where(.colibri) .hljs-selector-tag {

222+ color: #815ba4;

223+}

224+

225+:where(.colibri) .hljs-emphasis {

226+ font-style: italic;

227+}

228+

229+:where(.colibri) .hljs-strong {

230+ font-weight: 700;

231+}

book/src/SUMMARY.md+6−6

@@ -6,14 +6,14 @@

66- [Usage](./usage.md)

77 - [Keymap](./keymap.md)

88 - [Commands](./commands.md)

9− - [Language Support](./lang-support.md)

9+ - [Language support](./lang-support.md)

1010- [Migrating from Vim](./from-vim.md)

1111- [Configuration](./configuration.md)

1212 - [Themes](./themes.md)

13− - [Key Remapping](./remapping.md)

14− - [Hooks](./hooks.md)

13+ - [Key remapping](./remapping.md)

1514 - [Languages](./languages.md)

1615- [Guides](./guides/README.md)

17− - [Adding Languages](./guides/adding_languages.md)

18− - [Adding Textobject Queries](./guides/textobject.md)

19− - [Adding Indent Queries](./guides/indent.md)

16+ - [Adding languages](./guides/adding_languages.md)

17+ - [Adding textobject queries](./guides/textobject.md)

18+ - [Adding indent queries](./guides/indent.md)

19+ - [Adding injection queries](./guides/injection.md)

book/src/commands.md+1−1

@@ -1,5 +1,5 @@

11# Commands

3−Command mode can be activated by pressing `:`, similar to vim. Built-in commands:

3+Command mode can be activated by pressing `:`. The built-in commands are:

55{{#include ./generated/typable-cmd.md}}

book/src/configuration.md+280−42

@@ -2,10 +2,10 @@

33To override global configuration parameters, create a `config.toml` file located in your config directory:

5−* Linux and Mac: `~/.config/helix/config.toml`

6−* Windows: `%AppData%\helix\config.toml`

5+- Linux and Mac: `~/.config/helix/config.toml`

6+- Windows: `%AppData%\helix\config.toml`

8−> Hint: You can easily open the config file by typing `:config-open` within Helix normal mode.

8+> 💡 You can easily open the config file by typing `:config-open` within Helix normal mode.

1010Example config:

1111

@@ -25,38 +25,129 @@ select = "underline"

2525hidden = false

2626```

2727

28+You can use a custom configuration file by specifying it with the `-c` or

29+`--config` command line argument, for example `hx -c path/to/custom-config.toml`.

30+Additionally, you can reload the configuration file by sending the USR1

31+signal to the Helix process on Unix operating systems, such as by using the command `pkill -USR1 hx`.

32+

33+Finally, you can have a `config.toml` local to a project by putting it under a `.helix` directory in your repository.

34+Its settings will be merged with the configuration directory `config.toml` and the built-in configuration.

35+

2836## Editor

2937

3038### `[editor]` Section

3139

3240| Key | Description | Default |

3341|--|--|---------|

34−| `scrolloff` | Number of lines of padding around the edge of the screen when scrolling. | `3` |

35−| `mouse` | Enable mouse mode. | `true` |

36−| `middle-click-paste` | Middle click paste support. | `true` |

37−| `scroll-lines` | Number of lines to scroll per scroll wheel step. | `3` |

38−| `shell` | Shell to use when running external commands. | Unix: `["sh", "-c"]`<br/>Windows: `["cmd", "/C"]` |

39−| `line-number` | Line number display: `absolute` simply shows each line's number, while `relative` shows the distance from the current line. When unfocused or in insert mode, `relative` will still show absolute line numbers. | `absolute` |

40−| `gutters` | Gutters to display: Available are `diagnostics` and `line-numbers`, note that `diagnostics` also includes other features like breakpoints | `["diagnostics", "line-numbers"]` |

41−| `auto-completion` | Enable automatic pop up of auto-completion. | `true` |

42−| `idle-timeout` | Time in milliseconds since last keypress before idle timers trigger. Used for autocompletion, set to 0 for instant. | `400` |

42+| `scrolloff` | Number of lines of padding around the edge of the screen when scrolling | `5` |

43+| `mouse` | Enable mouse mode | `true` |

44+| `middle-click-paste` | Middle click paste support | `true` |

45+| `scroll-lines` | Number of lines to scroll per scroll wheel step | `3` |

46+| `shell` | Shell to use when running external commands | Unix: `["sh", "-c"]`<br/>Windows: `["cmd", "/C"]` |

47+| `line-number` | Line number display: `absolute` simply shows each line's number, while `relative` shows the distance from the current line. When unfocused or in insert mode, `relative` will still show absolute line numbers | `absolute` |

48+| `cursorline` | Highlight all lines with a cursor | `false` |

49+| `cursorcolumn` | Highlight all columns with a cursor | `false` |

50+| `gutters` | Gutters to display: Available are `diagnostics` and `diff` and `line-numbers` and `spacer`, note that `diagnostics` also includes other features like breakpoints, 1-width padding will be inserted if gutters is non-empty | `["diagnostics", "spacer", "line-numbers", "spacer", "diff"]` |

51+| `auto-completion` | Enable automatic pop up of auto-completion | `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` |

54+| `idle-timeout` | Time in milliseconds since last keypress before idle timers trigger. Used for autocompletion, set to 0 for instant | `250` |

55+| `preview-completion-insert` | Whether to apply completion item instantly when selected | `true` |

4356| `completion-trigger-len` | The min-length of word under cursor to trigger autocompletion | `2` |

44−| `auto-info` | Whether to display infoboxes | `true` |

45−| `true-color` | Set to `true` to override automatic detection of terminal truecolor support in the event of a false negative. | `false` |

57+| `completion-replace` | Set to `true` to make completions always replace the entire word and not just the part before the cursor | `false` |

58+| `auto-info` | Whether to display info boxes | `true` |

59+| `true-color` | Set to `true` to override automatic detection of terminal truecolor support in the event of a false negative | `false` |

60+| `undercurl` | Set to `true` to override automatic detection of terminal undercurl support in the event of a false negative | `false` |

61+| `rulers` | List of column positions at which to display the rulers. Can be overridden by language specific `rulers` in `languages.toml` file | `[]` |

62+| `bufferline` | Renders a line at the top of the editor displaying open buffers. Can be `always`, `never` or `multiple` (only shown if more than one buffer is in use) | `never` |

63+| `color-modes` | Whether to color the mode indicator with different colors depending on the mode itself | `false` |

64+| `text-width` | Maximum line length. Used for the `:reflow` command and soft-wrapping if `soft-wrap.wrap-at-text-width` is set | `80` |

65+| `workspace-lsp-roots` | Directories relative to the workspace root that are treated as LSP roots. Should only be set in `.helix/config.toml` | `[]` |

66+| `default-line-ending` | The line ending to use for new documents. Can be `native`, `lf`, `crlf`, `ff`, `cr` or `nel`. `native` uses the platform's native line ending (`crlf` on Windows, otherwise `lf`). | `native` |

67+| `insert-final-newline` | Whether to automatically insert a trailing line-ending on write if missing | `true` |

68+| `popup-border` | Draw border around `popup`, `menu`, `all`, or `none` | `none` |

69+| `indent-heuristic` | How the indentation for a newly inserted line is computed: `simple` just copies the indentation level from the previous line, `tree-sitter` computes the indentation based on the syntax tree and `hybrid` combines both approaches. If the chosen heuristic is not available, a different one will be used as a fallback (the fallback order being `hybrid` -> `tree-sitter` -> `simple`). | `hybrid`

70+

71+### `[editor.statusline]` Section

72+

73+Allows configuring the statusline at the bottom of the editor.

74+

75+The configuration distinguishes between three areas of the status line:

76+

77+`[ ... ... LEFT ... ... | ... ... ... ... CENTER ... ... ... ... | ... ... RIGHT ... ... ]`

78+

79+Statusline elements can be defined as follows:

80+

81+```toml

82+[editor.statusline]

83+left = ["mode", "spinner"]

84+center = ["file-name"]

85+right = ["diagnostics", "selections", "position", "file-encoding", "file-line-ending", "file-type"]

86+separator = "│"

87+mode.normal = "NORMAL"

88+mode.insert = "INSERT"

89+mode.select = "SELECT"

90+```

91+The `[editor.statusline]` key takes the following sub-keys:

92+

93+| Key | Description | Default |

94+| --- | --- | --- |

95+| `left` | A list of elements aligned to the left of the statusline | `["mode", "spinner", "file-name", "read-only-indicator", "file-modification-indicator"]` |

96+| `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"]` |

98+| `separator` | The character used to separate elements in the statusline | `"│"` |

99+| `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"` |

101+| `mode.select` | The text shown in the `mode` element for select mode | `"SEL"` |

102+

103+The following statusline elements can be configured:

104+

105+| Key | Description |

106+| ------ | ----------- |

107+| `mode` | The current editor mode (`mode.normal`/`mode.insert`/`mode.select`) |

108+| `spinner` | A progress spinner indicating LSP activity |

109+| `file-name` | The path/name of the opened file |

110+| `file-base-name` | The basename of the opened file |

111+| `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 |

113+| `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 |

116+| `file-type` | The type of the opened file |

117+| `diagnostics` | The number of warnings and/or errors |

118+| `workspace-diagnostics` | The number of warnings and/or errors on workspace |

119+| `selections` | The number of active selections |

120+| `primary-selection-length` | The number of characters currently in primary selection |

121+| `position` | The cursor position |

122+| `position-percentage` | The cursor position as a percentage of the total number of lines |

123+| `separator` | The string defined in `editor.statusline.separator` (defaults to `"│"`) |

124+| `spacer` | Inserts a space between elements (multiple/contiguous spacers may be specified) |

125+| `version-control` | The current branch name or detached commit hash of the opened workspace |

126+| `register` | The current selected register |

46127

47128### `[editor.lsp]` Section

48129

49−| Key | Description | Default |

50−| --- | ----------- | ------- |

51−| `display-messages` | Display LSP progress messages below statusline[^1] | `false` |

130+| Key | Description | Default |

131+| --- | ----------- | ------- |

132+| `enable` | Enables LSP integration. Setting to false will completely disable language servers regardless of language settings.| `true` |

133+| `display-messages` | Display LSP progress messages below statusline[^1] | `false` |

134+| `auto-signature-help` | Enable automatic popup of signature help (parameter hints) | `true` |

135+| `display-inlay-hints` | Display inlay hints[^2] | `false` |

136+| `display-signature-help-docs` | Display docs under signature help popup | `true` |

137+| `snippets` | Enables snippet completions. Requires a server restart (`:lsp-restart`) to take effect after `:config-reload`/`:set`. | `true` |

138+| `goto-reference-include-declaration` | Include declaration in the goto references popup. | `true` |

139+

140+[^1]: By default, a progress spinner is shown in the statusline beside the file path.

52141

53−[^1]: A progress spinner is always shown in the statusline beside the file path.

142+[^2]: You may also have to activate them in the LSP config for them to appear, not just in Helix. Inlay hints in Helix are still being improved on and may be a little bit laggy/janky under some circumstances. Please report any bugs you see so we can fix them!

54143

55144### `[editor.cursor-shape]` Section

56145

57−Defines the shape of cursor in each mode. Note that due to limitations

58−of the terminal environment, only the primary cursor can change shape.

59−Valid values for these options are `block`, `bar`, `underline`, or `none`.

146+Defines the shape of cursor in each mode.

147+Valid values for these options are `block`, `bar`, `underline`, or `hidden`.

148+

149+> 💡 Due to limitations of the terminal environment, only the primary cursor can

150+> change shape.

60151

61152| Key | Description | Default |

62153| --- | ----------- | ------- |

@@ -70,34 +161,52 @@ Valid values for these options are `block`, `bar`, `underline`, or `none`.

70161

71162### `[editor.file-picker]` Section

72163

73−Sets options for file picker and global search. All but the last key listed in

74−the default file-picker configuration below are IgnoreOptions: whether hidden

75−files and files listed within ignore files are ignored by (not visible in) the

76−helix file picker and global search. There is also one other key, `max-depth`

77−available, which is not defined by default.

164+Set options for file picker and global search. Ignoring a file means it is

165+not visible in the Helix file picker and global search.

166+

167+All git related options are only enabled in a git repository.

78168

79169| Key | Description | Default |

80170|--|--|---------|

81−|`hidden` | Enables ignoring hidden files. | true

82−|`parents` | Enables reading ignore files from parent directories. | true

83−|`ignore` | Enables reading `.ignore` files. | true

84−|`git-ignore` | Enables reading `.gitignore` files. | true

85−|`git-global` | Enables reading global .gitignore, whose path is specified in git's config: `core.excludefile` option. | true

86−|`git-exclude` | Enables reading `.git/info/exclude` files. | true

87−|`max-depth` | Set with an integer value for maximum depth to recurse. | Defaults to `None`.

171+|`hidden` | Enables ignoring hidden files | `true`

172+|`follow-symlinks` | Follow symlinks instead of ignoring them | `true`

173+|`deduplicate-links` | Ignore symlinks that point at files already shown in the picker | `true`

174+|`parents` | Enables reading ignore files from parent directories | `true`

175+|`ignore` | Enables reading `.ignore` files | `true`

176+|`git-ignore` | Enables reading `.gitignore` files | `true`

177+|`git-global` | Enables reading global `.gitignore`, whose path is specified in git's config: `core.excludesfile` option | `true`

178+|`git-exclude` | Enables reading `.git/info/exclude` files | `true`

179+|`max-depth` | Set with an integer value for maximum depth to recurse | Defaults to `None`.

180+

181+Ignore files can be placed locally as `.ignore` or put in your home directory as `~/.ignore`. They support the usual ignore and negative ignore (unignore) rules used in `.gitignore` files.

182+

183+Additionally, you can use Helix-specific ignore files by creating a local `.helix/ignore` file in the current workspace or a global `ignore` file located in your Helix config directory:

184+- Linux and Mac: `~/.config/helix/ignore`

185+- Windows: `%AppData%\helix\ignore`

186+

187+Example:

188+

189+```ini

190+# unignore in file picker and global search

191+!.github/

192+!.gitignore

193+!.gitattributes

194+```

88195

89196### `[editor.auto-pairs]` Section

90197

91−Enable automatic insertion of pairs to parentheses, brackets, etc. Can be

92−a simple boolean value, or a specific mapping of pairs of single characters.

198+Enables automatic insertion of pairs to parentheses, brackets, etc. Can be a

199+simple boolean value, or a specific mapping of pairs of single characters.

93200

94−| Key | Description |

95−| --- | ----------- |

96−| `false` | Completely disable auto pairing, regardless of language-specific settings

97−| `true` | Use the default pairs: <code>(){}[]''""``</code>

98−| Mapping of pairs | e.g. `{ "(" = ")", "{" = "}", ... }`

201+To disable auto-pairs altogether, set `auto-pairs` to `false`:

99202

100−Example

203+```toml

204+[editor]

205+auto-pairs = false # defaults to `true`

206+```

207+

208+The default pairs are <code>(){}[]''""``</code>, but these can be customized by

209+setting `auto-pairs` to a TOML table:

101210

102211```toml

103212[editor.auto-pairs]

@@ -134,5 +243,134 @@ Search specific options.

134243

135244| Key | Description | Default |

136245|--|--|---------|

137−| `smart-case` | Enable smart case regex searching (case insensitive unless pattern contains upper case characters) | `true` |

246+| `smart-case` | Enable smart case regex searching (case-insensitive unless pattern contains upper case characters) | `true` |

138247| `wrap-around`| Whether the search should wrap after depleting the matches | `true` |

248+

249+### `[editor.whitespace]` Section

250+

251+Options for rendering whitespace with visible characters. Use `:set whitespace.render all` to temporarily enable visible whitespace.

252+

253+| Key | Description | Default |

254+|-----|-------------|---------|

255+| `render` | Whether to render whitespace. May either be `"all"` or `"none"`, or a table with sub-keys `space`, `nbsp`, `tab`, and `newline` | `"none"` |

256+| `characters` | Literal characters to use when rendering whitespace. Sub-keys may be any of `tab`, `space`, `nbsp`, `newline` or `tabpad` | See example below |

257+

258+Example

259+

260+```toml

261+[editor.whitespace]

262+render = "all"

263+# or control each character

264+[editor.whitespace.render]

265+space = "all"

266+tab = "all"

267+newline = "none"

268+

269+[editor.whitespace.characters]

270+space = "·"

271+nbsp = "⍽"

272+tab = "→"

273+newline = "⏎"

274+tabpad = "·" # Tabs will look like "→···" (depending on tab width)

275+```

276+

277+### `[editor.indent-guides]` Section

278+

279+Options for rendering vertical indent guides.

280+

281+| Key | Description | Default |

282+| --- | --- | --- |

283+| `render` | Whether to render indent guides | `false` |

284+| `character` | Literal character to use for rendering the indent guide | `│` |

285+| `skip-levels` | Number of indent levels to skip | `0` |

286+

287+Example:

288+

289+```toml

290+[editor.indent-guides]

291+render = true

292+character = "╎" # Some characters that work well: "▏", "┆", "┊", "⸽"

293+skip-levels = 1

294+```

295+

296+### `[editor.gutters]` Section

297+

298+For simplicity, `editor.gutters` accepts an array of gutter types, which will

299+use default settings for all gutter components.

300+

301+```toml

302+[editor]

303+gutters = ["diff", "diagnostics", "line-numbers", "spacer"]

304+```

305+

306+To customize the behavior of gutters, the `[editor.gutters]` section must

307+be used. This section contains top level settings, as well as settings for

308+specific gutter components as subsections.

309+

310+| Key | Description | Default |

311+| --- | --- | --- |

312+| `layout` | A vector of gutters to display | `["diagnostics", "spacer", "line-numbers", "spacer", "diff"]` |

313+

314+Example:

315+

316+```toml

317+[editor.gutters]

318+layout = ["diff", "diagnostics", "line-numbers", "spacer"]

319+```

320+

321+#### `[editor.gutters.line-numbers]` Section

322+

323+Options for the line number gutter

324+

325+| Key | Description | Default |

326+| --- | --- | --- |

327+| `min-width` | The minimum number of characters to use | `3` |

328+

329+Example:

330+

331+```toml

332+[editor.gutters.line-numbers]

333+min-width = 1

334+```

335+

336+#### `[editor.gutters.diagnostics]` Section

337+

338+Currently unused

339+

340+#### `[editor.gutters.diff]` Section

341+

342+Currently unused

343+

344+#### `[editor.gutters.spacer]` Section

345+

346+Currently unused

347+

348+### `[editor.soft-wrap]` Section

349+

350+Options for soft wrapping lines that exceed the view width:

351+

352+| Key | Description | Default |

353+| --- | --- | --- |

354+| `enable` | Whether soft wrapping is enabled. | `false` |

355+| `max-wrap` | Maximum free space left at the end of the line. | `20` |

356+| `max-indent-retain` | Maximum indentation to carry over when soft wrapping a line. | `40` |

357+| `wrap-indicator` | Text inserted before soft wrapped lines, highlighted with `ui.virtual.wrap` | `↪ ` |

358+| `wrap-at-text-width` | Soft wrap at `text-width` instead of using the full viewport size. | `false` |

359+

360+Example:

361+

362+```toml

363+[editor.soft-wrap]

364+enable = true

365+max-wrap = 25 # increase value to reduce forced mid-word wrapping

366+max-indent-retain = 0

367+wrap-indicator = "" # set wrap-indicator to "" to hide it

368+```

369+

370+### `[editor.smart-tab]` Section

371+

372+

373+| Key | Description | Default |

374+|------------|-------------|---------|

375+| `enable` | If set to true, then when the cursor is in a position with non-whitespace to its left, instead of inserting a tab, it will run `move_parent_node_end`. If there is only whitespace to the left, then it inserts a tab as normal. With the default bindings, to explicitly insert a tab character, press Shift-tab. | `true` |

376+| `supersede-menu` | Normally, when a menu is on screen, such as when auto complete is triggered, the tab key is bound to cycling through the items. This means when menus are on screen, one cannot use the tab key to trigger the `smart-tab` command. If this option is set to true, the `smart-tab` command always takes precedence, which means one cannot use the tab key to cycle through menu items. One of the other bindings must be used instead, such as arrow keys or `C-n`/`C-p`. | `false` |

book/src/from-vim.md+7−7

@@ -1,12 +1,12 @@

11# Migrating from Vim

3−Helix's editing model is strongly inspired from vim and kakoune, and a notable

4−difference from vim (and the most striking similarity to kakoune) is that Helix

5−follows the `selection → action` model. This means that the whatever you are

6−going to act on (a word, a paragraph, a line, etc) is selected first and the

7−action itself (delete, change, yank, etc) comes second. A cursor is simply a

3+Helix's editing model is strongly inspired from Vim and Kakoune, and a notable

4+difference from Vim (and the most striking similarity to Kakoune) is that Helix

5+follows the `selection → action` model. This means that whatever you are

6+going to act on (a word, a paragraph, a line, etc.) is selected first and the

7+action itself (delete, change, yank, etc.) comes second. A cursor is simply a

88single width selection.

10−See also Kakoune's [Migrating from Vim](https://github.com/mawww/kakoune/wiki/Migrating-from-Vim).

10+See also Kakoune's [Migrating from Vim](https://github.com/mawww/kakoune/wiki/Migrating-from-Vim) and Helix's [Migrating from Vim](https://github.com/helix-editor/helix/wiki/Migrating-from-Vim).

1111

12−> TODO: Mention texobjects, surround, registers

12+> TODO: Mention textobjects, surround, registers

book/src/generated/lang-support.md+145−32

@@ -1,80 +1,193 @@

22| --- | --- | --- | --- | --- |

3−| bash | ✓ | | | `bash-language-server` |

3+| agda | ✓ | | | |

4+| astro | ✓ | | | |

5+| awk | ✓ | ✓ | | `awk-language-server` |

6+| bash | ✓ | ✓ | ✓ | `bash-language-server` |

7+| bass | ✓ | | | `bass` |

8+| beancount | ✓ | | | |

9+| bibtex | ✓ | | | `texlab` |

10+| bicep | ✓ | | | `bicep-langserver` |

11+| blueprint | ✓ | | | `blueprint-compiler` |

412| c | ✓ | ✓ | ✓ | `clangd` |

5−| c-sharp | ✓ | | | `OmniSharp` |

13+| c-sharp | ✓ | ✓ | | `OmniSharp` |

15+| cairo | ✓ | ✓ | ✓ | `cairo-language-server` |

16+| capnp | ✓ | | ✓ | |

17+| clojure | ✓ | | | `clojure-lsp` |

618| cmake | ✓ | ✓ | ✓ | `cmake-language-server` |

719| comment | ✓ | | | |

20+| common-lisp | ✓ | | ✓ | `cl-lsp` |

21+| cpon | ✓ | | ✓ | |

822| cpp | ✓ | ✓ | ✓ | `clangd` |

23+| crystal | ✓ | ✓ | | `crystalline` |

924| css | ✓ | | | `vscode-css-language-server` |

25+| cue | ✓ | | | `cuelsp` |

26+| d | ✓ | ✓ | ✓ | `serve-d` |

1027| dart | ✓ | | ✓ | `dart` |

28+| dbml | ✓ | | | |

29+| devicetree | ✓ | | | |

30+| dhall | ✓ | ✓ | | `dhall-lsp-server` |

31+| diff | ✓ | | | |

1132| dockerfile | ✓ | | | `docker-langserver` |

33+| dot | ✓ | | | `dot-language-server` |

34+| dtd | ✓ | | | |

35+| edoc | ✓ | | | |

1236| eex | ✓ | | | |

1337| ejs | ✓ | | | |

14−| elixir | ✓ | | | `elixir-ls` |

15−| elm | ✓ | | | `elm-language-server` |

38+| elixir | ✓ | ✓ | ✓ | `elixir-ls` |

39+| elm | ✓ | ✓ | | `elm-language-server` |

40+| elvish | ✓ | | | `elvish` |

41+| env | ✓ | | | |

1642| erb | ✓ | | | |

17−| erlang | ✓ | | | `erlang_ls` |

43+| erlang | ✓ | ✓ | | `erlang_ls` |

44+| esdl | ✓ | | | |

1845| fish | ✓ | ✓ | ✓ | |

19−| gdscript | ✓ | | ✓ | |

20−| git-commit | ✓ | | | |

46+| forth | ✓ | | | `forth-lsp` |

47+| fortran | ✓ | | ✓ | `fortls` |

48+| fsharp | ✓ | | | `fsautocomplete` |

49+| gas | ✓ | ✓ | | |

50+| gdscript | ✓ | ✓ | ✓ | |

51+| gemini | ✓ | | | |

52+| git-attributes | ✓ | | | |

53+| git-commit | ✓ | ✓ | | |

2154| git-config | ✓ | | | |

22−| git-diff | ✓ | | | |

55+| git-ignore | ✓ | | | |

2356| git-rebase | ✓ | | | |

24−| gleam | ✓ | | | |

25−| glsl | ✓ | | ✓ | |

26−| go | ✓ | ✓ | ✓ | `gopls` |

27−| graphql | ✓ | | | |

28−| haskell | ✓ | | | `haskell-language-server-wrapper` |

57+| gleam | ✓ | ✓ | | `gleam` |

58+| glsl | ✓ | ✓ | ✓ | |

59+| gn | ✓ | | | |

60+| go | ✓ | ✓ | ✓ | `gopls`, `golangci-lint-langserver` |

61+| godot-resource | ✓ | | | |

62+| gomod | ✓ | | | `gopls` |

63+| gotmpl | ✓ | | | `gopls` |

64+| gowork | ✓ | | | `gopls` |

65+| graphql | ✓ | | | `graphql-lsp` |

66+| hare | ✓ | | | |

67+| haskell | ✓ | ✓ | | `haskell-language-server-wrapper` |

68+| haskell-persistent | ✓ | | | |

2969| hcl | ✓ | | ✓ | `terraform-ls` |

30−| heex | ✓ | | | |

70+| heex | ✓ | ✓ | | `elixir-ls` |

71+| hosts | ✓ | | | |

3172| html | ✓ | | | `vscode-html-language-server` |

73+| hurl | ✓ | | ✓ | |

3275| iex | ✓ | | | |

33−| java | ✓ | | | |

34−| javascript | ✓ | | ✓ | `typescript-language-server` |

76+| ini | ✓ | | | |

77+| janet | ✓ | | | |

78+| java | ✓ | ✓ | ✓ | `jdtls` |

79+| javascript | ✓ | ✓ | ✓ | `typescript-language-server` |

80+| jinja | ✓ | | | |

81+| jsdoc | ✓ | | | |

3582| json | ✓ | | ✓ | `vscode-json-language-server` |

36−| jsx | ✓ | | ✓ | `typescript-language-server` |

37−| julia | ✓ | | | `julia` |

83+| json5 | ✓ | | | |

84+| jsonnet | ✓ | | | `jsonnet-language-server` |

85+| jsx | ✓ | ✓ | ✓ | `typescript-language-server` |

86+| julia | ✓ | ✓ | ✓ | `julia` |

87+| just | ✓ | ✓ | ✓ | |

88+| kdl | ✓ | ✓ | ✓ | |

3889| kotlin | ✓ | | | `kotlin-language-server` |

39−| latex | ✓ | | | `texlab` |

90+| latex | ✓ | ✓ | | `texlab` |

4091| lean | ✓ | | | `lean` |

4192| ledger | ✓ | | | |

4293| llvm | ✓ | ✓ | ✓ | |

4394| llvm-mir | ✓ | ✓ | ✓ | |

4495| llvm-mir-yaml | ✓ | | ✓ | |

45−| lua | ✓ | | ✓ | |

96+| log | ✓ | | | |

97+| lpf | ✓ | | | |

98+| lua | ✓ | ✓ | ✓ | `lua-language-server` |

4699| make | ✓ | | | |

47−| markdown | ✓ | | | |

100+| markdoc | ✓ | | | `markdoc-ls` |

101+| markdown | ✓ | | | `marksman` |

102+| markdown.inline | ✓ | | | |

103+| matlab | ✓ | ✓ | ✓ | |

104+| mermaid | ✓ | | | |

105+| meson | ✓ | | ✓ | |

49−| nix | ✓ | | ✓ | `rnix-lsp` |

107+| msbuild | ✓ | | ✓ | |

108+| nasm | ✓ | ✓ | | |

109+| nickel | ✓ | | ✓ | `nls` |

110+| nim | ✓ | ✓ | ✓ | `nimlangserver` |

111+| nix | ✓ | | | `nil` |

112+| nu | ✓ | | | `nu` |

113+| nunjucks | ✓ | | | |

50114| ocaml | ✓ | | ✓ | `ocamllsp` |

51115| ocaml-interface | ✓ | | | `ocamllsp` |

116+| odin | ✓ | | ✓ | `ols` |

117+| opencl | ✓ | ✓ | ✓ | `clangd` |

118+| openscad | ✓ | | | `openscad-lsp` |

52119| org | ✓ | | | |

53−| perl | ✓ | ✓ | ✓ | |

120+| pascal | ✓ | ✓ | | `pasls` |

121+| passwd | ✓ | | | |

122+| pem | ✓ | | | |

123+| perl | ✓ | ✓ | ✓ | `perlnavigator` |

54124| php | ✓ | ✓ | ✓ | `intelephense` |

125+| po | ✓ | ✓ | | |

126+| pod | ✓ | | | |

127+| ponylang | ✓ | ✓ | ✓ | |

128+| prisma | ✓ | | | `prisma-language-server` |

56−| protobuf | ✓ | | ✓ | |

130+| protobuf | ✓ | | ✓ | `bufls`, `pb` |

131+| prql | ✓ | | | |

132+| purescript | ✓ | ✓ | | `purescript-language-server` |

57133| python | ✓ | ✓ | ✓ | `pylsp` |

134+| qml | ✓ | | ✓ | `qmlls` |

58135| r | ✓ | | | `R` |

136+| racket | ✓ | | ✓ | `racket` |

60137| regex | ✓ | | | |

138+| rego | ✓ | | | `regols` |

61139| rescript | ✓ | ✓ | | `rescript-language-server` |

62140| rmarkdown | ✓ | | ✓ | `R` |

141+| robot | ✓ | | | `robotframework_ls` |

63142| ron | ✓ | | ✓ | |

143+| rst | ✓ | | | |

64144| ruby | ✓ | ✓ | ✓ | `solargraph` |

65145| rust | ✓ | ✓ | ✓ | `rust-analyzer` |

146+| sage | ✓ | ✓ | | |

66147| scala | ✓ | | ✓ | `metals` |

148+| scheme | ✓ | | ✓ | |

149+| scss | ✓ | | | `vscode-css-language-server` |

150+| slint | ✓ | | ✓ | `slint-lsp` |

151+| smali | ✓ | | ✓ | |

152+| smithy | ✓ | | | `cs` |

153+| sml | ✓ | | | |

67154| solidity | ✓ | | | `solc` |

68155| sql | ✓ | | | |

156+| sshclientconfig | ✓ | | | |

157+| starlark | ✓ | ✓ | | |

158+| strace | ✓ | | | |

69159| svelte | ✓ | | ✓ | `svelteserver` |

160+| sway | ✓ | ✓ | ✓ | `forc` |

70161| swift | ✓ | | | `sourcekit-lsp` |

162+| t32 | ✓ | | | |

71163| tablegen | ✓ | ✓ | ✓ | |

72−| toml | ✓ | | | |

164+| task | ✓ | | | |

165+| templ | ✓ | | | `templ` |

166+| tfvars | ✓ | | ✓ | `terraform-ls` |

167+| todotxt | ✓ | | | |

168+| toml | ✓ | | | `taplo` |

73169| tsq | ✓ | | | |

74−| tsx | ✓ | | | `typescript-language-server` |

170+| tsx | ✓ | ✓ | ✓ | `typescript-language-server` |

75171| twig | ✓ | | | |

76−| typescript | ✓ | | ✓ | `typescript-language-server` |

77−| vue | ✓ | | | `vls` |

78−| wgsl | ✓ | | | |

79−| yaml | ✓ | | ✓ | |

80−| zig | ✓ | | ✓ | `zls` |

172+| typescript | ✓ | ✓ | ✓ | `typescript-language-server` |

173+| typst | ✓ | | | `typst-lsp` |

174+| ungrammar | ✓ | | | |

175+| unison | ✓ | | | |

176+| uxntal | ✓ | | | |

177+| v | ✓ | ✓ | ✓ | `v-analyzer` |

178+| vala | ✓ | | | `vala-language-server` |

179+| verilog | ✓ | ✓ | | `svlangserver` |

180+| vhdl | ✓ | | | `vhdl_ls` |

181+| vhs | ✓ | | | |

182+| vue | ✓ | | | `vue-language-server` |

183+| wast | ✓ | | | |

184+| wat | ✓ | | | |

185+| webc | ✓ | | | |

186+| wgsl | ✓ | | | `wgsl_analyzer` |

187+| wit | ✓ | | ✓ | |

188+| wren | ✓ | ✓ | ✓ | |

189+| xit | ✓ | | | |

190+| xml | ✓ | | ✓ | |

191+| yaml | ✓ | | ✓ | `yaml-language-server`, `ansible-language-server` |

192+| yuck | ✓ | | | |

193+| zig | ✓ | ✓ | ✓ | `zls` |

book/src/generated/typable-cmd.md+47−23

@@ -1,34 +1,38 @@

11| Name | Description |

22| --- | --- |

33| `:quit`, `:q` | Close the current view. |

4−| `:quit!`, `:q!` | Close the current view forcefully (ignoring unsaved changes). |

4+| `:quit!`, `:q!` | Force close the current view, ignoring unsaved changes. |

55| `:open`, `:o` | Open a file from disk into the current view. |

66| `:buffer-close`, `:bc`, `:bclose` | Close the current buffer. |

7−| `:buffer-close!`, `:bc!`, `:bclose!` | Close the current buffer forcefully (ignoring unsaved changes). |

7+| `:buffer-close!`, `:bc!`, `:bclose!` | Close the current buffer forcefully, ignoring unsaved changes. |

88| `:buffer-close-others`, `:bco`, `:bcloseother` | Close all buffers but the currently focused one. |

9−| `:buffer-close-others!`, `:bco!`, `:bcloseother!` | Close all buffers but the currently focused one. |

10−| `:buffer-close-all`, `:bca`, `:bcloseall` | Close all buffers, without quiting. |

11−| `:buffer-close-all!`, `:bca!`, `:bcloseall!` | Close all buffers forcefully (ignoring unsaved changes), without quiting. |

12−| `:buffer-next`, `:bn`, `:bnext` | Go to next buffer. |

13−| `:buffer-previous`, `:bp`, `:bprev` | Go to previous buffer. |

9+| `:buffer-close-others!`, `:bco!`, `:bcloseother!` | Force close all buffers but the currently focused one. |

10+| `:buffer-close-all`, `:bca`, `:bcloseall` | Close all buffers without quitting. |

11+| `:buffer-close-all!`, `:bca!`, `:bcloseall!` | Force close all buffers ignoring unsaved changes without quitting. |

12+| `:buffer-next`, `:bn`, `:bnext` | Goto next buffer. |

13+| `:buffer-previous`, `:bp`, `:bprev` | Goto previous buffer. |

1414| `:write`, `:w` | Write changes to disk. Accepts an optional path (:write some/path.txt) |

15−| `:write!`, `:w!` | Write changes to disk forcefully (creating necessary subdirectories). Accepts an optional path (:write some/path.txt) |

15+| `:write!`, `:w!` | Force write changes to disk creating necessary subdirectories. Accepts an optional path (:write! some/path.txt) |

16+| `:write-buffer-close`, `:wbc` | Write changes to disk and closes the buffer. Accepts an optional path (:write-buffer-close some/path.txt) |

17+| `:write-buffer-close!`, `:wbc!` | Force write changes to disk creating necessary subdirectories and closes the buffer. Accepts an optional path (:write-buffer-close! some/path.txt) |

1618| `:new`, `:n` | Create a new scratch buffer. |

1719| `:format`, `:fmt` | Format the file using the LSP formatter. |

18−| `:indent-style` | Set the indentation style for editing. ('t' for tabs or 1-8 for number of spaces.) |

19−| `:line-ending` | Set the document's default line ending. Options: crlf, lf, cr, ff, nel. |

20+| `:indent-style` | Set the indentation style for editing. ('t' for tabs or 1-16 for number of spaces.) |

21+| `:line-ending` | Set the document's default line ending. Options: crlf, lf. |

2022| `:earlier`, `:ear` | Jump back to an earlier point in edit history. Accepts a number of steps or a time span. |

2123| `:later`, `:lat` | Jump to a later point in edit history. Accepts a number of steps or a time span. |

2224| `:write-quit`, `:wq`, `:x` | Write changes to disk and close the current view. Accepts an optional path (:wq some/path.txt) |

2325| `:write-quit!`, `:wq!`, `:x!` | Write changes to disk and close the current view forcefully. Accepts an optional path (:wq! some/path.txt) |

24−| `:write-all`, `:wa` | Write changes from all views to disk. |

25−| `:write-quit-all`, `:wqa`, `:xa` | Write changes from all views to disk and close all views. |

26−| `:write-quit-all!`, `:wqa!`, `:xa!` | Write changes from all views to disk and close all views forcefully (ignoring unsaved changes). |

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

29+| `:write-quit-all!`, `:wqa!`, `:xa!` | Write changes from all buffers to disk and close all views forcefully (ignoring unsaved changes). |

2730| `:quit-all`, `:qa` | Close all views. |

28−| `:quit-all!`, `:qa!` | Close all views forcefully (ignoring unsaved changes). |

31+| `:quit-all!`, `:qa!` | Force close all views ignoring unsaved changes. |

2932| `:cquit`, `:cq` | Quit with exit code (default 1). Accepts an optional integer exit code (:cq 2). |

30−| `:cquit!`, `:cq!` | Quit with exit code (default 1) forcefully (ignoring unsaved changes). Accepts an optional integer exit code (:cq! 2). |

31−| `:theme` | Change the editor theme. |

33+| `:cquit!`, `:cq!` | Force quit with exit code (default 1) ignoring unsaved changes. Accepts an optional integer exit code (:cq! 2). |

34+| `:theme` | Change the editor theme (show current theme if no name specified). |

35+| `:yank-join` | Yank joined selections. A separator can be provided as first argument. Default value is newline. |

3236| `:clipboard-yank` | Yank main selection into system clipboard. |

3337| `:clipboard-yank-join` | Yank joined selections into system clipboard. A separator can be provided as first argument. Default value is newline. |

3438| `:primary-clipboard-yank` | Yank main selection into system primary clipboard. |

@@ -42,9 +46,16 @@

4246| `:show-clipboard-provider` | Show clipboard provider name in status bar. |

4347| `:change-current-directory`, `:cd` | Change the current working directory. |

4448| `:show-directory`, `:pwd` | Show the current working directory. |

45−| `:encoding` | Set encoding based on `https://encoding.spec.whatwg.org` |

46−| `:reload` | Discard changes and reload from the source file. |

49+| `:encoding` | Set encoding. Based on `https://encoding.spec.whatwg.org`. |

50+| `:character-info`, `:char` | Get info about the character under the primary cursor. |

51+| `:reload`, `:rl` | Discard changes and reload from the source file. |

52+| `:reload-all`, `:rla` | Discard changes and reload all documents from the source files. |

53+| `:update`, `:u` | Write changes only if the file has been modified. |

54+| `:lsp-workspace-command` | Open workspace command picker |

55+| `:lsp-restart` | Restarts the language servers used by the current doc |

56+| `:lsp-stop` | Stops the language servers that are used by the current doc |

4757| `: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. |

4859| `:debug-start`, `:dbg` | Start a debug session from a given template with given parameters. |

4960| `:debug-remote`, `:dbg-tcp` | Connect to a debug adapter by TCP address and start a debugging session from a given template with given parameters. |

5061| `:debug-eval` | Evaluate expression in current debug context. |

@@ -53,12 +64,25 @@

5364| `:hsplit`, `:hs`, `:sp` | Open the file in a horizontal split. |

5465| `:hsplit-new`, `:hnew` | Open a scratch buffer in a horizontal split. |

5566| `:tutor` | Open the tutorial. |

56−| `:goto`, `:g` | Go to line number. |

57−| `:set-language`, `:lang` | Set the language of current buffer. |

58−| `:set-option`, `:set` | Set a config option at runtime |

67+| `:goto`, `:g` | Goto line number. |

68+| `:set-language`, `:lang` | Set the language of current buffer (show current language if no value specified). |

69+| `:set-option`, `:set` | Set a config option at runtime.<br>For example to disable smart case search, use `:set search.smart-case false`. |

70+| `:toggle-option`, `:toggle` | Toggle a boolean config option at runtime.<br>For example to toggle smart case search, use `:toggle search.smart-case`. |

71+| `:get-option`, `:get` | Get the current value of a config option. |

5972| `:sort` | Sort ranges in selection. |

6073| `:rsort` | Sort ranges in selection in reverse order. |

74+| `:reflow` | Hard-wrap the current selection of lines to a given width. |

6175| `:tree-sitter-subtree`, `:ts-subtree` | Display tree sitter subtree under cursor, primarily for debugging queries. |

62−| `:config-reload` | Refreshes helix's config. |

63−| `:config-open` | Open the helix config.toml file. |

76+| `:config-reload` | Refresh user config. |

77+| `:config-open` | Open the user config.toml file. |

78+| `:config-open-workspace` | Open the workspace config.toml file. |

79+| `:log-open` | Open the helix log file. |

80+| `:insert-output` | Run shell command, inserting output before each selection. |

81+| `:append-output` | Run shell command, appending output after each selection. |

6482| `:pipe` | Pipe each selection to the shell command. |

83+| `:pipe-to` | Pipe each selection to the shell command, ignoring output. |

84+| `:run-shell-command`, `:sh` | Run a shell command |

85+| `:reset-diff-change`, `:diffget`, `:diffg` | Reset the diff change at the cursor position. |

86+| `:clear-register` | Clear given register. If no argument is provided, clear all registers. |

87+| `:redraw` | Clear and re-render the whole UI |

88+| `:move` | Move the current buffer and its corresponding file to a different path |

book/src/guides/README.md+1−1

@@ -1,4 +1,4 @@

11# Guides

33This section contains guides for adding new language server configurations,

4−tree-sitter grammers, textobject queries, etc.

4+tree-sitter grammars, textobject queries, and other similar items.

book/src/guides/adding_languages.md+45−90

@@ -1,100 +1,55 @@

1−# Adding languages

1+# Adding new languages to Helix

3−## Language configuration

4−

5−To add a new language, you need to add a `language` entry to the

6−[`languages.toml`][languages.toml] found in the root of the repository;

7−this `languages.toml` file is included at compilation time, and is

8−distinct from the `languages.toml` file in the user's [configuration

9−directory](../configuration.md).

3+In order to add a new language to Helix, you will need to follow the steps

4+below.

105

11−```toml

12−[[language]]

13−name = "mylang"

14−scope = "scope.mylang"

15−injection-regex = "^mylang$"

16−file-types = ["mylang", "myl"]

17−comment-token = "#"

18−indent = { tab-width = 2, unit = " " }

19−language-server = { command = "mylang-lsp", args = ["--stdio"] }

20−```

21−

22−These are the available keys and descriptions for the file.

6+## Language configuration

237

24−| Key | Description |

25−| ---- | ----------- |

26−| `name` | The name of the language |

27−| `scope` | A string like `source.js` that identifies the language. Currently, we strive to match the scope names used by popular TextMate grammars and by the Linguist library. Usually `source.<name>` or `text.<name>` in case of markup languages |

28−| `injection-regex` | regex pattern that will be tested against a language name in order to determine whether this language should be used for a potential [language injection][treesitter-language-injection] site. |

29−| `file-types` | The filetypes of the language, for example `["yml", "yaml"]`. Extensions and full file names are supported. |

30−| `shebangs` | The interpreters from the shebang line, for example `["sh", "bash"]` |

31−| `roots` | A set of marker files to look for when trying to find the workspace root. For example `Cargo.lock`, `yarn.lock` |

32−| `auto-format` | Whether to autoformat this language when saving |

33−| `diagnostic-severity` | Minimal severity of diagnostic for it to be displayed. (Allowed values: `Error`, `Warning`, `Info`, `Hint`) |

34−| `comment-token` | The token to use as a comment-token |

35−| `indent` | The indent to use. Has sub keys `tab-width` and `unit` |

36−| `language-server` | The Language Server to run. Has sub keys `command` and `args` |

37−| `config` | Language Server configuration |

38−| `grammar` | The tree-sitter grammar to use (defaults to the value of `name`) |

8+1. Add a new `[[language]]` entry in the `languages.toml` file and provide the

9+ necessary configuration for the new language. For more information on

10+ language configuration, refer to the

11+ [language configuration section](../languages.md) of the documentation.

12+ A new language server can be added by extending the `[language-server]` table in the same file.

13+2. If you are adding a new language or updating an existing language server

14+ configuration, run the command `cargo xtask docgen` to update the

15+ [Language Support](../lang-support.md) documentation.

3916

40−When adding a new language or Language Server configuration for an existing

41−language, run `cargo xtask docgen` to add the new configuration to the

42−[Language Support][lang-support] docs before creating a pull request.

43−When adding a Language Server configuration, be sure to update the

44−[Language Server Wiki][install-lsp-wiki] with installation notes.

17+> 💡 If you are adding a new Language Server configuration, make sure to update

18+> the

19+> [Language Server Wiki](https://github.com/helix-editor/helix/wiki/How-to-install-the-default-language-servers)

20+> with the installation instructions.

4521

4622## Grammar configuration

4723

48−If a tree-sitter grammar is available for the language, add a new `grammar`

49−entry to `languages.toml`.

50−

51−```toml

52−[[grammar]]

53−name = "mylang"

54−source = { git = "https://github.com/example/mylang", rev = "a250c4582510ff34767ec3b7dcdd3c24e8c8aa68" }

55−```

56−

57−Grammar configuration takes these keys:

58−

59−| Key | Description |

60−| --- | ----------- |

61−| `name` | The name of the tree-sitter grammar |

62−| `source` | The method of fetching the grammar - a table with a schema defined below |

63−

64−Where `source` is a table with either these keys when using a grammar from a

65−git repository:

66−

67−| Key | Description |

68−| --- | ----------- |

69−| `git` | A git remote URL from which the grammar should be cloned |

70−| `rev` | The revision (commit hash or tag) which should be fetched |

71−| `subpath` | A path within the grammar directory which should be built. Some grammar repositories host multiple grammars (for example `tree-sitter-typescript` and `tree-sitter-ocaml`) in subdirectories. This key is used to point `hx --grammar build` to the correct path for compilation. When omitted, the root of repository is used |

72−

73−Or a `path` key with an absolute path to a locally available grammar directory.

24+1. If a tree-sitter grammar is available for the new language, add a new

25+ `[[grammar]]` entry to the `languages.toml` file.

26+2. If you are testing the grammar locally, you can use the `source.path` key

27+ with an absolute path to the grammar. However, before submitting a pull

28+ request, make sure to switch to using `source.git`.

7429

7530## Queries

7631

77−For a language to have syntax-highlighting and indentation among

78−other things, you have to add queries. Add a directory for your

79−language with the path `runtime/queries/<name>/`. The tree-sitter

80−[website](https://tree-sitter.github.io/tree-sitter/syntax-highlighting#queries)

81−gives more info on how to write queries.

82−

83−> NOTE: When evaluating queries, the first matching query takes

84−precedence, which is different from other editors like neovim where

85−the last matching query supersedes the ones before it. See

86−[this issue][neovim-query-precedence] for an example.

87−

88−## Common Issues

89−

90−- If you get errors when running after switching branches, you may have to update the tree-sitter grammars. Run `hx --grammar fetch` to fetch the grammars and `hx --grammar build` to build any out-of-date grammars.

91−

92−- If a parser is segfaulting or you want to remove the parser, make sure to remove the compiled parser in `runtime/grammar/<name>.so`

93−

94−- The indents query is `indents.toml`, *not* `indents.scm`. See [this](https://github.com/helix-editor/helix/issues/114) issue for more information.

95−

96−[treesitter-language-injection]: https://tree-sitter.github.io/tree-sitter/syntax-highlighting#language-injection

97−[languages.toml]: https://github.com/helix-editor/helix/blob/master/languages.toml

98−[neovim-query-precedence]: https://github.com/helix-editor/helix/pull/1170#issuecomment-997294090

99−[install-lsp-wiki]: https://github.com/helix-editor/helix/wiki/How-to-install-the-default-language-servers

100−[lang-support]: ../lang-support.md

32+1. In order to provide syntax highlighting and indentation for the new language,

33+ you will need to add queries.

34+2. Create a new directory for the language with the path

35+ `runtime/queries/<name>/`.

36+3. Refer to the

37+ [tree-sitter website](https://tree-sitter.github.io/tree-sitter/syntax-highlighting#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+

41+> 💡 In Helix, the first matching query takes precedence when evaluating

42+> queries, which is different from other editors such as Neovim where the last

43+> matching query supersedes the ones before it. See

44+> [this issue](https://github.com/helix-editor/helix/pull/1170#issuecomment-997294090)

45+> for an example.

46+

47+## Common issues

48+

49+- If you encounter errors when running Helix after switching branches, you may

50+ need to update the tree-sitter grammars. Run the command `hx --grammar fetch`

51+ to fetch the grammars and `hx --grammar build` to build any out-of-date

52+ grammars.

53+- 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`.

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+323−33

@@ -1,62 +1,308 @@

1−# Adding Indent Queries

1+# Adding indent queries

3−Helix uses tree-sitter to correctly indent new lines. This requires

4−a tree-sitter grammar and an `indent.scm` query file placed in

5−`runtime/queries/{language}/indents.scm`. The indentation for a line

6−is calculated by traversing the syntax tree from the lowest node at the

7−beginning of the new line. Each of these nodes contributes to the total

8−indent when it is captured by the query (in what way depends on the name

9−of the capture).

3+Helix uses tree-sitter to correctly indent new lines. This requires a tree-

4+sitter grammar and an `indent.scm` query file placed in `runtime/queries/

5+{language}/indents.scm`. The indentation for a line is calculated by traversing

6+the syntax tree from the lowest node at the beginning of the new line (see

7+[Indent queries](#indent-queries)). Each of these nodes contributes to the total

8+indent when it is captured by the query (in what way depends on the name of

9+the capture.

1010

1111Note that it matters where these added indents begin. For example,

1212multiple indent level increases that start on the same line only increase

13−the total indent level by 1.

13+the total indent level by 1. See [Capture types](#capture-types).

1414

15−## Scopes

15+By default, Helix uses the `hybrid` indentation heuristic. This means that

16+indent queries are not used to compute the expected absolute indentation of a

17+line but rather the expected difference in indentation between the new and an

18+already existing line. This difference is then added to the actual indentation

19+of the already existing line. Since this makes errors in the indent queries

20+harder to find, it is recommended to disable it when testing via

21+`:set indent-heuristic tree-sitter`. The rest of this guide assumes that

22+the `tree-sitter` heuristic is used.

1623

17−Added indents don't always apply to the whole node. For example, in most

18−cases when a node should be indented, we actually only want everything

19−except for its first line to be indented. For this, there are several

20−scopes (more scopes may be added in the future if required):

24+## Indent queries

2125

22−- `all`:

23−This scope applies to the whole captured node. This is only different from

24−`tail` when the captured node is the first node on its line.

26+When Helix is inserting a new line through `o`, `O`, or `<ret>`, to determine

27+the indent level for the new line, the query in `indents.scm` is run on the

28+document. The starting position of the query is the end of the line above where

29+a new line will be inserted.

2530

26−- `tail`:

27−This scope applies to everything except for the first line of the

28−captured node.

31+For `o`, the inserted line is the line below the cursor, so that starting

32+position of the query is the end of the current line.

2933

30−Every capture type has a default scope which should do the right thing

31−in most situations. When a different scope is required, this can be

32−changed by using a `#set!` declaration anywhere in the pattern:

33−```scm

34−(assignment_expression

35− right: (_) @indent

36− (#set! "scope" "all"))

34+```rust

35+fn need_hero(some_hero: Hero, life: Life) -> {

36+ matches!(some_hero, Hero { // ←─────────────────╮

37+ strong: true,//←╮ ↑ ↑ │

38+ fast: true, // │ │ ╰── query start │

39+ sure: true, // │ ╰───── cursor ├─ traversal

40+ soon: true, // ╰──────── new line inserted │ start node

41+ }) && // │

42+// ↑ │

43+// ╰───────────────────────────────────────────────╯

44+ some_hero > life

45+}

3746```

3847

39−## Capture Types

48+For `O`, the newly inserted line is the *current* line, so the starting position

49+of the query is the end of the line above the cursor.

4050

41−- `@indent` (default scope `tail`):

42−Increase the indent level by 1. Multiple occurences in the same line

43−don't stack. If there is at least one `@indent` and one `@outdent`

44−capture on the same line, the indent level isn't changed at all.

51+```rust

52+fn need_hero(some_hero: Hero, life: Life) -> { // ←─╮

53+ matches!(some_hero, Hero { // ←╮ ↑ │

54+ strong: true,// ↑ ╭───╯ │ │

55+ fast: true, // │ │ query start ─╯ │

56+ sure: true, // ╰───┼ cursor ├─ traversal

57+ soon: true, // ╰ new line inserted │ start node

58+ }) && // │

59+ some_hero > life // │

60+} // ←──────────────────────────────────────────────╯

61+```

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.

4567

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.

4674- `@outdent` (default scope `all`):

47−Decrease the indent level by 1. The same rules as for `@indent` apply.

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+

232+In Python, the are a few tokens that will always end a scope, such as a return

233+statement. Since the scope ends, so should the indent level. But because the

234+function span is extended to every line with a greater indent level, a new line

235+would just continue on the same level. And an `@outdent` would not help us here

236+either, since it would cause everything in the parentheses to become outdented

237+as well.

238+

239+To help, we need to signal an end to the extension. We can do this with

240+`@extend.prevent-once`.

241+

242+```scm

243+(parenthesized_expression) @indent

244+

245+]

246+ (function_definition)

247+ (class_definition)

248+] @indent @extend

249+

250+(return_statement) @extend.prevent-once

251+```

252+

253+#### `@indent.always` / `@outdent.always`

254+

255+As mentioned before, normally if there is more than one `@indent` or `@outdent`

256+capture on the same line, they are combined.

257+

258+Sometimes, there are cases when you may want to ensure that every indent capture

259+is additive, regardless of how many occur on the same line. Consider this

260+example in YAML.

261+

262+```yaml

263+ - foo: bar

264+# ↑ ↑

265+# │ ╰─────────────── start of map

266+# ╰───────────────── start of list element

267+ baz: quux # ←─── cursor

268+ # ←───────────── where the cursor should go on a new line

269+ garply: waldo

270+ - quux:

271+ bar: baz

272+ xyzzy: thud

273+ fred: plugh

274+```

275+

276+In YAML, you often have lists of maps. In these cases, the syntax is such that

277+the list element and the map both start on the same line. But we really do want

278+to start an indentation for each of these so that subsequent keys in the map

279+hang over the list and align properly. This is where `@indent.always` helps.

280+

281+```scm

282+((block_sequence_item) @item @indent.always @extend

283+ (#not-one-line? @item))

284+

285+((block_mapping_pair

286+ key: (_) @key

287+ value: (_) @val

288+ (#not-same-line? @key @val)

289+ ) @indent.always @extend

290+)

291+```

48292

49293## Predicates

50294

51295In some cases, an S-expression cannot express exactly what pattern should be matched.

52296For that, tree-sitter allows for predicates to appear anywhere within a pattern,

53297similar to how `#set!` declarations work:

298+

54299```scm

55300(some_kind

56301 (child_kind) @indent

57302 (#predicate? arg1 arg2 ...)

58303)

59304```

305+

60306The number of arguments depends on the predicate that's used.

61307Each argument is either a capture (`@name`) or a string (`"some string"`).

62308The following predicates are supported by tree-sitter:

@@ -77,3 +323,47 @@ argument (a string).

77323

78324- `#same-line?`/`#not-same-line?`:

79325The 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.mdnew file+57

@@ -0,0 +1,57 @@

1+# Adding Injection Queries

3+Writing language injection queries allows one to highlight a specific node as a different language.

4+In addition to the [standard][upstream-docs] language injection options used by tree-sitter, there

5+are a few Helix specific extensions that allow for more control.

7+And example of a simple query that would highlight all strings as bash in Nix:

8+```scm

9+((string_expression (string_fragment) @injection.content)

10+ (#set! injection.language "bash"))

11+```

12+

13+## Capture Types

14+

15+- `@injection.language` (standard):

16+The captured node may contain the language name used to highlight the node captured by

17+`@injection.content`.

18+

19+- `@injection.content` (standard):

20+Marks the content to be highlighted as the language captured with `@injection.language` _et al_.

21+

22+- `@injection.filename` (extension):

23+The captured node may contain a filename with a file-extension known to Helix,

24+highlighting `@injection.content` as that language. This uses the language extensions defined in

25+both the default languages.toml distributed with Helix, as well as user defined languages.

26+

27+- `@injection.shebang` (extension):

28+The captured node may contain a shebang used to choose a language to highlight as. This also uses

29+the shebangs defined in the default and user `languages.toml`.

30+

31+## Settings

32+

33+- `injection.combined` (standard):

34+Indicates that all the matching nodes in the tree should have their content parsed as one

35+nested document.

36+

37+- `injection.language` (standard):

38+Forces the captured content to be highlighted as the given language

39+

40+- `injection.include-children` (standard):

41+Indicates that the content node’s entire text should be re-parsed, including the text of its child

42+nodes. By default, child nodes’ text will be excluded from the injected document.

43+

44+- `injection.include-unnamed-children` (extension):

45+Same as `injection.include-children` but only for unnamed child nodes.

46+

47+## Predicates

48+

49+- `#eq?` (standard):

50+The first argument (a capture) must be equal to the second argument

51+(a capture or a string).

52+

53+- `#match?` (standard):

54+The first argument (a capture) must match the regex given in the

55+second argument (a string).

56+

57+[upstream-docs]: http://tree-sitter.github.io/tree-sitter/syntax-highlighting#language-injection

book/src/guides/textobject.md+9−9

@@ -1,14 +1,14 @@

1−# Adding Textobject Queries

1+# Adding textobject queries

3−Textobjects that are language specific ([like functions, classes, etc][textobjects])

4−require an accompanying tree-sitter grammar and a `textobjects.scm` query file

3+Helix supports textobjects that are language specific, such as functions, classes, etc.

4+These textobjects require an accompanying tree-sitter grammar and a `textobjects.scm` query file

55to work properly. Tree-sitter allows us to query the source code syntax tree

66and capture specific parts of it. The queries are written in a lisp dialect.

77More information on how to write queries can be found in the [official tree-sitter

88documentation][tree-sitter-queries].

1010Query files should be placed in `runtime/queries/{language}/textobjects.scm`

11−when contributing. Note that to test the query files locally you should put

11+when contributing to Helix. Note that to test the query files locally you should put

1212them under your local runtime directory (`~/.config/helix/runtime` on Linux

1313for example).

1414

@@ -20,15 +20,17 @@ The following [captures][tree-sitter-captures] are recognized:

2020| `function.around` |

2121| `class.inside` |

2222| `class.around` |

23+| `test.inside` |

24+| `test.around` |

2325| `parameter.inside` |

2426| `comment.inside` |

2527| `comment.around` |

2628

2729[Example query files][textobject-examples] can be found in the helix GitHub repository.

2830

29−## Queries for Textobject Based Navigation

31+## Queries for textobject based navigation

3032

31−[Tree-sitter based navigation][textobjects-nav] is done using captures in the

33+Tree-sitter based navigation in Helix is done using captures in the

3234following order:

3335

3436- `object.movement`

@@ -36,12 +38,10 @@ following order:

3638- `object.inside`

3739

3840For example if a `function.around` capture has been already defined for a language

39−in it's `textobjects.scm` file, function navigation should also work automatically.

41+in its `textobjects.scm` file, function navigation should also work automatically.

4042`function.movement` should be defined only if the node captured by `function.around`

4143doesn't make sense in a navigation context.

4244

43−[textobjects]: ../usage.md#textobjects

44−[textobjects-nav]: ../usage.md#tree-sitter-textobject-based-navigation

4545[tree-sitter-queries]: https://tree-sitter.github.io/tree-sitter/using-parsers#query-syntax

4646[tree-sitter-captures]: https://tree-sitter.github.io/tree-sitter/using-parsers#capturing-nodes

4747[textobject-examples]: https://github.com/search?q=repo%3Ahelix-editor%2Fhelix+filename%3Atextobjects.scm&type=Code&ref=advsearch&l=&l=

book/src/hooks.mddeleted−1

@@ -1 +0,0 @@

1−# Hooks

book/src/install.md+287−35

@@ -1,68 +1,320 @@

1−# Installation

1+# Installing Helix

3−We provide pre-built binaries on the [GitHub Releases page](https://github.com/helix-editor/helix/releases).

3+

4+- [Pre-built binaries](#pre-built-binaries)

5+- [Linux, macOS, Windows and OpenBSD packaging status](#linux-macos-windows-and-openbsd-packaging-status)

6+- [Linux](#linux)

7+ - [Ubuntu](#ubuntu)

8+ - [Fedora/RHEL](#fedorarhel)

9+ - [Arch Linux extra](#arch-linux-extra)

10+ - [NixOS](#nixos)

11+ - [Flatpak](#flatpak)

12+ - [Snap](#snap)

13+ - [AppImage](#appimage)

14+- [macOS](#macos)

15+ - [Homebrew Core](#homebrew-core)

16+ - [MacPorts](#macports)

17+- [Windows](#windows)

18+ - [Winget](#winget)

19+ - [Scoop](#scoop)

20+ - [Chocolatey](#chocolatey)

21+ - [MSYS2](#msys2)

22+- [Building from source](#building-from-source)

23+ - [Configuring Helix's runtime files](#configuring-helixs-runtime-files)

24+ - [Linux and macOS](#linux-and-macos)

25+ - [Windows](#windows)

26+ - [Multiple runtime directories](#multiple-runtime-directories)

27+ - [Validating the installation](#validating-the-installation)

28+ - [Configure the desktop shortcut](#configure-the-desktop-shortcut)

29+

30+

31+To install Helix, follow the instructions specific to your operating system.

32+Note that:

33+

34+- To get the latest nightly version of Helix, you need to

35+ [build from source](#building-from-source).

36+

37+- To take full advantage of Helix, install the language servers for your

38+ preferred programming languages. See the

39+ [wiki](https://github.com/helix-editor/helix/wiki/How-to-install-the-default-language-servers)

40+ for instructions.

41+

42+## Pre-built binaries

43+

44+Download pre-built binaries from the

45+[GitHub Releases page](https://github.com/helix-editor/helix/releases). Add the binary to your system's `$PATH` to use it from the command

46+line.

47+

48+## Linux, macOS, Windows and OpenBSD packaging status

449

550[![Packaging status](https://repology.org/badge/vertical-allrepos/helix.svg)](https://repology.org/project/helix/versions)

651

7−## OSX

52+## Linux

53+

54+The following third party repositories are available:

55+

56+### Ubuntu

857

9−A Homebrew tap is available:

58+Add the `PPA` for Helix:

1059

60+```sh

61+sudo add-apt-repository ppa:maveonair/helix-editor

62+sudo apt update

63+sudo apt install helix

1164```

12−brew tap helix-editor/helix

13−brew install helix

65+

66+### Fedora/RHEL

67+

68+```sh

69+sudo dnf install helix

1470```

1571

16−## Linux

72+### Arch Linux extra

73+

74+Releases are available in the `extra` repository:

75+

76+```sh

77+sudo pacman -S helix

78+```

79+Additionally, a [helix-git](https://aur.archlinux.org/packages/helix-git/) package is available

80+in the AUR, which builds the master branch.

1781

1882### NixOS

1983

20−A [flake](https://nixos.wiki/wiki/Flakes) containing the package is available in

21−the project root. The flake can also be used to spin up a reproducible development

22−shell for working on Helix with `nix develop`.

84+Helix is available in [nixpkgs](https://github.com/nixos/nixpkgs) through the `helix` attribute,

85+the unstable channel usually carries the latest release.

86+

87+Helix is also available as a [flake](https://nixos.wiki/wiki/Flakes) in the project

88+root. Use `nix develop` to spin up a reproducible development shell. Outputs are

89+cached for each push to master using [Cachix](https://www.cachix.org/). The

90+flake is configured to automatically make use of this cache assuming the user

91+accepts the new settings on first use.

2392

24−Flake outputs are cached for each push to master using

25−[Cachix](https://www.cachix.org/). With Cachix

26−[installed](https://docs.cachix.org/installation), `cachix use helix` will

27−configure Nix to use cached outputs when possible.

93+If you are using a version of Nix without flakes enabled,

94+[install Cachix CLI](https://docs.cachix.org/installation) and use

95+`cachix use helix` to configure Nix to use cached outputs when possible.

2896

29−### Arch Linux

97+### Flatpak

3098

31−Releases are available in the `community` repository.

99+Helix is available on [Flathub](https://flathub.org/en-GB/apps/com.helix_editor.Helix):

32100

33−A [helix-git](https://aur.archlinux.org/packages/helix-git/) package is also available on the AUR, which builds the master branch.

101+```sh

102+flatpak install flathub com.helix_editor.Helix

103+flatpak run com.helix_editor.Helix

104+```

34105

35−### Fedora Linux

106+### Snap

36107

37−You can install the COPR package for Helix via

108+Helix is available on [Snapcraft](https://snapcraft.io/helix) and can be installed with:

38109

110+```sh

111+snap install --classic helix

39112```

40−sudo dnf copr enable varlad/helix

41−sudo dnf install helix

113+

114+This will install Helix as both `/snap/bin/helix` and `/snap/bin/hx`, so make sure `/snap/bin` is in your `PATH`.

115+

116+### AppImage

117+

118+Install Helix using the Linux [AppImage](https://appimage.org/) format.

119+Download the official Helix AppImage from the [latest releases](https://github.com/helix-editor/helix/releases/latest) page.

120+

121+```sh

122+chmod +x helix-*.AppImage # change permission for executable mode

123+./helix-*.AppImage # run helix

124+```

125+

126+## macOS

127+

128+### Homebrew Core

129+

130+```sh

131+brew install helix

132+```

133+

134+### MacPorts

135+

136+```sh

137+port install helix

138+```

139+

140+## Windows

141+

142+Install on Windows using [Winget](https://learn.microsoft.com/en-us/windows/package-manager/winget/), [Scoop](https://scoop.sh/), [Chocolatey](https://chocolatey.org/)

143+or [MSYS2](https://msys2.org/).

144+

145+### Winget

146+Windows Package Manager winget command-line tool is by default available on Windows 11 and modern versions of Windows 10 as a part of the App Installer.

147+You can get [App Installer from the Microsoft Store](https://www.microsoft.com/p/app-installer/9nblggh4nns1#activetab=pivot:overviewtab). If it's already installed, make sure it is updated with the latest version.

148+

149+```sh

150+winget install Helix.Helix

151+```

152+

153+### Scoop

154+

155+```sh

156+scoop install helix

157+```

158+

159+### Chocolatey

160+

161+```sh

162+choco install helix

42163```

43164

44−### Void Linux

165+### MSYS2

45166

167+For 64-bit Windows 8.1 or above:

168+

169+```sh

170+pacman -S mingw-w64-ucrt-x86_64-helix

46171```

47−sudo xbps-install helix

172+

173+## Building from source

174+

175+Requirements:

176+

177+Clone the Helix GitHub repository into a directory of your choice. The

178+examples in this documentation assume installation into either `~/src/` on

179+Linux and macOS, or `%userprofile%\src\` on Windows.

180+

181+- The [Rust toolchain](https://www.rust-lang.org/tools/install)

182+- The [Git version control system](https://git-scm.com/)

183+- A C++14 compatible compiler to build the tree-sitter grammars, for example GCC or Clang

184+

185+If you are using the `musl-libc` standard library instead of `glibc` the following environment variable must be set during the build to ensure tree-sitter grammars can be loaded correctly:

186+

187+```sh

188+RUSTFLAGS="-C target-feature=-crt-static"

189+```

190+

191+1. Clone the repository:

192+

193+ ```sh

194+ git clone https://github.com/helix-editor/helix

195+ cd helix

196+ ```

197+

198+2. Compile from source:

199+

200+ ```sh

201+ cargo install --path helix-term --locked

202+ ```

203+

204+ This command will create the `hx` executable and construct the tree-sitter

205+ grammars in the local `runtime` folder.

206+

207+> 💡 Tree-sitter grammars can be fetched and compiled if not pre-packaged. Fetch

208+> grammars with `hx --grammar fetch` and compile them with

209+> `hx --grammar build`. This will install them in

210+> the `runtime` directory within the user's helix config directory (more

211+> [details below](#multiple-runtime-directories)).

212+

213+### Configuring Helix's runtime files

214+

215+#### Linux and macOS

216+

217+The **runtime** directory is one below the Helix source, so either set a

218+`HELIX_RUNTIME` environment variable to point to that directory and add it to

219+your `~/.bashrc` or equivalent:

220+

221+```sh

222+HELIX_RUNTIME=~/src/helix/runtime

223+```

224+

225+Or, create a symbolic link:

226+

227+```sh

228+ln -Ts $PWD/runtime ~/.config/helix/runtime

48229```

49230

50−## Build from source

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.

51232

233+#### Windows

234+

235+Either set the `HELIX_RUNTIME` environment variable to point to the runtime files using the Windows setting (search for

236+`Edit environment variables for your account`) or use the `setx` command in

237+Cmd:

238+

239+```sh

240+setx HELIX_RUNTIME "%userprofile%\source\repos\helix\runtime"

52241```

53−git clone https://github.com/helix-editor/helix

54−cd helix

55−cargo install --path helix-term

242+

243+> 💡 `%userprofile%` resolves to your user directory like

244+> `C:\Users\Your-Name\` for example.

245+

246+Or, create a symlink in `%appdata%\helix\` that links to the source code directory:

247+

248+| Method | Command |

249+| ---------- | -------------------------------------------------------------------------------------- |

250+| PowerShell | `New-Item -ItemType Junction -Target "runtime" -Path "$Env:AppData\helix\runtime"` |

251+| Cmd | `cd %appdata%\helix` <br/> `mklink /D runtime "%userprofile%\src\helix\runtime"` |

252+

253+> 💡 On Windows, creating a symbolic link may require running PowerShell or

254+> Cmd as an administrator.

255+

256+#### Multiple runtime directories

257+

258+When Helix finds multiple runtime directories it will search through them for files in the

259+following order:

260+

261+1. `runtime/` sibling directory to `$CARGO_MANIFEST_DIR` directory (this is intended for

262+ developing and testing helix only).

263+2. `runtime/` subdirectory of OS-dependent helix user config directory.

264+3. `$HELIX_RUNTIME`

265+4. Distribution-specific fallback directory (set at compile time—not run time—

266+ with the `HELIX_DEFAULT_RUNTIME` environment variable)

267+5. `runtime/` subdirectory of path to Helix executable.

268+

269+This order also sets the priority for selecting which file will be used if multiple runtime

270+directories have files with the same name.

271+

272+#### Note to packagers

273+

274+If you are making a package of Helix for end users, to provide a good out of

275+the box experience, you should set the `HELIX_DEFAULT_RUNTIME` environment

276+variable at build time (before invoking `cargo build`) to a directory which

277+will store the final runtime files after installation. For example, say you want

278+to package the runtime into `/usr/lib/helix/runtime`. The rough steps a build

279+script could follow are:

280+

281+1. `export HELIX_DEFAULT_RUNTIME=/usr/lib/helix/runtime`

282+1. `cargo build --profile opt --locked --path helix-term`

283+1. `cp -r runtime $BUILD_DIR/usr/lib/helix/`

284+1. `cp target/opt/hx $BUILD_DIR/usr/bin/hx`

285+

286+This way the resulting `hx` binary will always look for its runtime directory in

287+`/usr/lib/helix/runtime` if the user has no custom runtime in `~/.config/helix`

288+or `HELIX_RUNTIME`.

289+

290+### Validating the installation

291+

292+To make sure everything is set up as expected you should run the Helix health

293+check:

294+

295+```sh

296+hx --health

56297```

57298

58−This will install the `hx` binary to `$HOME/.cargo/bin`.

299+For more information on the health check results refer to

300+[Health check](https://github.com/helix-editor/helix/wiki/Healthcheck).

301+

302+### Configure the desktop shortcut

59303

60−Helix also needs it's runtime files so make sure to copy/symlink the `runtime/` directory into the

61−config directory (for example `~/.config/helix/runtime` on Linux/macOS). This location can be overriden

62−via the `HELIX_RUNTIME` environment variable.

304+If your desktop environment supports the

305+[XDG desktop menu](https://specifications.freedesktop.org/menu-spec/menu-spec-latest.html)

306+you can configure Helix to show up in the application menu by copying the

307+provided `.desktop` and icon files to their correct folders:

63308

64−## Building tree-sitter grammars

309+```sh

310+cp contrib/Helix.desktop ~/.local/share/applications

311+cp contrib/helix.png ~/.icons # or ~/.local/share/icons

312+```

65313

66−Tree-sitter grammars must be fetched and compiled if not pre-packaged.

67−Fetch grammars with `hx --grammar fetch` (requires `git`) and compile them

68−with `hx --grammar build` (requires a C compiler).

314+To use another terminal than the system default, you can modify the `.desktop`

315+file. For example, to use `kitty`:

316+

317+```sh

318+sed -i "s|Exec=hx %F|Exec=kitty hx %F|g" ~/.local/share/applications/Helix.desktop

319+sed -i "s|Terminal=true|Terminal=false|g" ~/.local/share/applications/Helix.desktop

320+```

book/src/keymap.md+206−125

@@ -1,19 +1,41 @@

11# Keymap

3−- Mappings marked (**LSP**) require an active language server for the file.

4−- Mappings marked (**TS**) require a tree-sitter grammar for the filetype.

3+- [Normal mode](#normal-mode)

4+ - [Movement](#movement)

5+ - [Changes](#changes)

6+ - [Shell](#shell)

7+ - [Selection manipulation](#selection-manipulation)

8+ - [Search](#search)

9+ - [Minor modes](#minor-modes)

10+ - [View mode](#view-mode)

11+ - [Goto mode](#goto-mode)

12+ - [Match mode](#match-mode)

13+ - [Window mode](#window-mode)

14+ - [Space mode](#space-mode)

15+ - [Popup](#popup)

16+ - [Unimpaired](#unimpaired)

17+- [Insert mode](#insert-mode)

18+- [Select / extend mode](#select--extend-mode)

19+- [Picker](#picker)

20+- [Prompt](#prompt)

21+

22+> 💡 Mappings marked (**LSP**) require an active language server for the file.

23+

24+> 💡 Mappings marked (**TS**) require a tree-sitter grammar for the file type.

525

626## Normal mode

727

28+Normal mode is the default mode when you launch helix. You can return to it from other modes by pressing the `Escape` key.

29+

830### Movement

931

10−> NOTE: Unlike vim, `f`, `F`, `t` and `T` are not confined to the current line.

32+> NOTE: Unlike Vim, `f`, `F`, `t` and `T` are not confined to the current line.

1133

1234| Key | Description | Command |

1335| ----- | ----------- | ------- |

1436| `h`, `Left` | Move left | `move_char_left` |

15−| `j`, `Down` | Move down | `move_line_down` |

16−| `k`, `Up` | Move up | `move_line_up` |

37+| `j`, `Down` | Move down | `move_visual_line_down` |

38+| `k`, `Up` | Move up | `move_visual_line_up` |

1739| `l`, `Right` | Move right | `move_char_right` |

1840| `w` | Move next word start | `move_next_word_start` |

1941| `b` | Move previous word start | `move_prev_word_start` |

@@ -48,11 +70,11 @@

4870| `` Alt-` `` | Set the selected text to upper case | `switch_to_uppercase` |

4971| `i` | Insert before selection | `insert_mode` |

5072| `a` | Insert after selection (append) | `append_mode` |

51−| `I` | Insert at the start of the line | `prepend_to_line` |

52−| `A` | Insert at the end of the line | `append_to_line` |

73+| `I` | Insert at the start of the line | `insert_at_line_start` |

74+| `A` | Insert at the end of the line | `insert_at_line_end` |

5375| `o` | Open new line below selection | `open_below` |

5476| `O` | Open new line above selection | `open_above` |

55−| `.` | Repeat last change | N/A |

77+| `.` | Repeat last insert | N/A |

5678| `u` | Undo change | `undo` |

5779| `U` | Redo change | `redo` |

5880| `Alt-u` | Move backward in history | `earlier` |

@@ -89,8 +111,10 @@

89111| Key | Description | Command |

90112| ----- | ----------- | ------- |

91113| `s` | Select all regex matches inside selections | `select_regex` |

92−| `S` | Split selection into subselections on regex matches | `split_selection` |

114+| `S` | Split selection into sub selections on regex matches | `split_selection` |

93115| `Alt-s` | Split selection on newlines | `split_selection_on_newline` |

116+| `Alt-minus` | Merge selections | `merge_selections` |

117+| `Alt-_` | Merge consecutive selections | `merge_consecutive_selections` |

94118| `&` | Align selection in columns | `align_selections` |

95119| `_` | Trim whitespace from the selection | `trim_selections` |

96120| `;` | Collapse selection onto a single cursor | `collapse_selection` |

@@ -105,20 +129,22 @@

105129| `Alt-(` | Rotate selection contents backward | `rotate_selection_contents_backward` |

106130| `Alt-)` | Rotate selection contents forward | `rotate_selection_contents_forward` |

107131| `%` | Select entire file | `select_all` |

108−| `x` | Select current line, if already selected, extend to next line | `extend_line` |

132+| `x` | Select current line, if already selected, extend to next line | `extend_line_below` |

109133| `X` | Extend selection to line bounds (line-wise selection) | `extend_to_line_bounds` |

134+| `Alt-x` | Shrink selection to line bounds (line-wise selection) | `shrink_to_line_bounds` |

110135| `J` | Join lines inside selection | `join_selections` |

136+| `Alt-J` | Join lines inside selection and select the inserted space | `join_selections_space` |

111137| `K` | Keep selections matching the regex | `keep_selections` |

112138| `Alt-K` | Remove selections matching the regex | `remove_selections` |

113139| `Ctrl-c` | Comment/uncomment the selections | `toggle_comments` |

114−| `Alt-k`, `Alt-up` | Expand selection to parent syntax node (**TS**) | `expand_selection` |

115−| `Alt-j`, `Alt-down` | Shrink syntax tree object selection (**TS**) | `shrink_selection` |

116−| `Alt-h`, `Alt-left` | Select previous sibling node in syntax tree (**TS**) | `select_prev_sibling` |

117−| `Alt-l`, `Alt-right` | Select next sibling node in syntax tree (**TS**) | `select_next_sibling` |

140+| `Alt-o`, `Alt-up` | Expand selection to parent syntax node (**TS**) | `expand_selection` |

141+| `Alt-i`, `Alt-down` | Shrink syntax tree object selection (**TS**) | `shrink_selection` |

142+| `Alt-p`, `Alt-left` | Select previous sibling node in syntax tree (**TS**) | `select_prev_sibling` |

143+| `Alt-n`, `Alt-right` | Select next sibling node in syntax tree (**TS**) | `select_next_sibling` |

118144

119145### Search

120146

121−Search commands all operate on the `/` register by default. Use `"<char>` to operate on a different one.

147+Search commands all operate on the `/` register by default. To use a different register, use `"<char>`.

122148

123149| Key | Description | Command |

124150| ----- | ----------- | ------- |

@@ -143,12 +169,17 @@ These sub-modes are accessible from normal mode and typically switch back to nor

143169| `Ctrl-w` | Enter [window mode](#window-mode) | N/A |

144170| `Space` | Enter [space mode](#space-mode) | N/A |

145171

172+These modes (except command mode) can be configured by

173+[remapping keys](https://docs.helix-editor.com/remapping.html#minor-modes).

174+

146175#### View mode

147176

177+Accessed by typing `z` in [normal mode](#normal-mode).

178+

148179View mode is intended for scrolling and manipulating the view without changing

149−the selection. The "sticky" variant of this mode is persistent; use the Escape

150−key to return to normal mode after usage (useful when you're simply looking

151−over text and not actively editing it).

180+the selection. The "sticky" variant of this mode (accessed by typing `Z` in

181+normal mode) is persistent and can be exited using the escape key. This is

182+useful when you're simply looking over text and not actively editing it.

152183

153184

154185| Key | Description | Command |

@@ -166,6 +197,8 @@ over text and not actively editing it).

166197

167198#### Goto mode

168199

200+Accessed by typing `g` in [normal mode](#normal-mode).

201+

169202Jumps to various locations.

170203

171204| Key | Description | Command |

@@ -188,12 +221,15 @@ Jumps to various locations.

188221| `n` | Go to next buffer | `goto_next_buffer` |

189222| `p` | Go to previous buffer | `goto_previous_buffer` |

190223| `.` | Go to last modification in current file | `goto_last_modification` |

224+| `j` | Move down textual (instead of visual) line | `move_line_down` |

225+| `k` | Move up textual (instead of visual) line | `move_line_up` |

191226

192227#### Match mode

193228

194−Enter this mode using `m` from normal mode. See the relavant section

195−in [Usage](./usage.md) for an explanation about [surround](./usage.md#surround)

196−and [textobject](./usage.md#textobject) usage.

229+Accessed by typing `m` in [normal mode](#normal-mode).

230+

231+See the relevant section in [Usage](./usage.md) for an explanation about

232+[surround](./usage.md#surround) and [textobject](./usage.md#navigating-using-tree-sitter-textobjects) usage.

197233

198234| Key | Description | Command |

199235| ----- | ----------- | ------- |

@@ -208,7 +244,9 @@ TODO: Mappings for selecting syntax nodes (a superset of `[`).

208244

209245#### Window mode

210246

211−This layer is similar to vim keybindings as kakoune does not support window.

247+Accessed by typing `Ctrl-w` in [normal mode](#normal-mode).

248+

249+This layer is similar to Vim keybindings as Kakoune does not support windows.

212250

213251| Key | Description | Command |

214252| ----- | ------------- | ------- |

@@ -223,32 +261,43 @@ This layer is similar to vim keybindings as kakoune does not support window.

223261| `l`, `Ctrl-l`, `Right` | Move to right split | `jump_view_right` |

224262| `q`, `Ctrl-q` | Close current window | `wclose` |

225263| `o`, `Ctrl-o` | Only keep the current window, closing all the others | `wonly` |

264+| `H` | Swap window to the left | `swap_view_left` |

265+| `J` | Swap window downwards | `swap_view_down` |

266+| `K` | Swap window upwards | `swap_view_up` |

267+| `L` | Swap window to the right | `swap_view_right` |

226268

227269#### Space mode

228270

229−This layer is a kludge of mappings, mostly pickers.

271+Accessed by typing `Space` in [normal mode](#normal-mode).

230272

273+This layer is a kludge of mappings, mostly pickers.

231274

232−| Key | Description | Command |

233−| ----- | ----------- | ------- |

234−| `f` | Open file picker | `file_picker` |

235−| `b` | Open buffer picker | `buffer_picker` |

236−| `k` | Show documentation for item under cursor in a [popup](#popup) (**LSP**) | `hover` |

237−| `s` | Open document symbol picker (**LSP**) | `symbol_picker` |

238−| `S` | Open workspace symbol picker (**LSP**) | `workspace_symbol_picker` |

239−| `r` | Rename symbol (**LSP**) | `rename_symbol` |

240−| `a` | Apply code action (**LSP**) | `code_action` |

241−| `'` | Open last fuzzy picker | `last_picker` |

242−| `w` | Enter [window mode](#window-mode) | N/A |

243−| `p` | Paste system clipboard after selections | `paste_clipboard_after` |

244−| `P` | Paste system clipboard before selections | `paste_clipboard_before` |

245−| `y` | Join and yank selections to clipboard | `yank_joined_to_clipboard` |

246−| `Y` | Yank main selection to clipboard | `yank_main_selection_to_clipboard` |

247−| `R` | Replace selections by clipboard contents | `replace_selections_with_clipboard` |

248−| `/` | Global search in workspace folder | `global_search` |

249−| `?` | Open command palette | `command_palette` |

250−

251−> TIP: Global search displays results in a fuzzy picker, use `space + '` to bring it back up after opening a file.

275+| Key | Description | Command |

276+| ----- | ----------- | ------- |

277+| `f` | Open file picker | `file_picker` |

278+| `F` | Open file picker at current working directory | `file_picker_in_current_directory` |

279+| `b` | Open buffer picker | `buffer_picker` |

280+| `j` | Open jumplist picker | `jumplist_picker` |

281+| `g` | Debug (experimental) | N/A |

282+| `k` | Show documentation for item under cursor in a [popup](#popup) (**LSP**) | `hover` |

283+| `s` | Open document symbol picker (**LSP**) | `symbol_picker` |

284+| `S` | Open workspace symbol picker (**LSP**) | `workspace_symbol_picker` |

285+| `d` | Open document diagnostics picker (**LSP**) | `diagnostics_picker` |

286+| `D` | Open workspace diagnostics picker (**LSP**) | `workspace_diagnostics_picker` |

287+| `r` | Rename symbol (**LSP**) | `rename_symbol` |

288+| `a` | Apply code action (**LSP**) | `code_action` |

289+| `h` | Select symbol references (**LSP**) | `select_references_to_symbol_under_cursor` |

290+| `'` | Open last fuzzy picker | `last_picker` |

291+| `w` | Enter [window mode](#window-mode) | N/A |

292+| `p` | Paste system clipboard after selections | `paste_clipboard_after` |

293+| `P` | Paste system clipboard before selections | `paste_clipboard_before` |

294+| `y` | Yank selections to clipboard | `yank_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` |

297+| `/` | Global search in workspace folder | `global_search` |

298+| `?` | Open command palette | `command_palette` |

299+

300+> 💡 Global search displays results in a fuzzy picker, use `Space + '` to bring it back up after opening a file.

252301

253302##### Popup

254303

@@ -258,67 +307,98 @@ Displays documentation for item under cursor.

258307| ---- | ----------- |

259308| `Ctrl-u` | Scroll up |

260309| `Ctrl-d` | Scroll down |

261−

310+

262311#### Unimpaired

263312

264−Mappings in the style of [vim-unimpaired](https://github.com/tpope/vim-unimpaired).

313+These mappings are in the style of [vim-unimpaired](https://github.com/tpope/vim-unimpaired).

265314

266315| Key | Description | Command |

267316| ----- | ----------- | ------- |

268−| `[d` | Go to previous diagnostic (**LSP**) | `goto_prev_diag` |

269317| `]d` | Go to next diagnostic (**LSP**) | `goto_next_diag` |

270−| `[D` | Go to first diagnostic in document (**LSP**) | `goto_first_diag` |

318+| `[d` | Go to previous diagnostic (**LSP**) | `goto_prev_diag` |

271319| `]D` | Go to last diagnostic in document (**LSP**) | `goto_last_diag` |

320+| `[D` | Go to first diagnostic in document (**LSP**) | `goto_first_diag` |

272321| `]f` | Go to next function (**TS**) | `goto_next_function` |

273322| `[f` | Go to previous function (**TS**) | `goto_prev_function` |

274−| `]c` | Go to next class (**TS**) | `goto_next_class` |

275−| `[c` | Go to previous class (**TS**) | `goto_prev_class` |

323+| `]t` | Go to next type definition (**TS**) | `goto_next_class` |

324+| `[t` | Go to previous type definition (**TS**) | `goto_prev_class` |

276325| `]a` | Go to next argument/parameter (**TS**) | `goto_next_parameter` |

277326| `[a` | Go to previous argument/parameter (**TS**) | `goto_prev_parameter` |

278−| `]o` | Go to next comment (**TS**) | `goto_next_comment` |

279−| `[o` | Go to previous comment (**TS**) | `goto_prev_comment` |

327+| `]c` | Go to next comment (**TS**) | `goto_next_comment` |

328+| `[c` | Go to previous comment (**TS**) | `goto_prev_comment` |

329+| `]T` | Go to next test (**TS**) | `goto_next_test` |

330+| `[T` | Go to previous test (**TS**) | `goto_prev_test` |

280331| `]p` | Go to next paragraph | `goto_next_paragraph` |

281332| `[p` | Go to previous paragraph | `goto_prev_paragraph` |

282−| `[space` | Add newline above | `add_newline_above` |

283−| `]space` | Add newline below | `add_newline_below` |

284−

285−## Insert Mode

286−

287−We support many readline/emacs style bindings in insert mode for

288−convenience. These can be helpful for making simple modifications

289−without escaping to normal mode, but beware that you will not have an

290−undo-able "save point" until you return to normal mode.

291−

292−| Key | Description | Command |

293−| ----- | ----------- | ------- |

294−| `Escape` | Switch to normal mode | `normal_mode` |

295−| `Ctrl-x` | Autocomplete | `completion` |

296−| `Ctrl-r` | Insert a register content | `insert_register` |

297−| `Ctrl-w`, `Alt-Backspace` | Delete previous word | `delete_word_backward` |

298−| `Alt-d` | Delete next word | `delete_word_forward` |

299−| `Alt-b`, `Alt-Left` | Backward a word | `move_prev_word_end` |

300−| `Ctrl-b`, `Left` | Backward a char | `move_char_left` |

301−| `Alt-f`, `Alt-Right` | Forward a word | `move_next_word_start` |

302−| `Ctrl-f`, `Right` | Forward a char | `move_char_right` |

303−| `Ctrl-e`, `End` | Move to line end | `goto_line_end_newline` |

304−| `Ctrl-a`, `Home` | Move to line start | `goto_line_start` |

305−| `Ctrl-u` | Delete to start of line | `kill_to_line_start` |

306−| `Ctrl-k` | Delete to end of line | `kill_to_line_end` |

307−| `Ctrl-j`, `Enter` | Insert new line | `insert_newline` |

308−| `Backspace`, `Ctrl-h` | Delete previous char | `delete_char_backward` |

309−| `Delete`, `Ctrl-d` | Delete next char | `delete_char_forward` |

310−| `Ctrl-p`, `Up` | Move to previous line | `move_line_up` |

311−| `Ctrl-n`, `Down` | Move to next line | `move_line_down` |

312−| `PageUp` | Move one page up | `page_up` |

313−| `PageDown` | Move one page down | `page_down` |

314−| `Alt->` | Go to end of buffer | `goto_file_end` |

315−| `Alt-<` | Go to start of buffer | `goto_file_start` |

333+| `]g` | Go to next change | `goto_next_change` |

334+| `[g` | Go to previous change | `goto_prev_change` |

335+| `]G` | Go to last change | `goto_last_change` |

336+| `[G` | Go to first change | `goto_first_change` |

337+| `]Space` | Add newline below | `add_newline_below` |

338+| `[Space` | Add newline above | `add_newline_above` |

339+

340+## Insert mode

341+

342+Accessed by typing `i` in [normal mode](#normal-mode).

343+

344+Insert mode bindings are minimal by default. Helix is designed to

345+be a modal editor, and this is reflected in the user experience and internal

346+mechanics. Changes to the text are only saved for undos when

347+escaping from insert mode to normal mode.

348+

349+> 💡 New users are strongly encouraged to learn the modal editing paradigm

350+> to get the smoothest experience.

351+

352+| Key | Description | Command |

353+| ----- | ----------- | ------- |

354+| `Escape` | Switch to normal mode | `normal_mode` |

355+| `Ctrl-s` | Commit undo checkpoint | `commit_undo_checkpoint` |

356+| `Ctrl-x` | Autocomplete | `completion` |

357+| `Ctrl-r` | Insert a register content | `insert_register` |

358+| `Ctrl-w`, `Alt-Backspace` | Delete previous word | `delete_word_backward` |

359+| `Alt-d`, `Alt-Delete` | Delete next word | `delete_word_forward` |

360+| `Ctrl-u` | Delete to start of line | `kill_to_line_start` |

361+| `Ctrl-k` | Delete to end of line | `kill_to_line_end` |

362+| `Ctrl-h`, `Backspace`, `Shift-Backspace` | Delete previous char | `delete_char_backward` |

363+| `Ctrl-d`, `Delete` | Delete next char | `delete_char_forward` |

364+| `Ctrl-j`, `Enter` | Insert new line | `insert_newline` |

365+

366+These keys are not recommended, but are included for new users less familiar

367+with modal editors.

368+

369+| Key | Description | Command |

370+| ----- | ----------- | ------- |

371+| `Up` | Move to previous line | `move_line_up` |

372+| `Down` | Move to next line | `move_line_down` |

373+| `Left` | Backward a char | `move_char_left` |

374+| `Right` | Forward a char | `move_char_right` |

375+| `PageUp` | Move one page up | `page_up` |

376+| `PageDown` | Move one page down | `page_down` |

377+| `Home` | Move to line start | `goto_line_start` |

378+| `End` | Move to line end | `goto_line_end_newline` |

379+

380+As you become more comfortable with modal editing, you may want to disable some

381+insert mode bindings. You can do this by editing your `config.toml` file.

382+

383+```toml

384+[keys.insert]

385+up = "no_op"

386+down = "no_op"

387+left = "no_op"

388+right = "no_op"

389+pageup = "no_op"

390+pagedown = "no_op"

391+home = "no_op"

392+end = "no_op"

393+```

316394

317395## Select / extend mode

318396

319−This mode echoes Normal mode, but changes any movements to extend

397+Accessed by typing `v` in [normal mode](#normal-mode).

398+

399+Select mode echoes Normal mode, but changes any movements to extend

320400selections rather than replace them. Goto motions are also changed to

321−extend, so that `vgl` for example extends the selection to the end of

401+extend, so that `vgl`, for example, extends the selection to the end of

322402the line.

323403

324404Search is also affected. By default, `n` and `N` will remove the current

@@ -327,47 +407,48 @@ mode before pressing `n` or `N` makes it possible to keep the current

327407selection. Toggling it on and off during your iterative searching allows

328408you to selectively add search terms to your selections.

329409

330−# Picker

410+## Picker

331411

332412Keys to use within picker. Remapping currently not supported.

333413

334−| Key | Description |

335−| ----- | ------------- |

336−| `Up`, `Ctrl-p` | Previous entry |

337−| `PageUp`, `Ctrl-u` | Page up |

338−| `Down`, `Ctrl-n` | Next entry |

339−| `PageDown`, `Ctrl-d` | Page down |

340−| `Home` | Go to first entry |

341−| `End` | Go to last entry |

342−| `Ctrl-space` | Filter options |

343−| `Enter` | Open selected |

344−| `Ctrl-s` | Open horizontally |

345−| `Ctrl-v` | Open vertically |

346−| `Escape`, `Ctrl-c` | Close picker |

347−

348−# Prompt

414+| Key | Description |

415+| ----- | ------------- |

416+| `Shift-Tab`, `Up`, `Ctrl-p` | Previous entry |

417+| `Tab`, `Down`, `Ctrl-n` | Next entry |

418+| `PageUp`, `Ctrl-u` | Page up |

419+| `PageDown`, `Ctrl-d` | Page down |

420+| `Home` | Go to first entry |

421+| `End` | Go to last entry |

422+| `Enter` | Open selected |

423+| `Alt-Enter` | Open selected in the background without closing the picker |

424+| `Ctrl-s` | Open horizontally |

425+| `Ctrl-v` | Open vertically |

426+| `Ctrl-t` | Toggle preview |

427+| `Escape`, `Ctrl-c` | Close picker |

428+

429+## Prompt

349430

350431Keys to use within prompt, Remapping currently not supported.

351432

352−| Key | Description |

353−| ----- | ------------- |

354−| `Escape`, `Ctrl-c` | Close prompt |

355−| `Alt-b`, `Alt-Left` | Backward a word |

356−| `Ctrl-b`, `Left` | Backward a char |

357−| `Alt-f`, `Alt-Right` | Forward a word |

358−| `Ctrl-f`, `Right` | Forward a char |

359−| `Ctrl-e`, `End` | Move prompt end |

360−| `Ctrl-a`, `Home` | Move prompt start |

361−| `Ctrl-w` | Delete previous word |

362−| `Alt-d` | Delete next word |

363−| `Ctrl-u` | Delete to start of line |

364−| `Ctrl-k` | Delete to end of line |

365−| `backspace`, `Ctrl-h` | Delete previous char |

366−| `delete`, `Ctrl-d` | Delete next char |

367−| `Ctrl-s` | Insert a word under doc cursor, may be changed to Ctrl-r Ctrl-w later |

368−| `Ctrl-p`, `Up` | Select previous history |

369−| `Ctrl-n`, `Down` | Select next history |

370−| `Tab` | Select next completion item |

371−| `BackTab` | Select previous completion item |

372−| `Enter` | Open selected |

373−

433+| Key | Description |

434+| ----- | ------------- |

435+| `Escape`, `Ctrl-c` | Close prompt |

436+| `Alt-b`, `Ctrl-Left` | Backward a word |

437+| `Ctrl-b`, `Left` | Backward a char |

438+| `Alt-f`, `Ctrl-Right` | Forward a word |

439+| `Ctrl-f`, `Right` | Forward a char |

440+| `Ctrl-e`, `End` | Move prompt end |

441+| `Ctrl-a`, `Home` | Move prompt start |

442+| `Ctrl-w`, `Alt-Backspace`, `Ctrl-Backspace` | Delete previous word |

443+| `Alt-d`, `Alt-Delete`, `Ctrl-Delete` | Delete next word |

444+| `Ctrl-u` | Delete to start of line |

445+| `Ctrl-k` | Delete to end of line |

446+| `Backspace`, `Ctrl-h`, `Shift-Backspace` | Delete previous char |

447+| `Delete`, `Ctrl-d` | Delete next char |

448+| `Ctrl-s` | Insert a word under doc cursor, may be changed to Ctrl-r Ctrl-w later |

449+| `Ctrl-p`, `Up` | Select previous history |

450+| `Ctrl-n`, `Down` | Select next history |

451+| `Ctrl-r` | Insert the content of the register selected by following input char |

452+| `Tab` | Select next completion item |

453+| `BackTab` | Select previous completion item |

454+| `Enter` | Open selected |

book/src/lang-support.md+2−2

@@ -1,10 +1,10 @@

11# Language Support

3−The following languages and Language Servers are supported. In order to use

3+The following languages and Language Servers are supported. To use

44Language Server features, you must first [install][lsp-install-wiki] the

55appropriate Language Server.

7−Check the language support in your installed helix version with `hx --health`.

7+You can check the language support in your installed helix version with `hx --health`.

99Also see the [Language Configuration][lang-config] docs and the [Adding

1010Languages][adding-languages] guide for more language configuration information.

book/src/languages.md+212−15

@@ -1,34 +1,229 @@

11# Languages

3−Language-specific settings and settings for particular language servers can be configured in a `languages.toml` file placed in your [configuration directory](./configuration.md). Helix actually uses two `languages.toml` files, the [first one](https://github.com/helix-editor/helix/blob/master/languages.toml) is in the main helix repository; it contains the default settings for each language and is included in the helix binary at compile time. Users who want to see the available settings and options can either reference the helix repo's `languages.toml` file, or consult the table in the [adding languages](./guides/adding_languages.md) section.

3+Language-specific settings and settings for language servers are configured

4+in `languages.toml` files.

5−Changes made to the `languages.toml` file in a user's [configuration directory](./configuration.md) are merged with helix's defaults on start-up, such that a user's settings will take precedence over defaults in the event of a collision. For example, the default `languages.toml` sets rust's `auto-format` to `true`. If a user wants to disable auto-format, they can change the `languages.toml` in their [configuration directory](./configuration.md) to make the rust entry read like the example below; the new key/value pair `auto-format = false` will override the default when the two sets of settings are merged on start-up:

6+## `languages.toml` files

7−```toml

8−# in <config_dir>/helix/languages.toml

8+There are three possible locations for a `languages.toml` file:

10+1. In the Helix source code, which lives in the

11+ [Helix repository](https://github.com/helix-editor/helix/blob/master/languages.toml).

12+ It provides the default configurations for languages and language servers.

13+

14+2. In your [configuration directory](./configuration.md). This overrides values

15+ from the built-in language configuration. For example, to disable

16+ auto-LSP-formatting in Rust:

17+

18+ ```toml

19+ # in <config_dir>/helix/languages.toml

20+

21+ [language-server.mylang-lsp]

22+ command = "mylang-lsp"

23+

24+ [[language]]

25+ name = "rust"

26+ auto-format = false

27+ ```

28+

29+3. In a `.helix` folder in your project. Language configuration may also be

30+ overridden local to a project by creating a `languages.toml` file in a

31+ `.helix` folder. Its settings will be merged with the language configuration

32+ in the configuration directory and the built-in configuration.

933

34+## Language configuration

35+

36+Each language is configured by adding a `[[language]]` section to a

37+`languages.toml` file. For example:

38+

39+```toml

1040[[language]]

11−name = "rust"

12−auto-format = false

41+name = "mylang"

42+scope = "source.mylang"

43+injection-regex = "mylang"

44+file-types = ["mylang", "myl"]

45+comment-token = "#"

46+indent = { tab-width = 2, unit = " " }

47+formatter = { command = "mylang-formatter" , args = ["--stdin"] }

48+language-servers = [ "mylang-lsp" ]

1349```

1450

15−## Tree-sitter grammars

51+These configuration keys are available:

52+

53+| Key | Description |

54+| ---- | ----------- |

55+| `name` | The name of the language |

56+| `language-id` | The language-id for language servers, checkout the table at [TextDocumentItem](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocumentItem) for the right id |

57+| `scope` | A string like `source.js` that identifies the language. Currently, we strive to match the scope names used by popular TextMate grammars and by the Linguist library. Usually `source.<name>` or `text.<name>` in case of markup languages |

58+| `injection-regex` | regex pattern that will be tested against a language name in order to determine whether this language should be used for a potential [language injection][treesitter-language-injection] site. |

59+| `file-types` | The filetypes of the language, for example `["yml", "yaml"]`. See the file-type detection section below. |

60+| `shebangs` | The interpreters from the shebang line, for example `["sh", "bash"]` |

61+| `roots` | A set of marker files to look for when trying to find the workspace root. For example `Cargo.lock`, `yarn.lock` |

62+| `auto-format` | Whether to autoformat this language when saving |

63+| `diagnostic-severity` | Minimal severity of diagnostic for it to be displayed. (Allowed values: `Error`, `Warning`, `Info`, `Hint`) |

64+| `comment-token` | The token to use as a comment-token |

65+| `indent` | The indent to use. Has sub keys `unit` (the text inserted into the document when indenting; usually set to N spaces or `"\t"` for tabs) and `tab-width` (the number of spaces rendered for a tab) |

66+| `language-servers` | The Language Servers used for this language. See below for more information in the section [Configuring Language Servers for a language](#configuring-language-servers-for-a-language) |

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 |

69+| `soft-wrap` | [editor.softwrap](./configuration.md#editorsoft-wrap-section)

70+| `text-width` | Maximum line length. Used for the `:reflow` command and soft-wrapping if `soft-wrap.wrap-at-text-width` is set, defaults to `editor.text-width` |

71+| `workspace-lsp-roots` | Directories relative to the workspace root that are treated as LSP roots. Should only be set in `.helix/config.toml`. Overwrites the setting of the same name in `config.toml` if set. |

72+| `persistent-diagnostic-sources` | An array of LSP diagnostic sources assumed unchanged when the language server resends the same set of diagnostics. Helix can track the position for these diagnostics internally instead. Useful for diagnostics that are recomputed on save.

1673

17−Tree-sitter grammars can also be configured in `languages.toml`:

74+### File-type detection and the `file-types` key

75+

76+Helix determines which language configuration to use based on the `file-types` key

77+from the above section. `file-types` is a list of strings or tables, for

78+example:

1879

1980```toml

20−# in <config_dir>/helix/languages.toml

81+file-types = ["Makefile", "toml", { suffix = ".git/config" }]

82+```

2183

22−[[grammar]]

23−name = "rust"

24−source = { git = "https://github.com/tree-sitter/tree-sitter-rust", rev = "a250c4582510ff34767ec3b7dcdd3c24e8c8aa68" }

84+When determining a language configuration to use, Helix searches the file-types

85+with the following priorities:

86+

87+1. Exact match: if the filename of a file is an exact match of a string in a

88+ `file-types` list, that language wins. In the example above, `"Makefile"`

89+ will match against `Makefile` files.

90+2. Extension: if there are no exact matches, any `file-types` string that

91+ matches the file extension of a given file wins. In the example above, the

92+ `"toml"` matches files like `Cargo.toml` or `languages.toml`.

93+3. Suffix: if there are still no matches, any values in `suffix` tables

94+ are checked against the full path of the given file. In the example above,

95+ the `{ suffix = ".git/config" }` would match against any `config` files

96+ in `.git` directories. Note: `/` is used as the directory separator but is

97+ replaced at runtime with the appropriate path separator for the operating

98+ system, so this rule would match against `.git\config` files on Windows.

99+

100+## Language Server configuration

101+

102+Language servers are configured separately in the table `language-server` in the same file as the languages `languages.toml`

103+

104+For example:

105+

106+```toml

107+[language-server.mylang-lsp]

108+command = "mylang-lsp"

109+args = ["--stdio"]

110+config = { provideFormatter = true }

111+environment = { "ENV1" = "value1", "ENV2" = "value2" }

112+

113+[language-server.efm-lsp-prettier]

114+command = "efm-langserver"

115+

116+[language-server.efm-lsp-prettier.config]

117+documentFormatting = true

118+languages = { typescript = [ { formatCommand ="prettier --stdin-filepath ${INPUT}", formatStdin = true } ] }

119+```

120+

121+These are the available options for a language server.

122+

123+| Key | Description |

124+| ---- | ----------- |

125+| `command` | The name or path of the language server binary to execute. Binaries must be in `$PATH` |

126+| `args` | A list of arguments to pass to the language server binary |

127+| `config` | LSP initialization options |

128+| `timeout` | The maximum time a request to the language server may take, in seconds. Defaults to `20` |

129+| `environment` | Any environment variables that will be used when starting the language server `{ "KEY1" = "Value1", "KEY2" = "Value2" }` |

130+

131+A `format` sub-table within `config` can be used to pass extra formatting options to

132+[Document Formatting Requests](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_formatting).

133+For example, with typescript:

134+

135+```toml

136+[language-server.typescript-language-server]

137+# pass format options according to https://github.com/typescript-language-server/typescript-language-server#workspacedidchangeconfiguration omitting the "[language].format." prefix.

138+config = { format = { "semicolons" = "insert", "insertSpaceBeforeFunctionParenthesis" = true } }

139+```

140+

141+### Configuring Language Servers for a language

142+

143+The `language-servers` attribute in a language tells helix which language servers are used for this language.

144+

145+They have to be defined in the `[language-server]` table as described in the previous section.

146+

147+Different languages can use the same language server instance, e.g. `typescript-language-server` is used for javascript, jsx, tsx and typescript by default.

148+

149+In case multiple language servers are specified in the `language-servers` attribute of a `language`,

150+it's often useful to only enable/disable certain language-server features for these language servers.

151+

152+As an example, `efm-lsp-prettier` of the previous example is used only with a formatting command `prettier`,

153+so everything else should be handled by the `typescript-language-server` (which is configured by default).

154+The language configuration for typescript could look like this:

155+

156+```toml

157+[[language]]

158+name = "typescript"

159+language-servers = [ { name = "efm-lsp-prettier", only-features = [ "format" ] }, "typescript-language-server" ]

160+```

161+

162+or equivalent:

163+

164+```toml

165+[[language]]

166+name = "typescript"

167+language-servers = [ { name = "typescript-language-server", except-features = [ "format" ] }, "efm-lsp-prettier" ]

168+```

169+

170+Each requested LSP feature is prioritized in the order of the `language-servers` array.

171+For example, the first `goto-definition` supported language server (in this case `typescript-language-server`) will be taken for the relevant LSP request (command `goto_definition`).

172+The features `diagnostics`, `code-action`, `completion`, `document-symbols` and `workspace-symbols` are an exception to that rule, as they are working for all language servers at the same time and are merged together, if enabled for the language.

173+If no `except-features` or `only-features` is given, all features for the language server are enabled.

174+If a language server itself doesn't support a feature, the next language server array entry will be tried (and so on).

175+

176+The list of supported features is:

177+

178+- `format`

179+- `goto-definition`

180+- `goto-declaration`

181+- `goto-type-definition`

182+- `goto-reference`

183+- `goto-implementation`

184+- `signature-help`

185+- `hover`

186+- `document-highlight`

187+- `completion`

188+- `code-action`

189+- `workspace-command`

190+- `document-symbols`

191+- `workspace-symbols`

192+- `diagnostics`

193+- `rename-symbol`

194+- `inlay-hints`

195+

196+## Tree-sitter grammar configuration

197+

198+The source for a language's tree-sitter grammar is specified in a `[[grammar]]`

199+section in `languages.toml`. For example:

25200

201+```toml

26202[[grammar]]

27−name = "c"

28−source = { path = "/path/to/tree-sitter-c" }

203+name = "mylang"

204+source = { git = "https://github.com/example/mylang", rev = "a250c4582510ff34767ec3b7dcdd3c24e8c8aa68" }

29205```

30206

31−You may use a top-level `use-grammars` key to control which grammars are fetched and built.

207+Grammar configuration takes these keys:

208+

209+| Key | Description |

210+| --- | ----------- |

211+| `name` | The name of the tree-sitter grammar |

212+| `source` | The method of fetching the grammar - a table with a schema defined below |

213+

214+Where `source` is a table with either these keys when using a grammar from a

215+git repository:

216+

217+| Key | Description |

218+| --- | ----------- |

219+| `git` | A git remote URL from which the grammar should be cloned |

220+| `rev` | The revision (commit hash or tag) which should be fetched |

221+| `subpath` | A path within the grammar directory which should be built. Some grammar repositories host multiple grammars (for example `tree-sitter-typescript` and `tree-sitter-ocaml`) in subdirectories. This key is used to point `hx --grammar build` to the correct path for compilation. When omitted, the root of repository is used |

222+

223+### Choosing grammars

224+

225+You may use a top-level `use-grammars` key to control which grammars are

226+fetched and built when using `hx --grammar fetch` and `hx --grammar build`.

32227

33228```toml

34229# Note: this key must come **before** the [[language]] and [[grammar]] sections

@@ -38,3 +233,5 @@ use-grammars = { except = [ "yaml", "json" ] }

38233```

39234

40235When omitted, all grammars are fetched and built.

236+

237+[treesitter-language-injection]: https://tree-sitter.github.io/tree-sitter/syntax-highlighting#language-injection

book/src/remapping.md+37−17

@@ -1,31 +1,56 @@

1−# Key Remapping

1+# Key remapping

3−One-way key remapping is temporarily supported via a simple TOML configuration

3+Helix currently supports one-way key remapping through a simple TOML configuration

44file. (More powerful solutions such as rebinding via commands will be

55available in the future).

7−To remap keys, write a `config.toml` file in your `helix` configuration

8−directory (default `~/.config/helix` in Linux systems) with a structure like

7+To remap keys, create a `config.toml` file in your `helix` configuration

8+directory (default `~/.config/helix` on Linux systems) with a structure like

99this:

1010

1111```toml

1212# At most one section each of 'keys.normal', 'keys.insert' and 'keys.select'

1313[keys.normal]

14−C-s = ":w" # Maps the Control-s to the typable command :w which is an alias for :write (save file)

15−C-o = ":open ~/.config/helix/config.toml" # Maps the Control-o to opening of the helix config file

14+C-s = ":w" # Maps Ctrl-s to the typable command :w which is an alias for :write (save file)

15+C-o = ":open ~/.config/helix/config.toml" # Maps Ctrl-o to opening of the helix config file

1616a = "move_char_left" # Maps the 'a' key to the move_char_left command

1717w = "move_line_up" # Maps the 'w' key move_line_up

18−"C-S-esc" = "extend_line" # Maps Control-Shift-Escape to extend_line

18+"C-S-esc" = "extend_line" # Maps Ctrl-Shift-Escape to extend_line

1919g = { a = "code_action" } # Maps `ga` to show possible code actions

2020"ret" = ["open_below", "normal_mode"] # Maps the enter key to open_below then re-enter normal mode

2121

2222[keys.insert]

23−"A-x" = "normal_mode" # Maps Alt-X to enter normal mode

23+"A-x" = "normal_mode" # Maps Alt-X to enter normal mode

2424j = { k = "normal_mode" } # Maps `jk` to exit insert mode

2525```

26−> NOTE: Typable commands can also be remapped, remember to keep the `:` prefix to indicate it's a typable command.

2726

28−Control, Shift and Alt modifiers are encoded respectively with the prefixes

27+## Minor modes

28+

29+Minor modes are accessed by pressing a key (usually from normal mode), giving access to dedicated bindings. Bindings

30+can be modified or added by nesting definitions.

31+

32+```toml

33+[keys.insert.j]

34+k = "normal_mode" # Maps `jk` to exit insert mode

35+

36+[keys.normal.g]

37+a = "code_action" # Maps `ga` to show possible code actions

38+

39+# invert `j` and `k` in view mode

40+[keys.normal.z]

41+j = "scroll_up"

42+k = "scroll_down"

43+

44+# create a new minor mode bound to `+`

45+[keys.normal."+"]

46+m = ":run-shell-command make"

47+c = ":run-shell-command cargo build"

48+t = ":run-shell-command cargo test"

49+```

50+

51+## Special keys and modifiers

52+

53+Ctrl, Shift and Alt modifiers are encoded respectively with the prefixes

2954`C-`, `S-` and `A-`. Special keys are encoded as follows:

3055

3156| Key name | Representation |

@@ -33,12 +58,7 @@ Control, Shift and Alt modifiers are encoded respectively with the prefixes

3358| Backspace | `"backspace"` |

3459| Space | `"space"` |

3560| Return/Enter | `"ret"` |

36−| < | `"lt"` |

37−| \> | `"gt"` |

38−| \+ | `"plus"` |

3961| \- | `"minus"` |

40−| ; | `"semicolon"` |

41−| % | `"percent"` |

4262| Left | `"left"` |

4363| Right | `"right"` |

4464| Up | `"up"` |

@@ -55,5 +75,5 @@ Control, Shift and Alt modifiers are encoded respectively with the prefixes

5575

5676Keys can be disabled by binding them to the `no_op` command.

5777

58−Commands can be found at [Keymap](https://docs.helix-editor.com/keymap.html) Commands.

59−> Commands can also be found in the source code at [`helix-term/src/commands.rs`](https://github.com/helix-editor/helix/blob/master/helix-term/src/commands.rs) at the invocation of `static_commands!` macro and the `TypableCommandList`.

78+A list of commands is available in the [Keymap](https://docs.helix-editor.com/keymap.html) documentation

79+ and in the source code at [`helix-term/src/commands.rs`](https://github.com/helix-editor/helix/blob/master/helix-term/src/commands.rs) at the invocation of `static_commands!` macro and the `TypableCommandList`.

book/src/themes.md+172−71

@@ -1,22 +1,23 @@

11# Themes

3−To use a theme add `theme = "<name>"` to your [`config.toml`](./configuration.md) at the very top of the file before the first section or select it during runtime using `:theme <name>`.

3+To use a theme add `theme = "<name>"` to the top of your [`config.toml`](./configuration.md) file, or select it during runtime using `:theme <name>`.

55## Creating a theme

7−Create a file with the name of your theme as file name (i.e `mytheme.toml`) and place it in your `themes` directory (i.e `~/.config/helix/themes`). The directory might have to be created beforehand.

7+Create a file with the name of your theme as the file name (i.e `mytheme.toml`) and place it in your `themes` directory (i.e `~/.config/helix/themes` or `%AppData%\helix\themes` on Windows). The directory might have to be created beforehand.

9−The names "default" and "base16_default" are reserved for the builtin themes and cannot be overridden by user defined themes.

9+> 💡 The names "default" and "base16_default" are reserved for built-in themes

10+> and cannot be overridden by user-defined themes.

1011

11−The default theme.toml can be found [here](https://github.com/helix-editor/helix/blob/master/theme.toml), and user submitted themes [here](https://github.com/helix-editor/helix/blob/master/runtime/themes).

12+### Overview

1213

1314Each line in the theme file is specified as below:

1415

1516```toml

16−key = { fg = "#ffffff", bg = "#000000", modifiers = ["bold", "italic"] }

17+key = { fg = "#ffffff", bg = "#000000", underline = { color = "#ff0000", style = "curl"}, modifiers = ["bold", "italic"] }

1718```

1819

19−where `key` represents what you want to style, `fg` specifies the foreground color, `bg` the background color, and `modifiers` is a list of style modifiers. `bg` and `modifiers` can be omitted to defer to the defaults.

20+Where `key` represents what you want to style, `fg` specifies the foreground color, `bg` the background color, `underline` the underline `style`/`color`, and `modifiers` is a list of style modifiers. `bg`, `underline` and `modifiers` can be omitted to defer to the defaults.

2021

2122To specify only the foreground color:

2223

@@ -24,15 +25,30 @@ To specify only the foreground color:

2425key = "#ffffff"

2526```

2627

27−if the key contains a dot `'.'`, it must be quoted to prevent it being parsed as a [dotted key](https://toml.io/en/v1.0.0#keys).

28+If the key contains a dot `'.'`, it must be quoted to prevent it being parsed as a [dotted key](https://toml.io/en/v1.0.0#keys).

2829

2930```toml

3031"key.key" = "#ffffff"

3132```

3233

34+For inspiration, you can find the default `theme.toml`

35+[here](https://github.com/helix-editor/helix/blob/master/theme.toml) and

36+user-submitted themes

37+[here](https://github.com/helix-editor/helix/blob/master/runtime/themes).

38+

39+### Using the linter

40+

41+Use the supplied linting tool to check for errors and missing scopes:

42+

43+```sh

44+cargo xtask themelint onedark # replace onedark with <name>

45+```

46+

47+## The details of theme creation

48+

3349### Color palettes

3450

35−It's recommended define a palette of named colors, and refer to them from the

51+It's recommended to define a palette of named colors, and refer to them in the

3652configuration values in your theme. To do this, add a table called

3753`palette` to your theme file:

3854

@@ -45,8 +61,8 @@ white = "#ffffff"

4561black = "#000000"

4662```

4763

48−Remember that the `[palette]` table includes all keys after its header,

49−so you should define the palette after normal theme options.

64+Keep in mind that the `[palette]` table includes all keys after its header,

65+so it should be defined after the normal theme options.

5066

5167The default palette uses the terminal's default 16 colors, and the colors names

5268are listed below. The `[palette]` section in the config file takes precedence

@@ -54,6 +70,7 @@ over it and is merged into the default palette.

5470

5571| Color Name |

5672| --- |

73+| `default` |

5774| `black` |

5875| `red` |

5976| `green` |

@@ -73,41 +90,77 @@ over it and is merged into the default palette.

7390

7491### Modifiers

7592

76−The following values may be used as modifiers.

93+The following values may be used as modifier, provided they are supported by

94+your terminal emulator.

7795

78−Less common modifiers might not be supported by your terminal emulator.

96+| Modifier |

97+| --- |

98+| `bold` |

99+| `dim` |

100+| `italic` |

101+| `underlined` |

102+| `slow_blink` |

103+| `rapid_blink` |

104+| `reversed` |

105+| `hidden` |

106+| `crossed_out` |

107+

108+> 💡 The `underlined` modifier is deprecated and only available for backwards compatibility.

109+> Its behavior is equivalent to setting `underline.style="line"`.

110+

111+### Underline style

112+

113+One of the following values may be used as a value for `underline.style`, providing it is

114+supported by your terminal emulator.

79115

80116| Modifier |

81117| --- |

82−| `bold` |

83−| `dim` |

84−| `italic` |

85−| `underlined` |

86−| `slow_blink` |

87−| `rapid_blink` |

88−| `reversed` |

89−| `hidden` |

90−| `crossed_out` |

118+| `line` |

119+| `curl` |

120+| `dashed` |

121+| `dotted` |

122+| `double_line` |

123+

124+

125+### Inheritance

126+

127+Extend other themes by setting the `inherits` property to an existing theme.

128+

129+```toml

130+inherits = "boo_berry"

131+

132+# Override the theming for "keyword"s:

133+"keyword" = { fg = "gold" }

134+

135+# Override colors in the palette:

136+[palette]

137+berry = "#2A2A4D"

138+```

91139

92140### Scopes

93141

94−The following is a list of scopes available to use for styling.

142+The following is a list of scopes available to use for styling:

95143

96144#### Syntax highlighting

97145

98146These keys match [tree-sitter scopes](https://tree-sitter.github.io/tree-sitter/syntax-highlighting#theme).

99147

100−For a given highlight produced, styling will be determined based on the longest matching theme key. For example, the highlight `function.builtin.static` would match the key `function.builtin` rather than `function`.

148+When determining styling for a highlight, the longest matching theme key will be used. For example, if the highlight is `function.builtin.static`, the key `function.builtin` will be used instead of `function`.

101149

102150We use a similar set of scopes as

103−[SublimeText](https://www.sublimetext.com/docs/scope_naming.html). See also

151+[Sublime Text](https://www.sublimetext.com/docs/scope_naming.html). See also

104152[TextMate](https://macromates.com/manual/en/language_grammars) scopes.

105153

154+- `attribute` - Class attributes, HTML tag attributes

155+

106156- `type` - Types

107157 - `builtin` - Primitive types provided by the language (`int`, `usize`)

158+ - `parameter` - Generic type parameters (`T`)

159+ - `enum`

160+ - `variant`

108161- `constructor`

109162

110−- `constant` (TODO: constant.other.placeholder for %v)

163+- `constant` (TODO: constant.other.placeholder for `%v`)

111164 - `builtin` Special constants provided by the language (`true`, `false`, `nil` etc)

112165 - `boolean`

113166 - `character`

@@ -125,21 +178,21 @@ We use a similar set of scopes as

125178

126179- `comment` - Code comments

127180 - `line` - Single line comments (`//`)

128− - `block` - Block comments (e.g. (`/* */`)

181+ - `block` - Block comments (e.g. (`/* */`)

129182 - `documentation` - Documentation comments (e.g. `///` in Rust)

130183

131184- `variable` - Variables

132− - `builtin` - Reserved language variables (`self`, `this`, `super`, etc)

185+ - `builtin` - Reserved language variables (`self`, `this`, `super`, etc.)

133186 - `parameter` - Function parameters

134187 - `other`

135188 - `member` - Fields of composite data types (e.g. structs, unions)

136− - `function` (TODO: ?)

137189

138190- `label`

139191

140192- `punctuation`

141193 - `delimiter` - Commas, colons

142194 - `bracket` - Parentheses, angle brackets, etc.

195+ - `special` - String interpolation brackets.

143196

144197- `keyword`

145198 - `control`

@@ -149,8 +202,11 @@ We use a similar set of scopes as

149202 - `return`

150203 - `exception`

151204 - `operator` - `or`, `in`

152− - `directive` - Preprocessor directives (`#if` in C)

205+ - `directive` - Preprocessor directives (`#if` in C)

153206 - `function` - `fn`, `func`

207+ - `storage` - Keywords describing how things are stored

208+ - `type` - The type of something, `class`, `function`, `var`, `let`, etc.

209+ - `modifier` - Storage modifiers like `static`, `mut`, `const`, `ref`, etc.

154210

155211- `operator` - `||`, `+=`, `>`

156212

@@ -158,12 +214,15 @@ We use a similar set of scopes as

158214 - `builtin`

159215 - `method`

160216 - `macro`

161− - `special` (preprocesor in C)

217+ - `special` (preprocessor in C)

162218

163219- `tag` - Tags (e.g. `<body>` in HTML)

220+ - `builtin`

164221

165222- `namespace`

166223

224+- `special`

225+

167226- `markup`

168227 - `heading`

169228 - `marker`

@@ -171,12 +230,15 @@ We use a similar set of scopes as

171230 - `list`

172231 - `unnumbered`

173232 - `numbered`

233+ - `checked`

234+ - `unchecked`

174235 - `bold`

175236 - `italic`

237+ - `strikethrough`

176238 - `link`

177− - `url` - urls pointed to by links

178− - `label` - non-url link references

179− - `text` - url and image descriptions in links

239+ - `url` - URLs pointed to by links

240+ - `label` - non-URL link references

241+ - `text` - URL and image descriptions in links

180242 - `quote`

181243 - `raw`

182244 - `inline`

@@ -184,53 +246,92 @@ We use a similar set of scopes as

184246

185247- `diff` - version control changes

186248 - `plus` - additions

249+ - `gutter` - gutter indicator

187250 - `minus` - deletions

251+ - `gutter` - gutter indicator

188252 - `delta` - modifications

189253 - `moved` - renamed or moved files/changes

254+ - `gutter` - gutter indicator

190255

191256#### Interface

192257

193−These scopes are used for theming the editor interface.

258+These scopes are used for theming the editor interface:

194259

195260- `markup`

196261 - `normal`

197− - `completion` - for completion doc popup ui

198− - `hover` - for hover popup ui

262+ - `completion` - for completion doc popup UI

263+ - `hover` - for hover popup UI

199264 - `heading`

200− - `completion` - for completion doc popup ui

201− - `hover` - for hover popup ui

265+ - `completion` - for completion doc popup UI

266+ - `hover` - for hover popup UI

202267 - `raw`

203268 - `inline`

204− - `completion` - for completion doc popup ui

205− - `hover` - for hover popup ui

206−

207−

208−| Key | Notes |

209−| --- | --- |

210−| `ui.background` | |

211−| `ui.cursor` | |

212−| `ui.cursor.insert` | |

213−| `ui.cursor.select` | |

214−| `ui.cursor.match` | Matching bracket etc. |

215−| `ui.cursor.primary` | Cursor with primary selection |

216−| `ui.linenr` | Line numbers |

217−| `ui.linenr.selected` | Line number for the line the cursor is on |

218−| `ui.statusline` | Statusline |

219−| `ui.statusline.inactive` | Statusline (unfocused document) |

220−| `ui.popup` | Documentation popups (e.g space-k) |

221−| `ui.popup.info` | Prompt for multiple key options |

222−| `ui.window` | Border lines separating splits |

223−| `ui.help` | Description box for commands |

224−| `ui.text` | Command prompts, popup text, etc. |

225−| `ui.text.focus` | |

226−| `ui.text.info` | The key: command text in `ui.popup.info` boxes |

227−| `ui.menu` | Code and command completion menus |

228−| `ui.menu.selected` | Selected autocomplete item |

229−| `ui.selection` | For selections in the editing area |

230−| `ui.selection.primary` | |

231−| `warning` | Diagnostics warning (gutter) |

232−| `error` | Diagnostics error (gutter) |

233−| `info` | Diagnostics info (gutter) |

234−| `hint` | Diagnostics hint (gutter) |

235−| `diagnostic` | For text in editing area |

236−

269+ - `completion` - for completion doc popup UI

270+ - `hover` - for hover popup UI

271+

272+

273+| Key | Notes |

274+| --- | --- |

275+| `ui.background` | |

276+| `ui.background.separator` | Picker separator below input line |

277+| `ui.cursor` | |

278+| `ui.cursor.normal` | |

279+| `ui.cursor.insert` | |

280+| `ui.cursor.select` | |

281+| `ui.cursor.match` | Matching bracket etc. |

282+| `ui.cursor.primary` | Cursor with primary selection |

283+| `ui.cursor.primary.normal` | |

284+| `ui.cursor.primary.insert` | |

285+| `ui.cursor.primary.select` | |

286+| `ui.debug.breakpoint` | Breakpoint indicator, found in the gutter |

287+| `ui.debug.active` | Indicator for the line at which debugging execution is paused at, found in the gutter |

288+| `ui.gutter` | Gutter |

289+| `ui.gutter.selected` | Gutter for the line the cursor is on |

290+| `ui.highlight.frameline` | Line at which debugging execution is paused at |

291+| `ui.linenr` | Line numbers |

292+| `ui.linenr.selected` | Line number for the line the cursor is on |

293+| `ui.statusline` | Statusline |

294+| `ui.statusline.inactive` | Statusline (unfocused document) |

295+| `ui.statusline.normal` | Statusline mode during normal mode ([only if `editor.color-modes` is enabled][editor-section]) |

296+| `ui.statusline.insert` | Statusline mode during insert mode ([only if `editor.color-modes` is enabled][editor-section]) |

297+| `ui.statusline.select` | Statusline mode during select mode ([only if `editor.color-modes` is enabled][editor-section]) |

298+| `ui.statusline.separator` | Separator character in statusline |

299+| `ui.bufferline` | Style for the buffer line |

300+| `ui.bufferline.active` | Style for the active buffer in buffer line |

301+| `ui.bufferline.background` | Style for bufferline background |

302+| `ui.popup` | Documentation popups (e.g. Space + k) |

303+| `ui.popup.info` | Prompt for multiple key options |

304+| `ui.window` | Borderlines separating splits |

305+| `ui.help` | Description box for commands |

306+| `ui.text` | Default text style, command prompts, popup text, etc. |

307+| `ui.text.focus` | The currently selected line in the picker |

308+| `ui.text.inactive` | Same as `ui.text` but when the text is inactive (e.g. suggestions) |

309+| `ui.text.info` | The key: command text in `ui.popup.info` boxes |

310+| `ui.virtual.ruler` | Ruler columns (see the [`editor.rulers` config][editor-section]) |

311+| `ui.virtual.whitespace` | Visible whitespace characters |

312+| `ui.virtual.indent-guide` | Vertical indent width guides |

313+| `ui.virtual.inlay-hint` | Default style for inlay hints of all kinds |

314+| `ui.virtual.inlay-hint.parameter` | Style for inlay hints of kind `parameter` (LSPs are not required to set a kind) |

315+| `ui.virtual.inlay-hint.type` | Style for inlay hints of kind `type` (LSPs are not required to set a kind) |

316+| `ui.virtual.wrap` | Soft-wrap indicator (see the [`editor.soft-wrap` config][editor-section]) |

317+| `ui.menu` | Code and command completion menus |

318+| `ui.menu.selected` | Selected autocomplete item |

319+| `ui.menu.scroll` | `fg` sets thumb color, `bg` sets track color of scrollbar |

320+| `ui.selection` | For selections in the editing area |

321+| `ui.selection.primary` | |

322+| `ui.highlight` | Highlighted lines in the picker preview |

323+| `ui.cursorline.primary` | The line of the primary cursor ([if cursorline is enabled][editor-section]) |

324+| `ui.cursorline.secondary` | The lines of any other cursors ([if cursorline is enabled][editor-section]) |

325+| `ui.cursorcolumn.primary` | The column of the primary cursor ([if cursorcolumn is enabled][editor-section]) |

326+| `ui.cursorcolumn.secondary` | The columns of any other cursors ([if cursorcolumn is enabled][editor-section]) |

327+| `warning` | Diagnostics warning (gutter) |

328+| `error` | Diagnostics error (gutter) |

329+| `info` | Diagnostics info (gutter) |

330+| `hint` | Diagnostics hint (gutter) |

331+| `diagnostic` | Diagnostics fallback style (editing area) |

332+| `diagnostic.hint` | Diagnostics hint (editing area) |

333+| `diagnostic.info` | Diagnostics info (editing area) |

334+| `diagnostic.warning` | Diagnostics warning (editing area) |

335+| `diagnostic.error` | Diagnostics error (editing area) |

336+

337+[editor-section]: ./configuration.md#editor-section

book/src/title-page.md+2

@@ -6,6 +6,7 @@ Docs for bleeding edge master can be found at

66See the [usage] section for a quick overview of the editor, [keymap]

77section for all available keybindings and the [configuration] section

88for defining custom keybindings, setting themes, etc.

9+For everything else (e.g., how to install supported language servers), see the [Helix Wiki].

910

1011Refer the [FAQ] for common questions.

1112

@@ -13,3 +14,4 @@ Refer the [FAQ] for common questions.

1314[usage]: ./usage.md

1415[keymap]: ./keymap.md

1516[configuration]: ./configuration.md

17+[Helix Wiki]: https://github.com/helix-editor/helix/wiki

book/src/usage.md+157−45

@@ -1,95 +1,207 @@

1−# Usage

1+# Using Helix

3−(Currently not fully documented, see the [keymappings](./keymap.md) list for more.)

3+

4+- [Registers](#registers)

5+ - [User-defined registers](#user-defined-registers)

6+ - [Special registers](#special-registers)

7+- [Surround](#surround)

8+- [Selecting and manipulating text with textobjects](#selecting-and-manipulating-text-with-textobjects)

9+- [Navigating using tree-sitter textobjects](#navigating-using-tree-sitter-textobjects)

10+- [Moving the selection with syntax-aware motions](#moving-the-selection-with-syntax-aware-motions)

11+

412

5−See [tutor.txt](https://github.com/helix-editor/helix/blob/master/runtime/tutor.txt) (accessible via `hx --tutor` or `:tutor`) for a vimtutor-like introduction.

13+For a full interactive introduction to Helix, refer to the

14+[tutor](https://github.com/helix-editor/helix/blob/master/runtime/tutor) which

15+can be accessed via the command `hx --tutor` or `:tutor`.

16+

17+> 💡 Currently, not all functionality is fully documented, please refer to the

18+> [key mappings](./keymap.md) list.

619

720## Registers

821

9−Vim-like registers can be used to yank and store text to be pasted later. Usage is similar, with `"` being used to select a register:

22+In Helix, registers are storage locations for text and other data, such as the

23+result of a search. Registers can be used to cut, copy, and paste text, similar

24+to the clipboard in other text editors. Usage is similar to Vim, with `"` being

25+used to select a register.

26+

27+### User-defined registers

28+

29+Helix allows you to create your own named registers for storing text, for

30+example:

1031

1132- `"ay` - Yank the current selection to register `a`.

1233- `"op` - Paste the text in register `o` after the selection.

1334

14−If there is a selected register before invoking a change or delete command, the selection will be stored in the register and the action will be carried out:

35+If a register is selected before invoking a change or delete command, the selection will be stored in the register and the action will be carried out:

1536

1637- `"hc` - Store the selection in register `h` and then change it (delete and enter insert mode).

1738- `"md` - Store the selection in register `m` and delete it.

1839

19−### Special Registers

40+### Default registers

41+

42+Commands that use registers, like yank (`y`), use a default register if none is specified.

43+These registers are used as defaults:

2044

2145| Register character | Contains |

2246| --- | --- |

2347| `/` | Last search |

2448| `:` | Last executed command |

2549| `"` | Last yanked text |

26−| `_` | Black hole |

50+| `@` | Last recorded macro |

51+

52+### Special registers

2753

28−> There is no special register for copying to system clipboard, instead special commands and keybindings are provided. See the [keymap](keymap.md#space-mode) for the specifics.

29−> The black hole register works as a no-op register, meaning no data will be written to / read from it.

54+Some registers have special behavior when read from and written to.

55+

56+| Register character | When read | When written |

57+| --- | --- | --- |

58+| `_` | No values are returned | All values are discarded |

59+| `#` | Selection indices (first selection is `1`, second is `2`, etc.) | This register is not writable |

60+| `.` | Contents of the current selections | This register is not writable |

61+| `%` | Name of the current file | This register is not writable |

62+| `+` | Reads from the system clipboard | Joins and yanks to the system clipboard |

63+| `*` | Reads from the primary clipboard | Joins and yanks to the primary clipboard |

64+

65+When yanking multiple selections to the clipboard registers, the selections

66+are joined with newlines. Pasting from these registers will paste multiple

67+selections if the clipboard was last yanked to by the Helix session. Otherwise

68+the clipboard contents are pasted as one selection.

3069

3170## Surround

3271

33−Functionality similar to [vim-surround](https://github.com/tpope/vim-surround) is built into

34−helix. The keymappings have been inspired from [vim-sandwich](https://github.com/machakann/vim-sandwich):

72+Helix includes built-in functionality similar to [vim-surround](https://github.com/tpope/vim-surround).

73+The keymappings have been inspired from [vim-sandwich](https://github.com/machakann/vim-sandwich):

3574

36−![surround demo](https://user-images.githubusercontent.com/23398472/122865801-97073180-d344-11eb-8142-8f43809982c6.gif)

75+![Surround demo](https://user-images.githubusercontent.com/23398472/122865801-97073180-d344-11eb-8142-8f43809982c6.gif)

3776

38−- `ms` - Add surround characters

39−- `mr` - Replace surround characters

40−- `md` - Delete surround characters

77+| Key Sequence | Action |

78+| --------------------------------- | --------------------------------------- |

79+| `ms<char>` (after selecting text) | Add surround characters to selection |

80+| `mr<char_to_replace><new_char>` | Replace the closest surround characters |

81+| `md<char_to_delete>` | Delete the closest surround characters |

4182

42−`ms` acts on a selection, so select the text first and use `ms<char>`. `mr` and `md` work

43−on the closest pairs found and selections are not required; use counts to act in outer pairs.

83+You can use counts to act on outer pairs.

4484

45−It can also act on multiple selections (yay!). For example, to change every occurrence of `(use)` to `[use]`:

85+Surround can also act on multiple selections. For example, to change every occurrence of `(use)` to `[use]`:

4686

47−- `%` to select the whole file

48−- `s` to split the selections on a search term

49−- Input `use` and hit Enter

50−- `mr([` to replace the parens with square brackets

87+1. `%` to select the whole file

88+2. `s` to split the selections on a search term

89+3. Input `use` and hit Enter

90+4. `mr([` to replace the parentheses with square brackets

5191

52−Multiple characters are currently not supported, but planned.

92+Multiple characters are currently not supported, but planned for future release.

5393

54−## Textobjects

94+## Selecting and manipulating text with textobjects

5595

56−Currently supported: `word`, `surround`, `function`, `class`, `parameter`.

96+In Helix, textobjects are a way to select, manipulate and operate on a piece of

97+text in a structured way. They allow you to refer to blocks of text based on

98+their structure or purpose, such as a word, sentence, paragraph, or even a

99+function or block of code.

57100

58−![textobject-demo](https://user-images.githubusercontent.com/23398472/124231131-81a4bb00-db2d-11eb-9d10-8e577ca7b177.gif)

59−![textobject-treesitter-demo](https://user-images.githubusercontent.com/23398472/132537398-2a2e0a54-582b-44ab-a77f-eb818942203d.gif)

101+![Textobject demo](https://user-images.githubusercontent.com/23398472/124231131-81a4bb00-db2d-11eb-9d10-8e577ca7b177.gif)

102+![Textobject tree-sitter demo](https://user-images.githubusercontent.com/23398472/132537398-2a2e0a54-582b-44ab-a77f-eb818942203d.gif)

60103

61−- `ma` - Select around the object (`va` in vim, `<alt-a>` in kakoune)

62−- `mi` - Select inside the object (`vi` in vim, `<alt-i>` in kakoune)

104+- `ma` - Select around the object (`va` in Vim, `<alt-a>` in Kakoune)

105+- `mi` - Select inside the object (`vi` in Vim, `<alt-i>` in Kakoune)

63106

64107| Key after `mi` or `ma` | Textobject selected |

65108| --- | --- |

66109| `w` | Word |

67110| `W` | WORD |

68−| `(`, `[`, `'`, etc | Specified surround pairs |

111+| `p` | Paragraph |

112+| `(`, `[`, `'`, etc. | Specified surround pairs |

113+| `m` | The closest surround pair |

69114| `f` | Function |

70−| `c` | Class |

115+| `t` | Type (or Class) |

71116| `a` | Argument/parameter |

72−| `o` | Comment |

117+| `c` | Comment |

118+| `T` | Test |

119+| `g` | Change |

73120

74−> NOTE: `f`, `c`, etc need a tree-sitter grammar active for the current

121+> 💡 `f`, `t`, etc. need a tree-sitter grammar active for the current

75122document and a special tree-sitter query file to work properly. [Only

76123some grammars][lang-support] currently have the query file implemented.

77124Contributions are welcome!

78125

79−## Tree-sitter Textobject Based Navigation

126+## Navigating using tree-sitter textobjects

80127

81−Navigating between functions, classes, parameters, etc is made

82−possible by leveraging tree-sitter and textobjects queries. For

128+Navigating between functions, classes, parameters, and other elements is

129+possible using tree-sitter and textobject queries. For

83130example to move to the next function use `]f`, to move to previous

84−class use `[c`, and so on.

85−

86−![tree-sitter-nav-demo][tree-sitter-nav-demo]

87−

88−See the [unimpaired][unimpaired-keybinds] section of the keybind

89−documentation for the full reference.

90−

91−> NOTE: This feature is dependent on tree-sitter based textobjects

92−and therefore requires the corresponding query file to work properly.

131+type use `[t`, and so on.

132+

133+![Tree-sitter-nav-demo][tree-sitter-nav-demo]

134+

135+For the full reference see the [unimpaired][unimpaired-keybinds] section of the key bind

136+documentation.

137+

138+> 💡 This feature relies on tree-sitter textobjects

139+> and requires the corresponding query file to work properly.

140+

141+## Moving the selection with syntax-aware motions

142+

143+`Alt-p`, `Alt-o`, `Alt-i`, and `Alt-n` (or `Alt` and arrow keys) allow you to move the

144+selection according to its location in the syntax tree. For example, many languages have the

145+following syntax for function calls:

146+

147+```js

148+func(arg1, arg2, arg3);

149+```

150+

151+A function call might be parsed by tree-sitter into a tree like the following.

152+

153+```tsq

154+(call

155+ function: (identifier) ; func

156+ arguments:

157+ (arguments ; (arg1, arg2, arg3)

158+ (identifier) ; arg1

159+ (identifier) ; arg2

160+ (identifier))) ; arg3

161+```

162+

163+Use `:tree-sitter-subtree` to view the syntax tree of the primary selection. In

164+a more intuitive tree format:

165+

166+```

167+ ┌────┐

168+ │call│

169+ ┌─────┴────┴─────┐

170+ │ │

171+┌─────▼────┐ ┌────▼────┐

172+│identifier│ │arguments│

173+│ "func" │ ┌────┴───┬─────┴───┐

174+└──────────┘ │ │ │

175+ │ │ │

176+ ┌─────────▼┐ ┌────▼─────┐ ┌▼─────────┐

177+ │identifier│ │identifier│ │identifier│

178+ │ "arg1" │ │ "arg2" │ │ "arg3" │

179+ └──────────┘ └──────────┘ └──────────┘

180+```

181+

182+If you have a selection that wraps `arg1` (see the tree above), and you use

183+`Alt-n`, it will select the next sibling in the syntax tree: `arg2`.

184+

185+```js

186+// before

187+func([arg1], arg2, arg3)

188+// after

189+func(arg1, [arg2], arg3);

190+```

191+

192+Similarly, `Alt-o` will expand the selection to the parent node, in this case, the

193+arguments node.

194+

195+```js

196+func[(arg1, arg2, arg3)];

197+```

198+

199+There is also some nuanced behavior that prevents you from getting stuck on a

200+node with no sibling. When using `Alt-p` with a selection on `arg1`, the previous

201+child node will be selected. In the event that `arg1` does not have a previous

202+sibling, the selection will move up the syntax tree and select the previous

203+element. As a result, using `Alt-p` with a selection on `arg1` will move the

204+selection to the "func" `identifier`.

93205

94206[lang-support]: ./lang-support.md

95207[unimpaired-keybinds]: ./keymap.md#unimpaired

book/theme/book.jsdeleted−660

@@ -1,660 +0,0 @@

1−"use strict";

2−

3−// Fix back button cache problem

4−window.onunload = function () { };

5−

6−// Global variable, shared between modules

7−function playground_text(playground) {

8− let code_block = playground.querySelector("code");

9−

10− if (window.ace && code_block.classList.contains("editable")) {

11− let editor = window.ace.edit(code_block);

12− return editor.getValue();

13− } else {

14− return code_block.textContent;

15− }

16−}

17−

18−(function codeSnippets() {

19− function fetch_with_timeout(url, options, timeout = 6000) {

20− return Promise.race([

21− fetch(url, options),

22− new Promise((_, reject) => setTimeout(() => reject(new Error('timeout')), timeout))

23− ]);

24− }

25−

26− var playgrounds = Array.from(document.querySelectorAll(".playground"));

27− if (playgrounds.length > 0) {

28− fetch_with_timeout("https://play.rust-lang.org/meta/crates", {

29− headers: {

30− 'Content-Type': "application/json",

31− },

32− method: 'POST',

33− mode: 'cors',

34− })

35− .then(response => response.json())

36− .then(response => {

37− // get list of crates available in the rust playground

38− let playground_crates = response.crates.map(item => item["id"]);

39− playgrounds.forEach(block => handle_crate_list_update(block, playground_crates));

40− });

41− }

42−

43− function handle_crate_list_update(playground_block, playground_crates) {

44− // update the play buttons after receiving the response

45− update_play_button(playground_block, playground_crates);

46−

47− // and install on change listener to dynamically update ACE editors

48− if (window.ace) {

49− let code_block = playground_block.querySelector("code");

50− if (code_block.classList.contains("editable")) {

51− let editor = window.ace.edit(code_block);

52− editor.addEventListener("change", function (e) {

53− update_play_button(playground_block, playground_crates);

54− });

55− // add Ctrl-Enter command to execute rust code

56− editor.commands.addCommand({

57− name: "run",

58− bindKey: {

59− win: "Ctrl-Enter",

60− mac: "Ctrl-Enter"

61− },

62− exec: _editor => run_rust_code(playground_block)

63− });

64− }

65− }

66− }

67−

68− // updates the visibility of play button based on `no_run` class and

69− // used crates vs ones available on http://play.rust-lang.org

70− function update_play_button(pre_block, playground_crates) {

71− var play_button = pre_block.querySelector(".play-button");

72−

73− // skip if code is `no_run`

74− if (pre_block.querySelector('code').classList.contains("no_run")) {

75− play_button.classList.add("hidden");

76− return;

77− }

78−

79− // get list of `extern crate`'s from snippet

80− var txt = playground_text(pre_block);

81− var re = /extern\s+crate\s+([a-zA-Z_0-9]+)\s*;/g;

82− var snippet_crates = [];

83− var item;

84− while (item = re.exec(txt)) {

85− snippet_crates.push(item[1]);

86− }

87−

88− // check if all used crates are available on play.rust-lang.org

89− var all_available = snippet_crates.every(function (elem) {

90− return playground_crates.indexOf(elem) > -1;

91− });

92−

93− if (all_available) {

94− play_button.classList.remove("hidden");

95− } else {

96− play_button.classList.add("hidden");

97− }

98− }

99−

100− function run_rust_code(code_block) {

101− var result_block = code_block.querySelector(".result");

102− if (!result_block) {

103− result_block = document.createElement('code');

104− result_block.className = 'result hljs language-bash';

105−

106− code_block.append(result_block);

107− }

108−

109− let text = playground_text(code_block);

110− let classes = code_block.querySelector('code').classList;

111− let has_2018 = classes.contains("edition2018");

112− let edition = has_2018 ? "2018" : "2015";

113−

114− var params = {

115− version: "stable",

116− optimize: "0",

117− code: text,

118− edition: edition

119− };

120−

121− if (text.indexOf("#![feature") !== -1) {

122− params.version = "nightly";

123− }

124−

125− result_block.innerText = "Running...";

126−

127− fetch_with_timeout("https://play.rust-lang.org/evaluate.json", {

128− headers: {

129− 'Content-Type': "application/json",

130− },

131− method: 'POST',

132− mode: 'cors',

133− body: JSON.stringify(params)

134− })

135− .then(response => response.json())

136− .then(response => result_block.innerText = response.result)

137− .catch(error => result_block.innerText = "Playground Communication: " + error.message);

138− }

139−

140− // Syntax highlighting Configuration

141− hljs.configure({

142− tabReplace: ' ', // 4 spaces

143− languages: [], // Languages used for auto-detection

144− });

145−

146− let code_nodes = Array

147− .from(document.querySelectorAll('code'))

148− // Don't highlight `inline code` blocks in headers.

149− .filter(function (node) {return !node.parentElement.classList.contains("header"); });

150−

151− if (window.ace) {

152− // language-rust class needs to be removed for editable

153− // blocks or highlightjs will capture events

154− Array

155− .from(document.querySelectorAll('code.editable'))

156− .forEach(function (block) { block.classList.remove('language-rust'); });

157−

158− Array

159− .from(document.querySelectorAll('code:not(.editable)'))

160− .forEach(function (block) { hljs.highlightBlock(block); });

161− } else {

162− code_nodes.forEach(function (block) { hljs.highlightBlock(block); });

163− }

164−

165− // Adding the hljs class gives code blocks the color css

166− // even if highlighting doesn't apply

167− code_nodes.forEach(function (block) { block.classList.add('hljs'); });

168−

169− Array.from(document.querySelectorAll("code.language-rust")).forEach(function (block) {

170−

171− var lines = Array.from(block.querySelectorAll('.boring'));

172− // If no lines were hidden, return

173− if (!lines.length) { return; }

174− block.classList.add("hide-boring");

175−

176− var buttons = document.createElement('div');

177− buttons.className = 'buttons';

178− buttons.innerHTML = "<button class=\"fa fa-eye\" title=\"Show hidden lines\" aria-label=\"Show hidden lines\"></button>";

179−

180− // add expand button

181− var pre_block = block.parentNode;

182− pre_block.insertBefore(buttons, pre_block.firstChild);

183−

184− pre_block.querySelector('.buttons').addEventListener('click', function (e) {

185− if (e.target.classList.contains('fa-eye')) {

186− e.target.classList.remove('fa-eye');

187− e.target.classList.add('fa-eye-slash');

188− e.target.title = 'Hide lines';

189− e.target.setAttribute('aria-label', e.target.title);

190−

191− block.classList.remove('hide-boring');

192− } else if (e.target.classList.contains('fa-eye-slash')) {

193− e.target.classList.remove('fa-eye-slash');

194− e.target.classList.add('fa-eye');

195− e.target.title = 'Show hidden lines';

196− e.target.setAttribute('aria-label', e.target.title);

197−

198− block.classList.add('hide-boring');

199− }

200− });

201− });

202−

203− if (window.playground_copyable) {

204− Array.from(document.querySelectorAll('pre code')).forEach(function (block) {

205− var pre_block = block.parentNode;

206− if (!pre_block.classList.contains('playground')) {

207− var buttons = pre_block.querySelector(".buttons");

208− if (!buttons) {

209− buttons = document.createElement('div');

210− buttons.className = 'buttons';

211− pre_block.insertBefore(buttons, pre_block.firstChild);

212− }

213−

214− var clipButton = document.createElement('button');

215− clipButton.className = 'fa fa-copy clip-button';

216− clipButton.title = 'Copy to clipboard';

217− clipButton.setAttribute('aria-label', clipButton.title);

218− clipButton.innerHTML = '<i class=\"tooltiptext\"></i>';

219−

220− buttons.insertBefore(clipButton, buttons.firstChild);

221− }

222− });

223− }

224−

225− // Process playground code blocks

226− Array.from(document.querySelectorAll(".playground")).forEach(function (pre_block) {

227− // Add play button

228− var buttons = pre_block.querySelector(".buttons");

229− if (!buttons) {

230− buttons = document.createElement('div');

231− buttons.className = 'buttons';

232− pre_block.insertBefore(buttons, pre_block.firstChild);

233− }

234−

235− var runCodeButton = document.createElement('button');

236− runCodeButton.className = 'fa fa-play play-button';

237− runCodeButton.hidden = true;

238− runCodeButton.title = 'Run this code';

239− runCodeButton.setAttribute('aria-label', runCodeButton.title);

240−

241− buttons.insertBefore(runCodeButton, buttons.firstChild);

242− runCodeButton.addEventListener('click', function (e) {

243− run_rust_code(pre_block);

244− });

245−

246− if (window.playground_copyable) {

247− var copyCodeClipboardButton = document.createElement('button');

248− copyCodeClipboardButton.className = 'fa fa-copy clip-button';

249− copyCodeClipboardButton.innerHTML = '<i class="tooltiptext"></i>';

250− copyCodeClipboardButton.title = 'Copy to clipboard';

251− copyCodeClipboardButton.setAttribute('aria-label', copyCodeClipboardButton.title);

252−

253− buttons.insertBefore(copyCodeClipboardButton, buttons.firstChild);

254− }

255−

256− let code_block = pre_block.querySelector("code");

257− if (window.ace && code_block.classList.contains("editable")) {

258− var undoChangesButton = document.createElement('button');

259− undoChangesButton.className = 'fa fa-history reset-button';

260− undoChangesButton.title = 'Undo changes';

261− undoChangesButton.setAttribute('aria-label', undoChangesButton.title);

262−

263− buttons.insertBefore(undoChangesButton, buttons.firstChild);

264−

265− undoChangesButton.addEventListener('click', function () {

266− let editor = window.ace.edit(code_block);

267− editor.setValue(editor.originalCode);

268− editor.clearSelection();

269− });

270− }

271− });

272−})();

273−

274−(function themes() {

275− var html = document.querySelector('html');

276− var themeToggleButton = document.getElementById('theme-toggle');

277− var themePopup = document.getElementById('theme-list');

278− var themeColorMetaTag = document.querySelector('meta[name="theme-color"]');

279− var stylesheets = {

280− ayuHighlight: document.querySelector("[href$='ayu-highlight.css']"),

281− tomorrowNight: document.querySelector("[href$='tomorrow-night.css']"),

282− highlight: document.querySelector("[href$='highlight.css']"),

283− };

284−

285− function showThemes() {

286− themePopup.style.display = 'block';

287− themeToggleButton.setAttribute('aria-expanded', true);

288− themePopup.querySelector("button#" + get_theme()).focus();

289− }

290−

291− function hideThemes() {

292− themePopup.style.display = 'none';

293− themeToggleButton.setAttribute('aria-expanded', false);

294− themeToggleButton.focus();

295− }

296−

297− function get_theme() {

298− var theme;

299− try { theme = localStorage.getItem('mdbook-theme'); } catch (e) { }

300− if (theme === null || theme === undefined) {

301− return default_theme;

302− } else {

303− return theme;

304− }

305− }

306−

307− function set_theme(theme, store = true) {

308− let ace_theme;

309−

310− if (theme == 'coal' || theme == 'navy') {

311− stylesheets.ayuHighlight.disabled = true;

312− stylesheets.tomorrowNight.disabled = false;

313− stylesheets.highlight.disabled = true;

314−

315− ace_theme = "ace/theme/tomorrow_night";

316− } else if (theme == 'ayu') {

317− stylesheets.ayuHighlight.disabled = false;

318− stylesheets.tomorrowNight.disabled = true;

319− stylesheets.highlight.disabled = true;

320− ace_theme = "ace/theme/tomorrow_night";

321− } else {

322− stylesheets.ayuHighlight.disabled = true;

323− stylesheets.tomorrowNight.disabled = true;

324− stylesheets.highlight.disabled = false;

325− ace_theme = "ace/theme/dawn";

326− }

327−

328− setTimeout(function () {

329− themeColorMetaTag.content = getComputedStyle(document.body).backgroundColor;

330− }, 1);

331−

332− if (window.ace && window.editors) {

333− window.editors.forEach(function (editor) {

334− editor.setTheme(ace_theme);

335− });

336− }

337−

338− var previousTheme = get_theme();

339−

340− if (store) {

341− try { localStorage.setItem('mdbook-theme', theme); } catch (e) { }

342− }

343−

344− html.classList.remove(previousTheme);

345− html.classList.add(theme);

346− }

347−

348− // Set theme

349− var theme = get_theme();

350−

351− set_theme(theme, false);

352−

353− themeToggleButton.addEventListener('click', function () {

354− if (themePopup.style.display === 'block') {

355− hideThemes();

356− } else {

357− showThemes();

358− }

359− });

360−

361− themePopup.addEventListener('click', function (e) {

362− var theme = e.target.id || e.target.parentElement.id;

363− set_theme(theme);

364− });

365−

366− themePopup.addEventListener('focusout', function(e) {

367− // e.relatedTarget is null in Safari and Firefox on macOS (see workaround below)

368− if (!!e.relatedTarget && !themeToggleButton.contains(e.relatedTarget) && !themePopup.contains(e.relatedTarget)) {

369− hideThemes();

370− }

371− });

372−

373− // Should not be needed, but it works around an issue on macOS & iOS: https://github.com/rust-lang/mdBook/issues/628

374− document.addEventListener('click', function(e) {

375− if (themePopup.style.display === 'block' && !themeToggleButton.contains(e.target) && !themePopup.contains(e.target)) {

376− hideThemes();

377− }

378− });

379−

380− document.addEventListener('keydown', function (e) {

381− if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) { return; }

382− if (!themePopup.contains(e.target)) { return; }

383−

384− switch (e.key) {

385− case 'Escape':

386− e.preventDefault();

387− hideThemes();

388− break;

389− case 'ArrowUp':

390− e.preventDefault();

391− var li = document.activeElement.parentElement;

392− if (li && li.previousElementSibling) {

393− li.previousElementSibling.querySelector('button').focus();

394− }

395− break;

396− case 'ArrowDown':

397− e.preventDefault();

398− var li = document.activeElement.parentElement;

399− if (li && li.nextElementSibling) {

400− li.nextElementSibling.querySelector('button').focus();

401− }

402− break;

403− case 'Home':

404− e.preventDefault();

405− themePopup.querySelector('li:first-child button').focus();

406− break;

407− case 'End':

408− e.preventDefault();

409− themePopup.querySelector('li:last-child button').focus();

410− break;

411− }

412− });

413−})();

414−

415−(function sidebar() {

416− var html = document.querySelector("html");

417− var sidebar = document.getElementById("sidebar");

418− var sidebarLinks = document.querySelectorAll('#sidebar a');

419− var sidebarToggleButton = document.getElementById("sidebar-toggle");

420− var sidebarResizeHandle = document.getElementById("sidebar-resize-handle");

421− var firstContact = null;

422−

423− function showSidebar() {

424− html.classList.remove('sidebar-hidden')

425− html.classList.add('sidebar-visible');

426− Array.from(sidebarLinks).forEach(function (link) {

427− link.setAttribute('tabIndex', 0);

428− });

429− sidebarToggleButton.setAttribute('aria-expanded', true);

430− sidebar.setAttribute('aria-hidden', false);

431− try { localStorage.setItem('mdbook-sidebar', 'visible'); } catch (e) { }

432− }

433−

434−

435− var sidebarAnchorToggles = document.querySelectorAll('#sidebar a.toggle');

436−

437− function toggleSection(ev) {

438− ev.currentTarget.parentElement.classList.toggle('expanded');

439− }

440−

441− Array.from(sidebarAnchorToggles).forEach(function (el) {

442− el.addEventListener('click', toggleSection);

443− });

444−

445− function hideSidebar() {

446− html.classList.remove('sidebar-visible')

447− html.classList.add('sidebar-hidden');

448− Array.from(sidebarLinks).forEach(function (link) {

449− link.setAttribute('tabIndex', -1);

450− });

451− sidebarToggleButton.setAttribute('aria-expanded', false);

452− sidebar.setAttribute('aria-hidden', true);

453− try { localStorage.setItem('mdbook-sidebar', 'hidden'); } catch (e) { }

454− }

455−

456− // Toggle sidebar

457− sidebarToggleButton.addEventListener('click', function sidebarToggle() {

458− if (html.classList.contains("sidebar-hidden")) {

459− var current_width = parseInt(

460− document.documentElement.style.getPropertyValue('--sidebar-width'), 10);

461− if (current_width < 150) {

462− document.documentElement.style.setProperty('--sidebar-width', '150px');

463− }

464− showSidebar();

465− } else if (html.classList.contains("sidebar-visible")) {

466− hideSidebar();

467− } else {

468− if (getComputedStyle(sidebar)['transform'] === 'none') {

469− hideSidebar();

470− } else {

471− showSidebar();

472− }

473− }

474− });

475−

476− sidebarResizeHandle.addEventListener('mousedown', initResize, false);

477−

478− function initResize(e) {

479− window.addEventListener('mousemove', resize, false);

480− window.addEventListener('mouseup', stopResize, false);

481− html.classList.add('sidebar-resizing');

482− }

483− function resize(e) {

484− var pos = (e.clientX - sidebar.offsetLeft);

485− if (pos < 20) {

486− hideSidebar();

487− } else {

488− if (html.classList.contains("sidebar-hidden")) {

489− showSidebar();

490− }

491− pos = Math.min(pos, window.innerWidth - 100);

492− document.documentElement.style.setProperty('--sidebar-width', pos + 'px');

493− }

494− }

495− //on mouseup remove windows functions mousemove & mouseup

496− function stopResize(e) {

497− html.classList.remove('sidebar-resizing');

498− window.removeEventListener('mousemove', resize, false);

499− window.removeEventListener('mouseup', stopResize, false);

500− }

501−

502− document.addEventListener('touchstart', function (e) {

503− firstContact = {

504− x: e.touches[0].clientX,

505− time: Date.now()

506− };

507− }, { passive: true });

508−

509− document.addEventListener('touchmove', function (e) {

510− if (!firstContact)

511− return;

512−

513− var curX = e.touches[0].clientX;

514− var xDiff = curX - firstContact.x,

515− tDiff = Date.now() - firstContact.time;

516−

517− if (tDiff < 250 && Math.abs(xDiff) >= 150) {

518− if (xDiff >= 0 && firstContact.x < Math.min(document.body.clientWidth * 0.25, 300))

519− showSidebar();

520− else if (xDiff < 0 && curX < 300)

521− hideSidebar();

522−

523− firstContact = null;

524− }

525− }, { passive: true });

526−

527− // Scroll sidebar to current active section

528− var activeSection = document.getElementById("sidebar").querySelector(".active");

529− if (activeSection) {

530− // https://developer.mozilla.org/en-US/docs/Web/API/Element/scrollIntoView

531− activeSection.scrollIntoView({ block: 'center' });

532− }

533−})();

534−

535−(function chapterNavigation() {

536− document.addEventListener('keydown', function (e) {

537− if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) { return; }

538− if (window.search && window.search.hasFocus()) { return; }

539−

540− switch (e.key) {

541− case 'ArrowRight':

542− e.preventDefault();

543− var nextButton = document.querySelector('.nav-chapters.next');

544− if (nextButton) {

545− window.location.href = nextButton.href;

546− }

547− break;

548− case 'ArrowLeft':

549− e.preventDefault();

550− var previousButton = document.querySelector('.nav-chapters.previous');

551− if (previousButton) {

552− window.location.href = previousButton.href;

553− }

554− break;

555− }

556− });

557−})();

558−

559−(function clipboard() {

560− var clipButtons = document.querySelectorAll('.clip-button');

561−

562− function hideTooltip(elem) {

563− elem.firstChild.innerText = "";

564− elem.className = 'fa fa-copy clip-button';

565− }

566−

567− function showTooltip(elem, msg) {

568− elem.firstChild.innerText = msg;

569− elem.className = 'fa fa-copy tooltipped';

570− }

571−

572− var clipboardSnippets = new ClipboardJS('.clip-button', {

573− text: function (trigger) {

574− hideTooltip(trigger);

575− let playground = trigger.closest("pre");

576− return playground_text(playground);

577− }

578− });

579−

580− Array.from(clipButtons).forEach(function (clipButton) {

581− clipButton.addEventListener('mouseout', function (e) {

582− hideTooltip(e.currentTarget);

583− });

584− });

585−

586− clipboardSnippets.on('success', function (e) {

587− e.clearSelection();

588− showTooltip(e.trigger, "Copied!");

589− });

590−

591− clipboardSnippets.on('error', function (e) {

592− showTooltip(e.trigger, "Clipboard error!");

593− });

594−})();

595−

596−(function scrollToTop () {

597− var menuTitle = document.querySelector('.menu-title');

598−

599− menuTitle.addEventListener('click', function () {

600− document.scrollingElement.scrollTo({ top: 0, behavior: 'smooth' });

601− });

602−})();

603−

604−(function controllMenu() {

605− var menu = document.getElementById('menu-bar');

606−

607− (function controllPosition() {

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 controllBorder() {

651− menu.classList.remove('bordered');

652− document.addEventListener('scroll', function () {

653− if (menu.offsetTop === 0) {

654− menu.classList.remove('bordered');

655− } else {

656− menu.classList.add('bordered');

657− }

658− }, { passive: true });

659− })();

660−})();

book/theme/css/chrome.cssdeleted−499

@@ -1,499 +0,0 @@

1−/* CSS for UI elements (a.k.a. chrome) */

2−

3−@import 'variables.css';

4−

5−::-webkit-scrollbar {

6− background: var(--bg);

7−}

8−::-webkit-scrollbar-thumb {

9− background: var(--scrollbar);

10−}

11−html {

12− scrollbar-color: var(--scrollbar) var(--bg);

13−}

14−#searchresults a,

15−.content a:link,

16−a:visited,

17−a > .hljs {

18− color: var(--links);

19−}

20−.content a:hover {

21− text-decoration: underline;

22−}

23−

24−/* Menu Bar */

25−

26−#menu-bar,

27−#menu-bar-hover-placeholder {

28− z-index: 101;

29− margin: auto calc(0px - var(--page-padding));

30−}

31−#menu-bar {

32− position: relative;

33− display: flex;

34− flex-wrap: wrap;

35− background-color: var(--bg);

36− border-bottom-color: var(--bg);

37− border-bottom-width: 1px;

38− border-bottom-style: solid;

39−}

40−#menu-bar.sticky,

41−.js #menu-bar-hover-placeholder:hover + #menu-bar,

42−.js #menu-bar:hover,

43−.js.sidebar-visible #menu-bar {

44− position: -webkit-sticky;

45− position: sticky;

46− top: 0 !important;

47−}

48−#menu-bar-hover-placeholder {

49− position: sticky;

50− position: -webkit-sticky;

51− top: 0;

52− height: var(--menu-bar-height);

53−}

54−#menu-bar.bordered {

55− border-bottom-color: var(--table-border-color);

56−}

57−#menu-bar i, #menu-bar .icon-button {

58− position: relative;

59− padding: 0 8px;

60− z-index: 10;

61− line-height: var(--menu-bar-height);

62− cursor: pointer;

63− transition: color 0.5s;

64−}

65−@media only screen and (max-width: 420px) {

66− #menu-bar i, #menu-bar .icon-button {

67− padding: 0 5px;

68− }

69−}

70−

71−.icon-button {

72− border: none;

73− background: none;

74− padding: 0;

75− color: inherit;

76−}

77−.icon-button i {

78− margin: 0;

79−}

80−

81−.right-buttons {

82− margin: 0 15px;

83−}

84−.right-buttons a {

85− text-decoration: none;

86−}

87−

88−.left-buttons {

89− display: flex;

90− margin: 0 5px;

91−}

92−.no-js .left-buttons {

93− display: none;

94−}

95−

96−.menu-title {

97− display: inline-block;

98− font-weight: 200;

99− font-size: 2.4rem;

100− line-height: var(--menu-bar-height);

101− text-align: center;

102− margin: 0;

103− flex: 1;

104− white-space: nowrap;

105− overflow: hidden;

106− text-overflow: ellipsis;

107−}

108−.js .menu-title {

109− cursor: pointer;

110−}

111−

112−.menu-bar,

113−.menu-bar:visited,

114−.nav-chapters,

115−.nav-chapters:visited,

116−.mobile-nav-chapters,

117−.mobile-nav-chapters:visited,

118−.menu-bar .icon-button,

119−.menu-bar a i {

120− color: var(--icons);

121−}

122−

123−.menu-bar i:hover,

124−.menu-bar .icon-button:hover,

125−.nav-chapters:hover,

126−.mobile-nav-chapters i:hover {

127− color: var(--icons-hover);

128−}

129−

130−/* Nav Icons */

131−

132−.nav-chapters {

133− font-size: 2.5em;

134− text-align: center;

135− text-decoration: none;

136−

137− position: fixed;

138− top: 0;

139− bottom: 0;

140− margin: 0;

141− max-width: 150px;

142− min-width: 90px;

143−

144− display: flex;

145− justify-content: center;

146− align-content: center;

147− flex-direction: column;

148−

149− transition: color 0.5s, background-color 0.5s;

150−}

151−

152−.nav-chapters:hover {

153− text-decoration: none;

154− background-color: var(--theme-hover);

155− transition: background-color 0.15s, color 0.15s;

156−}

157−

158−.nav-wrapper {

159− margin-top: 50px;

160− display: none;

161−}

162−

163−.mobile-nav-chapters {

164− font-size: 2.5em;

165− text-align: center;

166− text-decoration: none;

167− width: 90px;

168− border-radius: 5px;

169− background-color: var(--sidebar-bg);

170−}

171−

172−.previous {

173− float: left;

174−}

175−

176−.next {

177− float: right;

178− right: var(--page-padding);

179−}

180−

181−@media only screen and (max-width: 1080px) {

182− .nav-wide-wrapper { display: none; }

183− .nav-wrapper { display: block; }

184−}

185−

186−@media only screen and (max-width: 1380px) {

187− .sidebar-visible .nav-wide-wrapper { display: none; }

188− .sidebar-visible .nav-wrapper { display: block; }

189−}

190−

191−/* Inline code */

192−

193−:not(pre) > .hljs {

194− display: inline;

195− padding: 0.1em 0.3em;

196− border-radius: 3px;

197−}

198−

199−:not(pre):not(a):not(td):not(p) > .hljs {

200− color: var(--inline-code-color);

201− overflow-x: initial;

202−}

203−

204−a:hover > .hljs {

205− text-decoration: underline;

206−}

207−

208−pre {

209− position: relative;

210−}

211−pre > .buttons {

212− position: absolute;

213− z-index: 100;

214− right: 5px;

215− top: 5px;

216−

217− color: var(--sidebar-fg);

218− cursor: pointer;

219−}

220−pre > .buttons :hover {

221− color: var(--sidebar-active);

222−}

223−pre > .buttons i {

224− margin-left: 8px;

225−}

226−pre > .buttons button {

227− color: inherit;

228− background: transparent;

229− border: none;

230− cursor: inherit;

231−}

232−pre > .result {

233− margin-top: 10px;

234−}

235−

236−/* Search */

237−

238−#searchresults a {

239− text-decoration: none;

240−}

241−

242−mark {

243− border-radius: 2px;

244− padding: 0 3px 1px 3px;

245− margin: 0 -3px -1px -3px;

246− background-color: var(--search-mark-bg);

247− transition: background-color 300ms linear;

248− cursor: pointer;

249−}

250−

251−mark.fade-out {

252− background-color: rgba(0,0,0,0) !important;

253− cursor: auto;

254−}

255−

256−.searchbar-outer {

257− margin-left: auto;

258− margin-right: auto;

259− max-width: var(--content-max-width);

260−}

261−

262−#searchbar {

263− width: 100%;

264− margin: 5px auto 0px auto;

265− padding: 10px 16px;

266− transition: box-shadow 300ms ease-in-out;

267− border: 1px solid var(--searchbar-border-color);

268− border-radius: 3px;

269− background-color: var(--searchbar-bg);

270− color: var(--searchbar-fg);

271−}

272−#searchbar:focus,

273−#searchbar.active {

274− box-shadow: 0 0 3px var(--searchbar-shadow-color);

275−}

276−

277−.searchresults-header {

278− font-weight: bold;

279− font-size: 1em;

280− padding: 18px 0 0 5px;

281− color: var(--searchresults-header-fg);

282−}

283−

284−.searchresults-outer {

285− margin-left: auto;

286− margin-right: auto;

287− max-width: var(--content-max-width);

288− border-bottom: 1px dashed var(--searchresults-border-color);

289−}

290−

291−ul#searchresults {

292− list-style: none;

293− padding-left: 20px;

294−}

295−ul#searchresults li {

296− margin: 10px 0px;

297− padding: 2px;

298− border-radius: 2px;

299−}

300−ul#searchresults li.focus {

301− background-color: var(--searchresults-li-bg);

302−}

303−ul#searchresults span.teaser {

304− display: block;

305− clear: both;

306− margin: 5px 0 0 20px;

307− font-size: 0.8em;

308−}

309−ul#searchresults span.teaser em {

310− font-weight: bold;

311− font-style: normal;

312−}

313−

314−/* Sidebar */

315−

316−.sidebar {

317− position: fixed;

318− left: 0;

319− top: 0;

320− bottom: 0;

321− width: var(--sidebar-width);

322− font-size: 0.875em;

323− box-sizing: border-box;

324− -webkit-overflow-scrolling: touch;

325− overscroll-behavior-y: contain;

326− background-color: var(--sidebar-bg);

327− color: var(--sidebar-fg);

328−}

329−.sidebar-resizing {

330− -moz-user-select: none;

331− -webkit-user-select: none;

332− -ms-user-select: none;

333− user-select: none;

334−}

335−.js:not(.sidebar-resizing) .sidebar {

336− transition: transform 0.3s; /* Animation: slide away */

337−}

338−.sidebar code {

339− line-height: 2em;

340−}

341−.sidebar .sidebar-scrollbox {

342− overflow-y: auto;

343− position: absolute;

344− top: 0;

345− bottom: 0;

346− left: 0;

347− right: 0;

348−}

349−.sidebar .sidebar-resize-handle {

350− position: absolute;

351− cursor: col-resize;

352− width: 0;

353− right: 0;

354− top: 0;

355− bottom: 0;

356−}

357−.js .sidebar .sidebar-resize-handle {

358− cursor: col-resize;

359− width: 5px;

360−}

361−.sidebar-hidden .sidebar {

362− transform: translateX(calc(0px - var(--sidebar-width)));

363−}

364−.sidebar::-webkit-scrollbar {

365− background: var(--sidebar-bg);

366−}

367−.sidebar::-webkit-scrollbar-thumb {

368− background: var(--scrollbar);

369−}

370−

371−.sidebar-visible .page-wrapper {

372− transform: translateX(var(--sidebar-width));

373−}

374−@media only screen and (min-width: 620px) {

375− .sidebar-visible .page-wrapper {

376− transform: none;

377− margin-left: var(--sidebar-width);

378− }

379−}

380−

381−.chapter {

382− list-style: none outside none;

383− padding-left: 0;

384− margin: .25rem 0;

385−}

386−

387−.chapter ol {

388− width: 100%;

389−}

390−

391−.chapter li {

392− display: flex;

393− color: var(--sidebar-non-existant);

394−}

395−.chapter li a {

396− display: block;

397− text-decoration: none;

398− color: var(--sidebar-fg);

399−}

400−

401−.chapter li a:hover {

402− color: var(--sidebar-active);

403−}

404−

405−.chapter li a.active {

406− color: var(--sidebar-active);

407−}

408−

409−.chapter li > a.toggle {

410− cursor: pointer;

411− display: block;

412− margin-left: auto;

413− padding: 0 10px;

414− user-select: none;

415− opacity: 0.68;

416−}

417−

418−.chapter li > a.toggle div {

419− transition: transform 0.5s;

420−}

421−

422−/* collapse the section */

423−.chapter li:not(.expanded) + li > ol {

424− display: none;

425−}

426−

427−.chapter li.chapter-item {

428− padding: 1rem 1.5rem;

429−}

430−

431−.chapter .section li.chapter-item {

432− padding: .5rem .5rem 0 .5rem;

433−}

434−

435−.chapter li.expanded > a.toggle div {

436− transform: rotate(90deg);

437−}

438−

439−.spacer {

440− width: 100%;

441− height: 3px;

442− margin: 5px 0px;

443−}

444−.chapter .spacer {

445− background-color: var(--sidebar-spacer);

446−}

447−

448−@media (-moz-touch-enabled: 1), (pointer: coarse) {

449− .chapter li a { padding: 5px 0; }

450− .spacer { margin: 10px 0; }

451−}

452−

453−.section {

454− list-style: none outside none;

455− padding-left: 2rem;

456− line-height: 1.9em;

457−}

458−

459−/* Theme Menu Popup */

460−

461−.theme-popup {

462− position: absolute;

463− left: 10px;

464− top: var(--menu-bar-height);

465− z-index: 1000;

466− border-radius: 4px;

467− font-size: 0.7em;

468− color: var(--fg);

469− background: var(--theme-popup-bg);

470− border: 1px solid var(--theme-popup-border);

471− margin: 0;

472− padding: 0;

473− list-style: none;

474− display: none;

475−}

476−.theme-popup .default {

477− color: var(--icons);

478−}

479−.theme-popup .theme {

480− width: 100%;

481− border: 0;

482− margin: 0;

483− padding: 2px 10px;

484− line-height: 25px;

485− white-space: nowrap;

486− text-align: left;

487− cursor: pointer;

488− color: inherit;

489− background: inherit;

490− font-size: inherit;

491−}

492−.theme-popup .theme:hover {

493− background-color: var(--theme-hover);

494−}

495−.theme-popup .theme:hover:first-child,

496−.theme-popup .theme:hover:last-child {

497− border-top-left-radius: inherit;

498− border-top-right-radius: inherit;

499−}

book/theme/css/general.cssdeleted−233

@@ -1,233 +0,0 @@

1−/* Base styles and content styles */

2−

3−@import 'variables.css';

4−

5−:root {

6− /* Browser default font-size is 16px, this way 1 rem = 10px */

7− font-size: 62.5%;

8−}

9−

10−/* TODO: replace with self hosted fonts */

11−

12−html {

13− font-family: "Inter", sans-serif;

14− color: var(--fg);

15− background-color: var(--bg);

16− text-size-adjust: none;

17−}

18−

19−/* @supports (font-variation-settings: normal) { */

20−/* html { font-family: 'Inter var', sans-serif; } */

21−/* } */

22−

23−body {

24− margin: 0;

25− font-size: 1.6rem;

26− overflow-x: hidden;

27−}

28−

29−code {

30− font-family: "Source Code Pro", Consolas, "Ubuntu Mono", Menlo, "DejaVu Sans Mono", monospace, monospace !important;

31− font-size: 0.875em; /* please adjust the ace font size accordingly in editor.js */

32−}

33−

34−/* Don't change font size in headers. */

35−h1 code, h2 code, h3 code, h4 code, h5 code, h6 code {

36− font-size: unset;

37−}

38−

39−.left { float: left; }

40−.right { float: right; }

41−.boring { opacity: 0.6; }

42−.hide-boring .boring { display: none; }

43−.hidden { display: none !important; }

44−

45−h2, h3 { margin-top: 2.5em; }

46−h4, h5 { margin-top: 2em; }

47−

48−.header + .header h3,

49−.header + .header h4,

50−.header + .header h5 {

51− margin-top: 1em;

52−}

53−

54−h1:target::before,

55−h2:target::before,

56−h3:target::before,

57−h4:target::before,

58−h5:target::before,

59−h6:target::before {

60− display: inline-block;

61− content: "»";

62− margin-left: -30px;

63− width: 30px;

64−}

65−

66−/* This is broken on Safari as of version 14, but is fixed

67− in Safari Technology Preview 117 which I think will be Safari 14.2.

68− https://bugs.webkit.org/show_bug.cgi?id=218076

69−*/

70−:target {

71− scroll-margin-top: calc(var(--menu-bar-height) + 0.5em);

72−}

73−

74−.page {

75− outline: 0;

76− padding: 0 var(--page-padding);

77− margin-top: calc(0px - var(--menu-bar-height)); /* Compensate for the #menu-bar-hover-placeholder */

78−}

79−.page-wrapper {

80− box-sizing: border-box;

81−}

82−.js:not(.sidebar-resizing) .page-wrapper {

83− transition: margin-left 0.3s ease, transform 0.3s ease; /* Animation: slide away */

84−}

85−

86−.content {

87− overflow-y: auto;

88− padding: 0 15px;

89− padding-bottom: 50px;

90−}

91−.content main {

92− margin-left: auto;

93− margin-right: auto;

94− max-width: var(--content-max-width);

95−}

96−

97−

98−/* 2 1.75 1.5 1.25 1 .875 */

99−

100−.content h1 { font-size: 2em }

101−.content h2 { font-size: 1.75em }

102−.content h3 { font-size: 1.5em }

103−.content h4 { font-size: 1.25em }

104−.content h5 { font-size: 1em }

105−.content h6 { font-size: .875em }

106−

107−.content h1, .content h2, .content h3, .content h4 {

108− font-weight: 500;

109− margin-top: 1.275em;

110− margin-bottom: .875em;

111−}

112−.content p, .content ol, .content ul, .content table {

113− margin-top: 0;

114− margin-bottom: .875em;

115−}

116−

117−.content ul li {

118−margin-bottom: .25rem;

119−}

120−.content ul {

121− list-style-type: square;

122−}

123−.content ul ul, .content ol ul {

124− margin-bottom: .5rem;

125−}

126−.content li p {

127− margin-bottom: .5em;

128−}

129−

130−.content p { line-height: 1.45em; }

131−.content ol { line-height: 1.45em; }

132−.content ul { line-height: 1.45em; }

133−.content a { text-decoration: none; }

134−.content a:hover { text-decoration: underline; }

135−.content img { max-width: 100%; }

136−.content .header:link,

137−.content .header:visited {

138− color: var(--fg);

139− color: var(--heading-fg);

140−}

141−.content .header:link,

142−.content .header:visited:hover {

143− text-decoration: none;

144−}

145−

146−table {

147− margin: 0 auto;

148− border-collapse: collapse;

149− width: 100%;

150−}

151−table td {

152− padding: .75rem;

153− width: auto;

154−}

155−table thead {

156− background: var(--table-header-bg);

157−}

158−table thead td {

159− font-weight: 700;

160− border: none;

161−}

162−table thead th {

163− padding: .75rem;

164− text-align: left;

165− font-weight: 500;

166− line-height: 1.5;

167− width: auto;

168−}

169−table thead tr {

170− border-bottom: 2px var(--table-border-color) solid;

171−}

172−table tbody tr {

173− border-bottom: 1px var(--table-border-line) solid;

174−}

175−/* Alternate background colors for rows */

176−table tbody tr:nth-child(2n) {

177− /* background: var(--table-alternate-bg); */

178−}

179−

180−

181−blockquote {

182− margin: 1.5rem 0;

183− padding: 1rem 1.5rem;

184− color: var(--fg);

185− opacity: .9;

186− background-color: var(--quote-bg);

187− border-left: 4px solid var(--quote-border);

188−}

189−blockquote *:last-child {

190− margin-bottom: 0;

191−}

192−

193−

194−:not(.footnote-definition) + .footnote-definition,

195−.footnote-definition + :not(.footnote-definition) {

196− margin-top: 2em;

197−}

198−.footnote-definition {

199− font-size: 0.9em;

200− margin: 0.5em 0;

201−}

202−.footnote-definition p {

203− display: inline;

204−}

205−

206−.tooltiptext {

207− position: absolute;

208− visibility: hidden;

209− color: #fff;

210− background-color: #333;

211− transform: translateX(-50%); /* Center by moving tooltip 50% of its width left */

212− left: -8px; /* Half of the width of the icon */

213− top: -35px;

214− font-size: 0.8em;

215− text-align: center;

216− border-radius: 6px;

217− padding: 5px 8px;

218− margin: 5px;

219− z-index: 1000;

220−}

221−.tooltipped .tooltiptext {

222− visibility: visible;

223−}

224−

225−.chapter li.part-title {

226− color: var(--sidebar-fg);

227− margin: 5px 0px;

228− font-weight: bold;

229−}

230−

231−.result-no-output {

232− font-style: italic;

233−}

book/theme/css/print.cssdeleted−54

@@ -1,54 +0,0 @@

1−

2−#sidebar,

3−#menu-bar,

4−.nav-chapters,

5−.mobile-nav-chapters {

6− display: none;

7−}

8−

9−#page-wrapper.page-wrapper {

10− transform: none;

11− margin-left: 0px;

12− overflow-y: initial;

13−}

14−

15−#content {

16− max-width: none;

17− margin: 0;

18− padding: 0;

19−}

20−

21−.page {

22− overflow-y: initial;

23−}

24−

25−code {

26− background-color: #666666;

27− border-radius: 5px;

28−

29− /* Force background to be printed in Chrome */

30− -webkit-print-color-adjust: exact;

31−}

32−

33−pre > .buttons {

34− z-index: 2;

35−}

36−

37−a, a:visited, a:active, a:hover {

38− color: #4183c4;

39− text-decoration: none;

40−}

41−

42−h1, h2, h3, h4, h5, h6 {

43− page-break-inside: avoid;

44− page-break-after: avoid;

45−}

46−

47−pre, code {

48− page-break-inside: avoid;

49− white-space: pre-wrap;

50−}

51−

52−.fa {

53− display: none !important;

54−}

book/theme/css/variables.cssdeleted−342

@@ -1,342 +0,0 @@

1−

2−/* Globals */

3−

4−:root {

5− --sidebar-width: 300px;

6− --page-padding: 15px;

7− --content-max-width: 750px;

8− --menu-bar-height: 50px;

9−}

10−

11−/* Themes */

12−

13−.ayu {

14− --bg: hsl(210, 25%, 8%);

15− --fg: #c5c5c5;

16−

17− --sidebar-bg: #14191f;

18− --sidebar-fg: #c8c9db;

19− --sidebar-non-existant: #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−}

52−

53−.coal {

54− --bg: hsl(200, 7%, 8%);

55− --fg: #98a3ad;

56−

57− --sidebar-bg: #292c2f;

58− --sidebar-fg: #a1adb8;

59− --sidebar-non-existant: #505254;

60− --sidebar-active: #3473ad;

61− --sidebar-spacer: #393939;

62−

63− --scrollbar: var(--sidebar-fg);

64−

65− --icons: #43484d;

66− --icons-hover: #b3c0cc;

67−

68− --links: #2b79a2;

69−

70− --inline-code-color: #c5c8c6;

71−

72− --theme-popup-bg: #141617;

73− --theme-popup-border: #43484d;

74− --theme-hover: #1f2124;

75−

76− --quote-bg: hsl(234, 21%, 18%);

77− --quote-border: hsl(234, 21%, 23%);

78−

79− --table-border-color: hsl(200, 7%, 13%);

80− --table-header-bg: hsl(200, 7%, 28%);

81− --table-alternate-bg: hsl(200, 7%, 11%);

82−

83− --searchbar-border-color: #aaa;

84− --searchbar-bg: #b7b7b7;

85− --searchbar-fg: #000;

86− --searchbar-shadow-color: #aaa;

87− --searchresults-header-fg: #666;

88− --searchresults-border-color: #98a3ad;

89− --searchresults-li-bg: #2b2b2f;

90− --search-mark-bg: #355c7d;

91−}

92−

93−.light {

94− --bg: hsl(0, 0%, 100%);

95− --fg: hsl(0, 0%, 0%);

96−

97− --sidebar-bg: #fafafa;

98− --sidebar-fg: hsl(0, 0%, 0%);

99− --sidebar-non-existant: #aaaaaa;

100− --sidebar-active: #1f1fff;

101− --sidebar-spacer: #f4f4f4;

102−

103− --scrollbar: #8F8F8F;

104−

105− --icons: #747474;

106− --icons-hover: #000000;

107−

108− --links: #20609f;

109−

110− --inline-code-color: #301900;

111−

112− --theme-popup-bg: #fafafa;

113− --theme-popup-border: #cccccc;

114− --theme-hover: #e6e6e6;

115−

116− --quote-bg: hsl(197, 37%, 96%);

117− --quote-border: hsl(197, 37%, 91%);

118−

119− --table-border-color: hsl(0, 0%, 95%);

120− --table-header-bg: hsl(0, 0%, 80%);

121− --table-alternate-bg: hsl(0, 0%, 97%);

122−

123− --searchbar-border-color: #aaa;

124− --searchbar-bg: #fafafa;

125− --searchbar-fg: #000;

126− --searchbar-shadow-color: #aaa;

127− --searchresults-header-fg: #666;

128− --searchresults-border-color: #888;

129− --searchresults-li-bg: #e4f2fe;

130− --search-mark-bg: #a2cff5;

131−}

132−

133−.navy {

134− --bg: hsl(226, 23%, 11%);

135− --fg: #bcbdd0;

136−

137− --sidebar-bg: #282d3f;

138− --sidebar-fg: #c8c9db;

139− --sidebar-non-existant: #505274;

140− --sidebar-active: #2b79a2;

141− --sidebar-spacer: #2d334f;

142−

143− --scrollbar: var(--sidebar-fg);

144−

145− --icons: #737480;

146− --icons-hover: #b7b9cc;

147−

148− --links: #2b79a2;

149−

150− --inline-code-color: #c5c8c6;

151−

152− --theme-popup-bg: #161923;

153− --theme-popup-border: #737480;

154− --theme-hover: #282e40;

155−

156− --quote-bg: hsl(226, 15%, 17%);

157− --quote-border: hsl(226, 15%, 22%);

158−

159− --table-border-color: hsl(226, 23%, 16%);

160− --table-header-bg: hsl(226, 23%, 31%);

161− --table-alternate-bg: hsl(226, 23%, 14%);

162−

163− --searchbar-border-color: #aaa;

164− --searchbar-bg: #aeaec6;

165− --searchbar-fg: #000;

166− --searchbar-shadow-color: #aaa;

167− --searchresults-header-fg: #5f5f71;

168− --searchresults-border-color: #5c5c68;

169− --searchresults-li-bg: #242430;

170− --search-mark-bg: #a2cff5;

171−}

172−

173−.rust {

174− --bg: hsl(60, 9%, 87%);

175− --fg: #262625;

176−

177− --sidebar-bg: #3b2e2a;

178− --sidebar-fg: #c8c9db;

179− --sidebar-non-existant: #505254;

180− --sidebar-active: #e69f67;

181− --sidebar-spacer: #45373a;

182−

183− --scrollbar: var(--sidebar-fg);

184−

185− --icons: #737480;

186− --icons-hover: #262625;

187−

188− --links: #2b79a2;

189−

190− --inline-code-color: #6e6b5e;

191−

192− --theme-popup-bg: #e1e1db;

193− --theme-popup-border: #b38f6b;

194− --theme-hover: #99908a;

195−

196− --quote-bg: hsl(60, 5%, 75%);

197− --quote-border: hsl(60, 5%, 70%);

198−

199− --table-border-color: hsl(60, 9%, 82%);

200− --table-header-bg: #b3a497;

201− --table-alternate-bg: hsl(60, 9%, 84%);

202−

203− --searchbar-border-color: #aaa;

204− --searchbar-bg: #fafafa;

205− --searchbar-fg: #000;

206− --searchbar-shadow-color: #aaa;

207− --searchresults-header-fg: #666;

208− --searchresults-border-color: #888;

209− --searchresults-li-bg: #dec2a2;

210− --search-mark-bg: #e69f67;

211−}

212−

213−@media (prefers-color-scheme: dark) {

214− .light.no-js {

215− --bg: hsl(200, 7%, 8%);

216− --fg: #98a3ad;

217−

218− --sidebar-bg: #292c2f;

219− --sidebar-fg: #a1adb8;

220− --sidebar-non-existant: #505254;

221− --sidebar-active: #3473ad;

222− --sidebar-spacer: #393939;

223−

224− --scrollbar: var(--sidebar-fg);

225−

226− --icons: #43484d;

227− --icons-hover: #b3c0cc;

228−

229− --links: #2b79a2;

230−

231− --inline-code-color: #c5c8c6;

232−

233− --theme-popup-bg: #141617;

234− --theme-popup-border: #43484d;

235− --theme-hover: #1f2124;

236−

237− --quote-bg: hsl(234, 21%, 18%);

238− --quote-border: hsl(234, 21%, 23%);

239−

240− --table-border-color: hsl(200, 7%, 13%);

241− --table-header-bg: hsl(200, 7%, 28%);

242− --table-alternate-bg: hsl(200, 7%, 11%);

243−

244− --searchbar-border-color: #aaa;

245− --searchbar-bg: #b7b7b7;

246− --searchbar-fg: #000;

247− --searchbar-shadow-color: #aaa;

248− --searchresults-header-fg: #666;

249− --searchresults-border-color: #98a3ad;

250− --searchresults-li-bg: #2b2b2f;

251− --search-mark-bg: #355c7d;

252− }

253−}

254−

255−.colibri {

256− --bg: #3b224c;

257− --fg: #bcbdd0;

258− --heading-fg: #fff;

259−

260− --sidebar-bg: #281733;

261− --sidebar-fg: #c8c9db;

262− --sidebar-non-existant: #505274;

263− --sidebar-active: #a4a0e8;

264− --sidebar-spacer: #2d334f;

265−

266− --scrollbar: var(--sidebar-fg);

267−

268− --icons: #737480;

269− --icons-hover: #b7b9cc;

270−

271− /* --links: #a4a0e8; */

272− --links: #ECCDBA;

273−

274− --inline-code-color: hsl(48.7, 7.8%, 70%);

275−

276− --theme-popup-bg: #161923;

277− --theme-popup-border: #737480;

278− --theme-hover: rgba(0,0,0, .2);

279−

280− --quote-bg: #281733;

281− --quote-border: hsl(226, 15%, 22%);

282−

283− --table-border-color: hsl(226, 23%, 76%);

284− --table-header-bg: hsla(226, 23%, 31%, 0);

285− --table-alternate-bg: hsl(226, 23%, 14%);

286− --table-border-line: hsla(201deg, 20%, 92%, 0.2);

287−

288− --searchbar-border-color: #aaa;

289− --searchbar-bg: #aeaec6;

290− --searchbar-fg: #000;

291− --searchbar-shadow-color: #aaa;

292− --searchresults-header-fg: #5f5f71;

293− --searchresults-border-color: #5c5c68;

294− --searchresults-li-bg: #242430;

295− --search-mark-bg: #a2cff5;

296−}

297−

298−.colibri {

299−/*

300− --bg: #ffffff;

301− --fg: #452859;

302− --fg: #5a5977;

303− --heading-fg: #281733;

304−

305− --sidebar-bg: #281733;

306− --sidebar-fg: #c8c9db;

307− --sidebar-non-existant: #505274;

308− --sidebar-active: #a4a0e8;

309− --sidebar-spacer: #2d334f;

310−

311− --scrollbar: var(--sidebar-fg);

312−

313− --icons: #737480;

314− --icons-hover: #b7b9cc;

315−

316− --links: #6F44F0;

317−

318− --inline-code-color: #a39e9b;

319−

320− --theme-popup-bg: #161923;

321− --theme-popup-border: #737480;

322− --theme-hover: rgba(0,0,0, .2);

323−

324− --quote-bg: rgba(0, 0, 0, 0);

325− --quote-border: hsl(226, 15%, 75%);

326−

327− --table-border-color: #5a5977;

328− --table-border-color: hsl(201deg 10% 67%);

329− --table-header-bg: hsl(0, 0%, 100%);

330− --table-alternate-bg: hsl(0, 0%, 97%);

331− --table-border-line: hsl(201deg, 20%, 92%);

332−

333− --searchbar-border-color: #aaa;

334− --searchbar-bg: #aeaec6;

335− --searchbar-fg: #000;

336− --searchbar-shadow-color: #aaa;

337− --searchresults-header-fg: #5f5f71;

338− --searchresults-border-color: #5c5c68;

339− --searchresults-li-bg: #242430;

340− --search-mark-bg: #a2cff5;

341−*/

342−}

book/theme/favicon.png

Binary file not shown.

book/theme/favicon.svg+1−22

@@ -1,22 +1 @@

1−<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 199.7 184.2">

2− <style>

3− @media (prefers-color-scheme: dark) {

4− svg { fill: white; }

5− }

6− </style>

7−<path d="M189.5,36.8c0.2,2.8,0,5.1-0.6,6.8L153,162c-0.6,2.1-2,3.7-4.2,5c-2.2,1.2-4.4,1.9-6.7,1.9H31.4c-9.6,0-15.3-2.8-17.3-8.4

8− c-0.8-2.2-0.8-3.9,0.1-5.2c0.9-1.2,2.4-1.8,4.6-1.8H123c7.4,0,12.6-1.4,15.4-4.1s5.7-8.9,8.6-18.4l32.9-108.6

9− c1.8-5.9,1-11.1-2.2-15.6S169.9,0,164,0H72.7c-1,0-3.1,0.4-6.1,1.1l0.1-0.4C64.5,0.2,62.6,0,61,0.1s-3,0.5-4.3,1.4

10− c-1.3,0.9-2.4,1.8-3.2,2.8S52,6.5,51.2,8.1c-0.8,1.6-1.4,3-1.9,4.3s-1.1,2.7-1.8,4.2c-0.7,1.5-1.3,2.7-2,3.7c-0.5,0.6-1.2,1.5-2,2.5

11− s-1.6,2-2.2,2.8s-0.9,1.5-1.1,2.2c-0.2,0.7-0.1,1.8,0.2,3.2c0.3,1.4,0.4,2.4,0.4,3.1c-0.3,3-1.4,6.9-3.3,11.6

12− c-1.9,4.7-3.6,8.1-5.1,10.1c-0.3,0.4-1.2,1.3-2.6,2.7c-1.4,1.4-2.3,2.6-2.6,3.7c-0.3,0.4-0.3,1.5-0.1,3.4c0.3,1.8,0.4,3.1,0.3,3.8

13− c-0.3,2.7-1.3,6.3-3,10.8c-1.7,4.5-3.4,8.2-5,11c-0.2,0.5-0.9,1.4-2,2.8c-1.1,1.4-1.8,2.5-2,3.4c-0.2,0.6-0.1,1.8,0.1,3.4

14− c0.2,1.6,0.2,2.8-0.1,3.6c-0.6,3-1.8,6.7-3.6,11c-1.8,4.3-3.6,7.9-5.4,11c-0.5,0.8-1.1,1.7-2,2.8c-0.8,1.1-1.5,2-2,2.8

15− s-0.8,1.6-1,2.5c-0.1,0.5,0,1.3,0.4,2.3c0.3,1.1,0.4,1.9,0.4,2.6c-0.1,1.1-0.2,2.6-0.5,4.4c-0.2,1.8-0.4,2.9-0.4,3.2

16− c-1.8,4.8-1.7,9.9,0.2,15.2c2.2,6.2,6.2,11.5,11.9,15.8c5.7,4.3,11.7,6.4,17.8,6.4h110.7c5.2,0,10.1-1.7,14.7-5.2s7.7-7.8,9.2-12.9

17− l33-108.6c1.8-5.8,1-10.9-2.2-15.5C194.9,39.7,192.6,38,189.5,36.8z M59.6,122.8L73.8,80c0,0,7,0,10.8,0s28.8-1.7,25.4,17.5

18− c-3.4,19.2-18.8,25.2-36.8,25.4S59.6,122.8,59.6,122.8z M78.6,116.8c4.7-0.1,18.9-2.9,22.1-17.1S89.2,86.3,89.2,86.3l-8.9,0

19− l-10.2,30.5C70.2,116.9,74,116.9,78.6,116.8z M75.3,68.7L89,26.2h9.8l0.8,34l23.6-34h9.9l-13.6,42.5h-7.1l12.5-35.4l-24.5,35.4h-6.8

20− l-0.8-35L82,68.7H75.3z"/>

21−</svg>

22−

1+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;" viewBox="663.38 37.57 575.35 903.75"> <g transform="matrix(1,0,0,1,-31352.7,-1817.25)"> <g transform="matrix(1,0,0,1,31062.7,-20.8972)"> <g transform="matrix(1,0,0,1,-130.173,0.00185558)"> <path d="M1083.58,1875.72L1635.06,2194.12C1649.8,2202.63 1658.88,2218.37 1658.88,2235.39C1658.88,2264.98 1658.88,2311.74 1658.88,2341.33C1658.88,2349.84 1656.61,2358.03 1652.5,2365.16C1652.5,2365.16 1214.7,2112.4 1107.2,2050.33C1092.58,2041.89 1083.58,2026.29 1083.58,2009.41C1083.58,1963.5 1083.58,1875.72 1083.58,1875.72Z" style="fill:#706bc8;"></path> </g> <g transform="matrix(1,0,0,1,-130.173,0.00185558)"> <path d="M1635.26,2604.84C1649.88,2613.28 1658.88,2628.87 1658.88,2645.75C1658.88,2691.67 1658.88,2779.44 1658.88,2779.44L1107.41,2461.05C1092.66,2452.53 1083.58,2436.8 1083.58,2419.78C1083.58,2390.19 1083.58,2343.42 1083.58,2313.84C1083.58,2305.32 1085.85,2297.13 1089.96,2290.01C1089.96,2290.01 1527.76,2542.77 1635.26,2604.84Z" style="fill:#55c5e4;"></path> </g> <g transform="matrix(1,0,0,1,216.062,984.098)"> <path d="M790.407,1432.56C785.214,1435.55 780.717,1439.9 777.509,1445.46C767.862,1462.16 773.473,1483.76 790.004,1493.59L789.998,1493.59L761.173,1476.95C746.427,1468.44 737.344,1452.71 737.344,1435.68C737.344,1406.09 737.344,1359.33 737.344,1329.74C737.344,1312.71 746.427,1296.98 761.173,1288.47L1259.59,1000.74L1259.83,1000.6C1264.92,997.617 1269.33,993.314 1272.48,987.844C1282.13,971.136 1276.52,949.544 1259.99,939.707L1260,939.707L1288.82,956.349C1303.57,964.862 1312.65,980.595 1312.65,997.622C1312.65,1027.21 1312.65,1073.97 1312.65,1103.56C1312.65,1120.59 1303.57,1136.32 1288.82,1144.83L1259.19,1161.94L1259.59,1161.68L790.407,1432.56Z" style="fill:#84ddea;"></path> </g> <g transform="matrix(1,0,0,1,216.062,984.098)"> <path d="M790.407,1686.24C785.214,1689.23 780.717,1693.58 777.509,1699.13C767.862,1715.84 773.473,1737.43 790.004,1747.27L789.998,1747.27L761.173,1730.63C746.427,1722.12 737.344,1706.38 737.344,1689.36C737.344,1659.77 737.344,1613.01 737.344,1583.42C737.344,1566.39 746.427,1550.66 761.173,1542.15L1259.59,1254.42L1259.83,1254.28C1264.92,1251.29 1269.33,1246.99 1272.48,1241.52C1282.13,1224.81 1276.52,1203.22 1259.99,1193.38L1260,1193.38L1288.82,1210.03C1303.57,1218.54 1312.65,1234.27 1312.65,1251.3C1312.65,1280.89 1312.65,1327.65 1312.65,1357.24C1312.65,1374.26 1303.57,1390 1288.82,1398.51L1259.19,1415.61L1259.59,1415.36L790.407,1686.24Z" style="fill:#997bc8;"></path></g></g></g> </svg>

book/theme/highlight.cssdeleted−56

@@ -1,56 +0,0 @@

1−pre code.hljs {

2− display:block;

3− overflow-x:auto;

4− padding:1em

5−}

6−code.hljs {

7− padding:3px 5px

8−}

9−.hljs {

10− background:#2f1e2e;

11− color:#a39e9b

12−}

13−.hljs-comment,

14−.hljs-quote {

15− color:#8d8687

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:#ef6155

27−}

28−.hljs-built_in,

29−.hljs-deletion,

30−.hljs-literal,

31−.hljs-number,

32−.hljs-params,

33−.hljs-type {

34− color:#f99b15

35−}

36−.hljs-attribute,

37−.hljs-section,

38−.hljs-title {

39− color:#fec418

40−}

41−.hljs-addition,

42−.hljs-bullet,

43−.hljs-string,

44−.hljs-symbol {

45− color:#48b685

46−}

47−.hljs-keyword,

48−.hljs-selector-tag {

49− color:#815ba4

50−}

51−.hljs-emphasis {

52− font-style:italic

53−}

54−.hljs-strong {

55− font-weight:700

56−}

book/theme/highlight.jsdeleted−6

@@ -1,6 +0,0 @@

1−/*

2− Highlight.js 10.1.1 (93fd0d73)

3− License: BSD-3-Clause

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,"&").replace(/</g,"<").replace(/>/g,">").replace(/"/g,""").replace(/'/g,"'")}function r(e,...n){var t={};for(const n in e)t[n]=e[n];return n.forEach((function(e){for(const n in e)t[n]=e[n]})),t}function a(e){return e.nodeName.toLowerCase()}var i=Object.freeze({__proto__:null,escapeHTML:t,inherit:r,nodeStream:function(e){var n=[];return function e(t,r){for(var i=t.firstChild;i;i=i.nextSibling)3===i.nodeType?r+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:r,node:i}),r=e(i,r),a(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:r,node:i}));return r}(e,0),n},mergeStreams:function(e,n,r){var i=0,s="",o=[];function l(){return e.length&&n.length?e[0].offset!==n[0].offset?e[0].offset<n[0].offset?e:n:"start"===n[0].event?e:n:e.length?e:n}function c(e){s+="<"+a(e)+[].map.call(e.attributes,(function(e){return" "+e.nodeName+'="'+t(e.value)+'"'})).join("")+">"}function u(e){s+="</"+a(e)+">"}function d(e){("start"===e.event?c:u)(e.node)}for(;e.length||n.length;){var g=l();if(s+=t(r.substring(i,g[0].offset)),i=g[0].offset,g===e){o.reverse().forEach(u);do{d(g.splice(0,1)[0]),g=l()}while(g===e&&g.length&&g[0].offset===i);o.reverse().forEach(c)}else"start"===g[0].event?o.push(g[0].node):o.pop(),d(g.splice(0,1)[0])}return s+t(r.substr(i))}});const s="</span>",o=e=>!!e.kind;class l{constructor(e,n){this.buffer="",this.classPrefix=n.classPrefix,e.walk(this)}addText(e){this.buffer+=t(e)}openNode(e){if(!o(e))return;let n=e.kind;e.sublanguage||(n=`${this.classPrefix}${n}`),this.span(n)}closeNode(e){o(e)&&(this.buffer+=s)}value(){return this.buffer}span(e){this.buffer+=`<span class="${e}">`}}class c{constructor(){this.rootNode={children:[]},this.stack=[this.rootNode]}get top(){return this.stack[this.stack.length-1]}get root(){return this.rootNode}add(e){this.top.children.push(e)}openNode(e){const n={kind:e,children:[]};this.add(n),this.stack.push(n)}closeNode(){if(this.stack.length>1)return this.stack.pop()}closeAllNodes(){for(;this.closeNode(););}toJSON(){return JSON.stringify(this.rootNode,null,4)}walk(e){return this.constructor._walk(e,this.rootNode)}static _walk(e,n){return"string"==typeof n?e.addText(n):n.children&&(e.openNode(n),n.children.forEach(n=>this._walk(e,n)),e.closeNode(n)),e}static _collapse(e){"string"!=typeof e&&e.children&&(e.children.every(e=>"string"==typeof e)?e.children=[e.children.join("")]:e.children.forEach(e=>{c._collapse(e)}))}}class u extends c{constructor(e){super(),this.options=e}addKeyword(e,n){""!==e&&(this.openNode(n),this.addText(e),this.closeNode())}addText(e){""!==e&&this.add(e)}addSublanguage(e,n){const t=e.root;t.kind=n,t.sublanguage=!0,this.add(t)}toHTML(){return new l(this,this.options).value()}finalize(){return!0}}function d(e){return e?"string"==typeof e?e:e.source:null}const g="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",h={begin:"\\\\[\\s\\S]",relevance:0},f={className:"string",begin:"'",end:"'",illegal:"\\n",contains:[h]},p={className:"string",begin:'"',end:'"',illegal:"\\n",contains:[h]},b={begin:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/},m=function(e,n,t={}){var a=r({className:"comment",begin:e,end:n,contains:[]},t);return a.contains.push(b),a.contains.push({className:"doctag",begin:"(?:TODO|FIXME|NOTE|BUG|OPTIMIZE|HACK|XXX):",relevance:0}),a},v=m("//","$"),x=m("/\\*","\\*/"),E=m("#","$");var _=Object.freeze({__proto__:null,IDENT_RE:"[a-zA-Z]\\w*",UNDERSCORE_IDENT_RE:"[a-zA-Z_]\\w*",NUMBER_RE:"\\b\\d+(\\.\\d+)?",C_NUMBER_RE:g,BINARY_NUMBER_RE:"\\b(0b[01]+)",RE_STARTERS_RE:"!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",SHEBANG:(e={})=>{const n=/^#![ ]*\//;return e.binary&&(e.begin=function(...e){return e.map(e=>d(e)).join("")}(n,/.*\b/,e.binary,/\b.*/)),r({className:"meta",begin:n,end:/$/,relevance:0,"on:begin":(e,n)=>{0!==e.index&&n.ignoreMatch()}},e)},BACKSLASH_ESCAPE:h,APOS_STRING_MODE:f,QUOTE_STRING_MODE:p,PHRASAL_WORDS_MODE:b,COMMENT:m,C_LINE_COMMENT_MODE:v,C_BLOCK_COMMENT_MODE:x,HASH_COMMENT_MODE:E,NUMBER_MODE:{className:"number",begin:"\\b\\d+(\\.\\d+)?",relevance:0},C_NUMBER_MODE:{className:"number",begin:g,relevance:0},BINARY_NUMBER_MODE:{className:"number",begin:"\\b(0b[01]+)",relevance:0},CSS_NUMBER_MODE:{className:"number",begin:"\\b\\d+(\\.\\d+)?(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",relevance:0},REGEXP_MODE:{begin:/(?=\/[^/\n]*\/)/,contains:[{className:"regexp",begin:/\//,end:/\/[gimuy]*/,illegal:/\n/,contains:[h,{begin:/\[/,end:/\]/,relevance:0,contains:[h]}]}]},TITLE_MODE:{className:"title",begin:"[a-zA-Z]\\w*",relevance:0},UNDERSCORE_TITLE_MODE:{className:"title",begin:"[a-zA-Z_]\\w*",relevance:0},METHOD_GUARD:{begin:"\\.\\s*[a-zA-Z_]\\w*",relevance:0},END_SAME_AS_BEGIN:function(e){return Object.assign(e,{"on:begin":(e,n)=>{n.data._beginMatch=e[1]},"on:end":(e,n)=>{n.data._beginMatch!==e[1]&&n.ignoreMatch()}})}}),N="of and for in not or if then".split(" ");function w(e,n){return n?+n:function(e){return N.includes(e.toLowerCase())}(e)?0:1}const R=t,y=r,{nodeStream:k,mergeStreams:O}=i,M=Symbol("nomatch");return function(t){var a=[],i={},s={},o=[],l=!0,c=/(^(<[^>]+>|\t|)+|\n)/gm,g="Could not find the language '{}', did you forget to load/include a language module?";const h={disableAutodetect:!0,name:"Plain text",contains:[]};var f={noHighlightRe:/^(no-?highlight)$/i,languageDetectRe:/\blang(?:uage)?-([\w-]+)\b/i,classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:null,__emitter:u};function p(e){return f.noHighlightRe.test(e)}function b(e,n,t,r){var a={code:n,language:e};S("before:highlight",a);var i=a.result?a.result:m(a.language,a.code,t,r);return i.code=a.code,S("after:highlight",i),i}function m(e,t,a,s){var o=t;function c(e,n){var t=E.case_insensitive?n[0].toLowerCase():n[0];return Object.prototype.hasOwnProperty.call(e.keywords,t)&&e.keywords[t]}function u(){null!=y.subLanguage?function(){if(""!==A){var e=null;if("string"==typeof y.subLanguage){if(!i[y.subLanguage])return void O.addText(A);e=m(y.subLanguage,A,!0,k[y.subLanguage]),k[y.subLanguage]=e.top}else e=v(A,y.subLanguage.length?y.subLanguage:null);y.relevance>0&&(I+=e.relevance),O.addSublanguage(e.emitter,e.language)}}():function(){if(!y.keywords)return void O.addText(A);let e=0;y.keywordPatternRe.lastIndex=0;let n=y.keywordPatternRe.exec(A),t="";for(;n;){t+=A.substring(e,n.index);const r=c(y,n);if(r){const[e,a]=r;O.addText(t),t="",I+=a,O.addKeyword(n[0],e)}else t+=n[0];e=y.keywordPatternRe.lastIndex,n=y.keywordPatternRe.exec(A)}t+=A.substr(e),O.addText(t)}(),A=""}function h(e){return e.className&&O.openNode(e.className),y=Object.create(e,{parent:{value:y}})}function p(e){return 0===y.matcher.regexIndex?(A+=e[0],1):(L=!0,0)}var b={};function x(t,r){var i=r&&r[0];if(A+=t,null==i)return u(),0;if("begin"===b.type&&"end"===r.type&&b.index===r.index&&""===i){if(A+=o.slice(r.index,r.index+1),!l){const n=Error("0 width match regex");throw n.languageName=e,n.badRule=b.rule,n}return 1}if(b=r,"begin"===r.type)return function(e){var t=e[0],r=e.rule;const a=new n(r),i=[r.__beforeBegin,r["on:begin"]];for(const n of i)if(n&&(n(e,a),a.ignore))return p(t);return r&&r.endSameAsBegin&&(r.endRe=RegExp(t.replace(/[-/\\^$*+?.()|[\]{}]/g,"\\$&"),"m")),r.skip?A+=t:(r.excludeBegin&&(A+=t),u(),r.returnBegin||r.excludeBegin||(A=t)),h(r),r.returnBegin?0:t.length}(r);if("illegal"===r.type&&!a){const e=Error('Illegal lexeme "'+i+'" for mode "'+(y.className||"<unnamed>")+'"');throw e.mode=y,e}if("end"===r.type){var s=function(e){var t=e[0],r=o.substr(e.index),a=function e(t,r,a){let i=function(e,n){var t=e&&e.exec(n);return t&&0===t.index}(t.endRe,a);if(i){if(t["on:end"]){const e=new n(t);t["on:end"](r,e),e.ignore&&(i=!1)}if(i){for(;t.endsParent&&t.parent;)t=t.parent;return t}}if(t.endsWithParent)return e(t.parent,r,a)}(y,e,r);if(!a)return M;var i=y;i.skip?A+=t:(i.returnEnd||i.excludeEnd||(A+=t),u(),i.excludeEnd&&(A=t));do{y.className&&O.closeNode(),y.skip||y.subLanguage||(I+=y.relevance),y=y.parent}while(y!==a.parent);return a.starts&&(a.endSameAsBegin&&(a.starts.endRe=a.endRe),h(a.starts)),i.returnEnd?0:t.length}(r);if(s!==M)return s}if("illegal"===r.type&&""===i)return 1;if(B>1e5&&B>3*r.index)throw Error("potential infinite loop, way more iterations than matches");return A+=i,i.length}var E=T(e);if(!E)throw console.error(g.replace("{}",e)),Error('Unknown language: "'+e+'"');var _=function(e){function n(n,t){return RegExp(d(n),"m"+(e.case_insensitive?"i":"")+(t?"g":""))}class t{constructor(){this.matchIndexes={},this.regexes=[],this.matchAt=1,this.position=0}addRule(e,n){n.position=this.position++,this.matchIndexes[this.matchAt]=n,this.regexes.push([n,e]),this.matchAt+=function(e){return RegExp(e.toString()+"|").exec("").length-1}(e)+1}compile(){0===this.regexes.length&&(this.exec=()=>null);const e=this.regexes.map(e=>e[1]);this.matcherRe=n(function(e,n="|"){for(var t=/\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./,r=0,a="",i=0;i<e.length;i++){var s=r+=1,o=d(e[i]);for(i>0&&(a+=n),a+="(";o.length>0;){var l=t.exec(o);if(null==l){a+=o;break}a+=o.substring(0,l.index),o=o.substring(l.index+l[0].length),"\\"===l[0][0]&&l[1]?a+="\\"+(+l[1]+s):(a+=l[0],"("===l[0]&&r++)}a+=")"}return a}(e),!0),this.lastIndex=0}exec(e){this.matcherRe.lastIndex=this.lastIndex;const n=this.matcherRe.exec(e);if(!n)return null;const t=n.findIndex((e,n)=>n>0&&void 0!==e),r=this.matchIndexes[t];return n.splice(0,t),Object.assign(n,r)}}class a{constructor(){this.rules=[],this.multiRegexes=[],this.count=0,this.lastIndex=0,this.regexIndex=0}getMatcher(e){if(this.multiRegexes[e])return this.multiRegexes[e];const n=new t;return this.rules.slice(e).forEach(([e,t])=>n.addRule(e,t)),n.compile(),this.multiRegexes[e]=n,n}considerAll(){this.regexIndex=0}addRule(e,n){this.rules.push([e,n]),"begin"===n.type&&this.count++}exec(e){const n=this.getMatcher(this.regexIndex);n.lastIndex=this.lastIndex;const t=n.exec(e);return t&&(this.regexIndex+=t.position+1,this.regexIndex===this.count&&(this.regexIndex=0)),t}}function i(e,n){const t=e.input[e.index-1],r=e.input[e.index+e[0].length];"."!==t&&"."!==r||n.ignoreMatch()}if(e.contains&&e.contains.includes("self"))throw Error("ERR: contains `self` is not supported at the top-level of a language. See documentation.");return function t(s,o){const l=s;if(s.compiled)return l;s.compiled=!0,s.__beforeBegin=null,s.keywords=s.keywords||s.beginKeywords;let c=null;if("object"==typeof s.keywords&&(c=s.keywords.$pattern,delete s.keywords.$pattern),s.keywords&&(s.keywords=function(e,n){var t={};return"string"==typeof e?r("keyword",e):Object.keys(e).forEach((function(n){r(n,e[n])})),t;function r(e,r){n&&(r=r.toLowerCase()),r.split(" ").forEach((function(n){var r=n.split("|");t[r[0]]=[e,w(r[0],r[1])]}))}}(s.keywords,e.case_insensitive)),s.lexemes&&c)throw Error("ERR: Prefer `keywords.$pattern` to `mode.lexemes`, BOTH are not allowed. (see mode reference) ");return l.keywordPatternRe=n(s.lexemes||c||/\w+/,!0),o&&(s.beginKeywords&&(s.begin="\\b("+s.beginKeywords.split(" ").join("|")+")(?=\\b|\\s)",s.__beforeBegin=i),s.begin||(s.begin=/\B|\b/),l.beginRe=n(s.begin),s.endSameAsBegin&&(s.end=s.begin),s.end||s.endsWithParent||(s.end=/\B|\b/),s.end&&(l.endRe=n(s.end)),l.terminator_end=d(s.end)||"",s.endsWithParent&&o.terminator_end&&(l.terminator_end+=(s.end?"|":"")+o.terminator_end)),s.illegal&&(l.illegalRe=n(s.illegal)),void 0===s.relevance&&(s.relevance=1),s.contains||(s.contains=[]),s.contains=[].concat(...s.contains.map((function(e){return function(e){return e.variants&&!e.cached_variants&&(e.cached_variants=e.variants.map((function(n){return r(e,{variants:null},n)}))),e.cached_variants?e.cached_variants:function e(n){return!!n&&(n.endsWithParent||e(n.starts))}(e)?r(e,{starts:e.starts?r(e.starts):null}):Object.isFrozen(e)?r(e):e}("self"===e?s:e)}))),s.contains.forEach((function(e){t(e,l)})),s.starts&&t(s.starts,o),l.matcher=function(e){const n=new a;return e.contains.forEach(e=>n.addRule(e.begin,{rule:e,type:"begin"})),e.terminator_end&&n.addRule(e.terminator_end,{type:"end"}),e.illegal&&n.addRule(e.illegal,{type:"illegal"}),n}(l),l}(e)}(E),N="",y=s||_,k={},O=new f.__emitter(f);!function(){for(var e=[],n=y;n!==E;n=n.parent)n.className&&e.unshift(n.className);e.forEach(e=>O.openNode(e))}();var A="",I=0,S=0,B=0,L=!1;try{for(y.matcher.considerAll();;){B++,L?L=!1:(y.matcher.lastIndex=S,y.matcher.considerAll());const e=y.matcher.exec(o);if(!e)break;const n=x(o.substring(S,e.index),e);S=e.index+n}return x(o.substr(S)),O.closeAllNodes(),O.finalize(),N=O.toHTML(),{relevance:I,value:N,language:e,illegal:!1,emitter:O,top:y}}catch(n){if(n.message&&n.message.includes("Illegal"))return{illegal:!0,illegalBy:{msg:n.message,context:o.slice(S-100,S+100),mode:n.mode},sofar:N,relevance:0,value:R(o),emitter:O};if(l)return{illegal:!1,relevance:0,value:R(o),emitter:O,language:e,top:y,errorRaised:n};throw n}}function v(e,n){n=n||f.languages||Object.keys(i);var t=function(e){const n={relevance:0,emitter:new f.__emitter(f),value:R(e),illegal:!1,top:h};return n.emitter.addText(e),n}(e),r=t;return n.filter(T).filter(I).forEach((function(n){var a=m(n,e,!1);a.language=n,a.relevance>r.relevance&&(r=a),a.relevance>t.relevance&&(r=t,t=a)})),r.language&&(t.second_best=r),t}function x(e){return f.tabReplace||f.useBR?e.replace(c,e=>"\n"===e?f.useBR?"<br>":e:f.tabReplace?e.replace(/\t/g,f.tabReplace):e):e}function E(e){let n=null;const t=function(e){var n=e.className+" ";n+=e.parentNode?e.parentNode.className:"";const t=f.languageDetectRe.exec(n);if(t){var r=T(t[1]);return r||(console.warn(g.replace("{}",t[1])),console.warn("Falling back to no-highlight mode for this block.",e)),r?t[1]:"no-highlight"}return n.split(/\s+/).find(e=>p(e)||T(e))}(e);if(p(t))return;S("before:highlightBlock",{block:e,language:t}),f.useBR?(n=document.createElement("div")).innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ /]*>/g,"\n"):n=e;const r=n.textContent,a=t?b(t,r,!0):v(r),i=k(n);if(i.length){const e=document.createElement("div");e.innerHTML=a.value,a.value=O(i,k(e),r)}a.value=x(a.value),S("after:highlightBlock",{block:e,result:a}),e.innerHTML=a.value,e.className=function(e,n,t){var r=n?s[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),e.includes(r)||a.push(r),a.join(" ").trim()}(e.className,t,a.language),e.result={language:a.language,re:a.relevance,relavance:a.relevance},a.second_best&&(e.second_best={language:a.second_best.language,re:a.second_best.relevance,relavance:a.second_best.relevance})}const N=()=>{if(!N.called){N.called=!0;var e=document.querySelectorAll("pre code");a.forEach.call(e,E)}};function T(e){return e=(e||"").toLowerCase(),i[e]||i[s[e]]}function A(e,{languageName:n}){"string"==typeof e&&(e=[e]),e.forEach(e=>{s[e]=n})}function I(e){var n=T(e);return n&&!n.disableAutodetect}function S(e,n){var t=e;o.forEach((function(e){e[t]&&e[t](n)}))}Object.assign(t,{highlight:b,highlightAuto:v,fixMarkup:x,highlightBlock:E,configure:function(e){f=y(f,e)},initHighlighting:N,initHighlightingOnLoad:function(){window.addEventListener("DOMContentLoaded",N,!1)},registerLanguage:function(e,n){var r=null;try{r=n(t)}catch(n){if(console.error("Language definition for '{}' could not be registered.".replace("{}",e)),!l)throw n;console.error(n),r=h}r.name||(r.name=e),i[e]=r,r.rawDefinition=n.bind(null,t),r.aliases&&A(r.aliases,{languageName:e})},listLanguages:function(){return Object.keys(i)},getLanguage:T,registerAliases:A,requireLanguage:function(e){var n=T(e);if(n)return n;throw Error("The '{}' language is required, but not loaded.".replace("{}",e))},autoDetection:I,inherit:y,addPlugin:function(e){o.push(e)}}),t.debugMode=function(){l=!1},t.safeMode=function(){l=!0},t.versionString="10.1.1";for(const n in _)"object"==typeof _[n]&&e(_[n]);return Object.assign(t,_),t}({})}();"object"==typeof exports&&"undefined"!=typeof module&&(module.exports=hljs);hljs.registerLanguage("php",function(){"use strict";return function(e){var r={begin:"\\$+[a-zA-Z_-ÿ][a-zA-Z0-9_-ÿ]*"},t={className:"meta",variants:[{begin:/<\?php/,relevance:10},{begin:/<\?[=]?/},{begin:/\?>/}]},a={className:"string",contains:[e.BACKSLASH_ESCAPE,t],variants:[{begin:'b"',end:'"'},{begin:"b'",end:"'"},e.inherit(e.APOS_STRING_MODE,{illegal:null}),e.inherit(e.QUOTE_STRING_MODE,{illegal:null})]},n={variants:[e.BINARY_NUMBER_MODE,e.C_NUMBER_MODE]},i={keyword:"__CLASS__ __DIR__ __FILE__ __FUNCTION__ __LINE__ __METHOD__ __NAMESPACE__ __TRAIT__ die echo exit include include_once print require require_once array abstract and as binary bool boolean break callable case catch class clone const continue declare default do double else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval extends final finally float for foreach from global goto if implements instanceof insteadof int integer interface isset iterable list new object or private protected public real return string switch throw trait try unset use var void while xor yield",literal:"false null true",built_in:"Error|0 AppendIterator ArgumentCountError ArithmeticError ArrayIterator ArrayObject AssertionError BadFunctionCallException BadMethodCallException CachingIterator CallbackFilterIterator CompileError Countable DirectoryIterator DivisionByZeroError DomainException EmptyIterator ErrorException Exception FilesystemIterator FilterIterator GlobIterator InfiniteIterator InvalidArgumentException IteratorIterator LengthException LimitIterator LogicException MultipleIterator NoRewindIterator OutOfBoundsException OutOfRangeException OuterIterator OverflowException ParentIterator ParseError RangeException RecursiveArrayIterator RecursiveCachingIterator RecursiveCallbackFilterIterator RecursiveDirectoryIterator RecursiveFilterIterator RecursiveIterator RecursiveIteratorIterator RecursiveRegexIterator RecursiveTreeIterator RegexIterator RuntimeException SeekableIterator SplDoublyLinkedList SplFileInfo SplFileObject SplFixedArray SplHeap SplMaxHeap SplMinHeap SplObjectStorage SplObserver SplObserver SplPriorityQueue SplQueue SplStack SplSubject SplSubject SplTempFileObject TypeError UnderflowException UnexpectedValueException ArrayAccess Closure Generator Iterator IteratorAggregate Serializable Throwable Traversable WeakReference Directory __PHP_Incomplete_Class parent php_user_filter self static stdClass"};return{aliases:["php","php3","php4","php5","php6","php7"],case_insensitive:!0,keywords:i,contains:[e.HASH_COMMENT_MODE,e.COMMENT("//","$",{contains:[t]}),e.COMMENT("/\\*","\\*/",{contains:[{className:"doctag",begin:"@[A-Za-z]+"}]}),e.COMMENT("__halt_compiler.+?;",!1,{endsWithParent:!0,keywords:"__halt_compiler"}),{className:"string",begin:/<<<['"]?\w+['"]?$/,end:/^\w+;?$/,contains:[e.BACKSLASH_ESCAPE,{className:"subst",variants:[{begin:/\$\w+/},{begin:/\{\$/,end:/\}/}]}]},t,{className:"keyword",begin:/\$this\b/},r,{begin:/(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/},{className:"function",beginKeywords:"fn function",end:/[;{]/,excludeEnd:!0,illegal:"[$%\\[]",contains:[e.UNDERSCORE_TITLE_MODE,{className:"params",begin:"\$",end:"\$",excludeBegin:!0,excludeEnd:!0,keywords:i,contains:["self",r,e.C_BLOCK_COMMENT_MODE,a,n]}]},{className:"class",beginKeywords:"class interface",end:"{",excludeEnd:!0,illegal:/[:\(\$"]/,contains:[{beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"namespace",end:";",illegal:/[\.']/,contains:[e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"use",end:";",contains:[e.UNDERSCORE_TITLE_MODE]},{begin:"=>"},a,n]}}}());hljs.registerLanguage("nginx",function(){"use strict";return function(e){var n={className:"variable",variants:[{begin:/\$\d+/},{begin:/\$\{/,end:/}/},{begin:"[\\$\\@]"+e.UNDERSCORE_IDENT_RE}]},a={endsWithParent:!0,keywords:{$pattern:"[a-z/_]+",literal:"on off yes no true false none blocked debug info notice warn error crit select break last permanent redirect kqueue rtsig epoll poll /dev/poll"},relevance:0,illegal:"=>",contains:[e.HASH_COMMENT_MODE,{className:"string",contains:[e.BACKSLASH_ESCAPE,n],variants:[{begin:/"/,end:/"/},{begin:/'/,end:/'/}]},{begin:"([a-z]+):/",end:"\\s",endsWithParent:!0,excludeEnd:!0,contains:[n]},{className:"regexp",contains:[e.BACKSLASH_ESCAPE,n],variants:[{begin:"\\s\\^",end:"\\s|{|;",returnEnd:!0},{begin:"~\\*?\\s+",end:"\\s|{|;",returnEnd:!0},{begin:"\\*(\\.[a-z\\-]+)+"},{begin:"([a-z\\-]+\\.)+\\*"}]},{className:"number",begin:"\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?\\b"},{className:"number",begin:"\\b\\d+[kKmMgGdshdwy]*\\b",relevance:0},n]};return{name:"Nginx config",aliases:["nginxconf"],contains:[e.HASH_COMMENT_MODE,{begin:e.UNDERSCORE_IDENT_RE+"\\s+{",returnBegin:!0,end:"{",contains:[{className:"section",begin:e.UNDERSCORE_IDENT_RE}],relevance:0},{begin:e.UNDERSCORE_IDENT_RE+"\\s",end:";|{",returnBegin:!0,contains:[{className:"attribute",begin:e.UNDERSCORE_IDENT_RE,starts:a}],relevance:0}],illegal:"[^\\s\\}]"}}}());hljs.registerLanguage("csharp",function(){"use strict";return function(e){var n={keyword:"abstract as base bool break byte case catch char checked const continue decimal default delegate do double enum event explicit extern finally fixed float for foreach goto if implicit in int interface internal is lock long object operator out override params private protected public readonly ref sbyte sealed short sizeof stackalloc static string struct switch this try typeof uint ulong unchecked unsafe ushort using virtual void volatile while add alias ascending async await by descending dynamic equals from get global group into join let nameof on orderby partial remove select set value var when where yield",literal:"null false true"},i=e.inherit(e.TITLE_MODE,{begin:"[a-zA-Z](\\.?\\w)*"}),a={className:"number",variants:[{begin:"\\b(0b[01']+)"},{begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"},{begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"}],relevance:0},s={className:"string",begin:'@"',end:'"',contains:[{begin:'""'}]},t=e.inherit(s,{illegal:/\n/}),l={className:"subst",begin:"{",end:"}",keywords:n},r=e.inherit(l,{illegal:/\n/}),c={className:"string",begin:/\$"/,end:'"',illegal:/\n/,contains:[{begin:"{{"},{begin:"}}"},e.BACKSLASH_ESCAPE,r]},o={className:"string",begin:/\$@"/,end:'"',contains:[{begin:"{{"},{begin:"}}"},{begin:'""'},l]},g=e.inherit(o,{illegal:/\n/,contains:[{begin:"{{"},{begin:"}}"},{begin:'""'},r]});l.contains=[o,c,s,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,a,e.C_BLOCK_COMMENT_MODE],r.contains=[g,c,t,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,a,e.inherit(e.C_BLOCK_COMMENT_MODE,{illegal:/\n/})];var d={variants:[o,c,s,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},E={begin:"<",end:">",contains:[{beginKeywords:"in out"},i]},_=e.IDENT_RE+"(<"+e.IDENT_RE+"(\\s*,\\s*"+e.IDENT_RE+")*>)?(\\[\\])?",b={begin:"@"+e.IDENT_RE,relevance:0};return{name:"C#",aliases:["cs","c#"],keywords:n,illegal:/::/,contains:[e.COMMENT("///","$",{returnBegin:!0,contains:[{className:"doctag",variants:[{begin:"///",relevance:0},{begin:"\x3c!--|--\x3e"},{begin:"</?",end:">"}]}]}),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"meta",begin:"#",end:"$",keywords:{"meta-keyword":"if else elif endif define undef warning error line region endregion pragma checksum"}},d,a,{beginKeywords:"class interface",end:/[{;=]/,illegal:/[^\s:,]/,contains:[{beginKeywords:"where class"},i,E,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{beginKeywords:"namespace",end:/[{;=]/,illegal:/[^\s:]/,contains:[i,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{className:"meta",begin:"^\\s*\\[",excludeBegin:!0,end:"\\]",excludeEnd:!0,contains:[{className:"meta-string",begin:/"/,end:/"/}]},{beginKeywords:"new return throw await else",relevance:0},{className:"function",begin:"("+_+"\\s+)+"+e.IDENT_RE+"\\s*(\\<.+\\>)?\\s*\$",returnBegin:!0,end:/\s*[{;=]/,excludeEnd:!0,keywords:n,contains:[{begin:e.IDENT_RE+"\\s*(\\<.+\\>)?\\s*\\(",returnBegin:!0,contains:[e.TITLE_MODE,E],relevance:0},{className:"params",begin:/\(/,end:/$/,excludeBegin:!0,excludeEnd:!0,keywords:n,relevance:0,contains:[d,a,e.C_BLOCK_COMMENT_MODE]},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},b]}}}());hljs.registerLanguage("perl",function(){"use strict";return function(e){var n={$pattern:/[\w.]+/,keyword:"getpwent getservent quotemeta msgrcv scalar kill dbmclose undef lc ma syswrite tr send umask sysopen shmwrite vec qx utime local oct semctl localtime readpipe do return format read sprintf dbmopen pop getpgrp not getpwnam rewinddir qq fileno qw endprotoent wait sethostent bless s|0 opendir continue each sleep endgrent shutdown dump chomp connect getsockname die socketpair close flock exists index shmget sub for endpwent redo lstat msgctl setpgrp abs exit select print ref gethostbyaddr unshift fcntl syscall goto getnetbyaddr join gmtime symlink semget splice x|0 getpeername recv log setsockopt cos last reverse gethostbyname getgrnam study formline endhostent times chop length gethostent getnetent pack getprotoent getservbyname rand mkdir pos chmod y|0 substr endnetent printf next open msgsnd readdir use unlink getsockopt getpriority rindex wantarray hex system getservbyport endservent int chr untie rmdir prototype tell listen fork shmread ucfirst setprotoent else sysseek link getgrgid shmctl waitpid unpack getnetbyname reset chdir grep split require caller lcfirst until warn while values shift telldir getpwuid my getprotobynumber delete and sort uc defined srand accept package seekdir getprotobyname semop our rename seek if q|0 chroot sysread setpwent no crypt getc chown sqrt write setnetent setpriority foreach tie sin msgget map stat getlogin unless elsif truncate exec keys glob tied closedir ioctl socket readlink eval xor readline binmode setservent eof ord bind alarm pipe atan2 getgrent exp time push setgrent gt lt or ne m|0 break given say state when"},t={className:"subst",begin:"[$@]\\{",end:"\\}",keywords:n},s={begin:"->{",end:"}"},r={variants:[{begin:/\$\d/},{begin:/[\$%@](\^\w\b|#\w+(::\w+)*|{\w+}|\w+(::\w*)*)/},{begin:/[\$%@][^\s\w{]/,relevance:0}]},i=[e.BACKSLASH_ESCAPE,t,r],a=[r,e.HASH_COMMENT_MODE,e.COMMENT("^\\=\\w","\\=cut",{endsWithParent:!0}),s,{className:"string",contains:i,variants:[{begin:"q[qwxr]?\\s*\$",end:"\$",relevance:5},{begin:"q[qwxr]?\\s*\\[",end:"\\]",relevance:5},{begin:"q[qwxr]?\\s*\\{",end:"\\}",relevance:5},{begin:"q[qwxr]?\\s*\\|",end:"\\|",relevance:5},{begin:"q[qwxr]?\\s*\\<",end:"\\>",relevance:5},{begin:"qw\\s+q",end:"q",relevance:5},{begin:"'",end:"'",contains:[e.BACKSLASH_ESCAPE]},{begin:'"',end:'"'},{begin:"`",end:"`",contains:[e.BACKSLASH_ESCAPE]},{begin:"{\\w+}",contains:[],relevance:0},{begin:"-?\\w+\\s*\\=\\>",contains:[],relevance:0}]},{className:"number",begin:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},{begin:"(\\/\\/|"+e.RE_STARTERS_RE+"|\\b(split|return|print|reverse|grep)\\b)\\s*",keywords:"split return print reverse grep",relevance:0,contains:[e.HASH_COMMENT_MODE,{className:"regexp",begin:"(s|tr|y)/(\\\\.|[^/])*/(\\\\.|[^/])*/[a-z]*",relevance:10},{className:"regexp",begin:"(m|qr)?/",end:"/[a-z]*",contains:[e.BACKSLASH_ESCAPE],relevance:0}]},{className:"function",beginKeywords:"sub",end:"(\\s*\$.*?\$)?[;{]",excludeEnd:!0,relevance:5,contains:[e.TITLE_MODE]},{begin:"-\\w\\b",relevance:0},{begin:"^__DATA__$",end:"^__END__$",subLanguage:"mojolicious",contains:[{begin:"^@@.*",end:"$",className:"comment"}]}];return t.contains=a,s.contains=a,{name:"Perl",aliases:["pl","pm"],keywords:n,contains:a}}}());hljs.registerLanguage("swift",function(){"use strict";return function(e){var i={keyword:"#available #colorLiteral #column #else #elseif #endif #file #fileLiteral #function #if #imageLiteral #line #selector #sourceLocation _ __COLUMN__ __FILE__ __FUNCTION__ __LINE__ Any as as! as? associatedtype associativity break case catch class continue convenience default defer deinit didSet do dynamic dynamicType else enum extension fallthrough false fileprivate final for func get guard if import in indirect infix init inout internal is lazy left let mutating nil none nonmutating open operator optional override postfix precedence prefix private protocol Protocol public repeat required rethrows return right self Self set static struct subscript super switch throw throws true try try! try? Type typealias unowned var weak where while willSet",literal:"true false nil",built_in:"abs advance alignof alignofValue anyGenerator assert assertionFailure bridgeFromObjectiveC bridgeFromObjectiveCUnconditional bridgeToObjectiveC bridgeToObjectiveCUnconditional c compactMap contains count countElements countLeadingZeros debugPrint debugPrintln distance dropFirst dropLast dump encodeBitsAsWords enumerate equal fatalError filter find getBridgedObjectiveCType getVaList indices insertionSort isBridgedToObjectiveC isBridgedVerbatimToObjectiveC isUniquelyReferenced isUniquelyReferencedNonObjC join lazy lexicographicalCompare map max maxElement min minElement numericCast overlaps partition posix precondition preconditionFailure print println quickSort readLine reduce reflect reinterpretCast reverse roundUpToAlignment sizeof sizeofValue sort split startsWith stride strideof strideofValue swap toString transcode underestimateCount unsafeAddressOf unsafeBitCast unsafeDowncast unsafeUnwrap unsafeReflect withExtendedLifetime withObjectAtPlusZero withUnsafePointer withUnsafePointerToObject withUnsafeMutablePointer withUnsafeMutablePointers withUnsafePointer withUnsafePointers withVaList zip"},n=e.COMMENT("/\\*","\\*/",{contains:["self"]}),t={className:"subst",begin:/\\$/,end:"\$",keywords:i,contains:[]},a={className:"string",contains:[e.BACKSLASH_ESCAPE,t],variants:[{begin:/"""/,end:/"""/},{begin:/"/,end:/"/}]},r={className:"number",begin:"\\b([\\d_]+(\\.[\\deE_]+)?|0x[a-fA-F0-9_]+(\\.[a-fA-F0-9p_]+)?|0b[01_]+|0o[0-7_]+)\\b",relevance:0};return t.contains=[r],{name:"Swift",keywords:i,contains:[a,e.C_LINE_COMMENT_MODE,n,{className:"type",begin:"\\b[A-Z][\\wÀ-ʸ']*[!?]"},{className:"type",begin:"\\b[A-Z][\\wÀ-ʸ']*",relevance:0},r,{className:"function",beginKeywords:"func",end:"{",excludeEnd:!0,contains:[e.inherit(e.TITLE_MODE,{begin:/[A-Za-z$_][0-9A-Za-z$_]*/}),{begin:/</,end:/>/},{className:"params",begin:/$/,end:/$/,endsParent:!0,keywords:i,contains:["self",r,a,e.C_BLOCK_COMMENT_MODE,{begin:":"}],illegal:/["']/}],illegal:/\[|%/},{className:"class",beginKeywords:"struct protocol class extension enum",keywords:i,end:"\\{",excludeEnd:!0,contains:[e.inherit(e.TITLE_MODE,{begin:/[A-Za-z$_][\u00C0-\u02B80-9A-Za-z$_]*/})]},{className:"meta",begin:"(@discardableResult|@warn_unused_result|@exported|@lazy|@noescape|@NSCopying|@NSManaged|@objc|@objcMembers|@convention|@required|@noreturn|@IBAction|@IBDesignable|@IBInspectable|@IBOutlet|@infix|@prefix|@postfix|@autoclosure|@testable|@available|@nonobjc|@NSApplicationMain|@UIApplicationMain|@dynamicMemberLookup|@propertyWrapper)\\b"},{beginKeywords:"import",end:/$/,contains:[e.C_LINE_COMMENT_MODE,n]}]}}}());hljs.registerLanguage("makefile",function(){"use strict";return function(e){var i={className:"variable",variants:[{begin:"\\$\$"+e.UNDERSCORE_IDENT_RE+"\$",contains:[e.BACKSLASH_ESCAPE]},{begin:/\$[@%<?\^\+\*]/}]},n={className:"string",begin:/"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,i]},a={className:"variable",begin:/\$$[\w-]+\s/,end:/$/,keywords:{built_in:"subst patsubst strip findstring filter filter-out sort word wordlist firstword lastword dir notdir suffix basename addsuffix addprefix join wildcard realpath abspath error warning shell origin flavor foreach if or and call eval file value"},contains:[i]},r={begin:"^"+e.UNDERSCORE_IDENT_RE+"\\s*(?=[:+?]?=)"},s={className:"section",begin:/^[^\s]+:/,end:/$/,contains:[i]};return{name:"Makefile",aliases:["mk","mak"],keywords:{$pattern:/[\w-]+/,keyword:"define endef undefine ifdef ifndef ifeq ifneq else endif include -include sinclude override export unexport private vpath"},contains:[e.HASH_COMMENT_MODE,i,n,a,r,{className:"meta",begin:/^\.PHONY:/,end:/$/,keywords:{$pattern:/[\.\w]+/,"meta-keyword":".PHONY"}},s]}}}());hljs.registerLanguage("css",function(){"use strict";return function(e){var n={begin:/(?:[A-Z\_\.\-]+|--[a-zA-Z0-9_-]+)\s*:/,returnBegin:!0,end:";",endsWithParent:!0,contains:[{className:"attribute",begin:/\S/,end:":",excludeEnd:!0,starts:{endsWithParent:!0,excludeEnd:!0,contains:[{begin:/[\w-]+$/,returnBegin:!0,contains:[{className:"built_in",begin:/[\w-]+/},{begin:/\(/,end:/$/,contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.CSS_NUMBER_MODE]}]},e.CSS_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,e.C_BLOCK_COMMENT_MODE,{className:"number",begin:"#[0-9A-Fa-f]+"},{className:"meta",begin:"!important"}]}}]};return{name:"CSS",case_insensitive:!0,illegal:/[=\/|'\$]/,contains:[e.C_BLOCK_COMMENT_MODE,{className:"selector-id",begin:/#[A-Za-z0-9_-]+/},{className:"selector-class",begin:/\.[A-Za-z0-9_-]+/},{className:"selector-attr",begin:/\[/,end:/\]/,illegal:"$",contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},{className:"selector-pseudo",begin:/:(:)?[a-zA-Z0-9\_\-\+"'.]+/},{begin:"@(page|font-face)",lexemes:"@[a-z-]+",keywords:"@page @font-face"},{begin:"@",end:"[{;]",illegal:/:/,returnBegin:!0,contains:[{className:"keyword",begin:/@\-?\w[\w]*(\-\w+)*/},{begin:/\s/,endsWithParent:!0,excludeEnd:!0,relevance:0,keywords:"and or not only",contains:[{begin:/[a-z-]+:/,className:"attribute"},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.CSS_NUMBER_MODE]}]},{className:"selector-tag",begin:"[a-zA-Z-][a-zA-Z0-9_-]*",relevance:0},{begin:"{",end:"}",illegal:/\S/,contains:[e.C_BLOCK_COMMENT_MODE,n]}]}}}());hljs.registerLanguage("xml",function(){"use strict";return function(e){var n={className:"symbol",begin:"&[a-z]+;|&#[0-9]+;|&#x[a-f0-9]+;"},a={begin:"\\s",contains:[{className:"meta-keyword",begin:"#?[a-z_][a-z1-9_-]+",illegal:"\\n"}]},s=e.inherit(a,{begin:"\$",end:"\$"}),t=e.inherit(e.APOS_STRING_MODE,{className:"meta-string"}),i=e.inherit(e.QUOTE_STRING_MODE,{className:"meta-string"}),c={endsWithParent:!0,illegal:/</,relevance:0,contains:[{className:"attr",begin:"[A-Za-z0-9\\._:-]+",relevance:0},{begin:/=\s*/,relevance:0,contains:[{className:"string",endsParent:!0,variants:[{begin:/"/,end:/"/,contains:[n]},{begin:/'/,end:/'/,contains:[n]},{begin:/[^\s"'=<>`]+/}]}]}]};return{name:"HTML, XML",aliases:["html","xhtml","rss","atom","xjb","xsd","xsl","plist","wsf","svg"],case_insensitive:!0,contains:[{className:"meta",begin:"<![a-z]",end:">",relevance:10,contains:[a,i,t,s,{begin:"\\[",end:"\\]",contains:[{className:"meta",begin:"<![a-z]",end:">",contains:[a,s,i,t]}]}]},e.COMMENT("\x3c!--","--\x3e",{relevance:10}),{begin:"<\\!\\[CDATA\\[",end:"\\]\\]>",relevance:10},n,{className:"meta",begin:/<\?xml/,end:/\?>/,relevance:10},{className:"tag",begin:"<style(?=\\s|>)",end:">",keywords:{name:"style"},contains:[c],starts:{end:"</style>",returnEnd:!0,subLanguage:["css","xml"]}},{className:"tag",begin:"<script(?=\\s|>)",end:">",keywords:{name:"script"},contains:[c],starts:{end:"<\/script>",returnEnd:!0,subLanguage:["javascript","handlebars","xml"]}},{className:"tag",begin:"</?",end:"/?>",contains:[{className:"name",begin:/[^\/><\s]+/,relevance:0},c]}]}}}());hljs.registerLanguage("bash",function(){"use strict";return function(e){const s={};Object.assign(s,{className:"variable",variants:[{begin:/\$[\w\d#@][\w\d_]*/},{begin:/\$\{/,end:/\}/,contains:[{begin:/:-/,contains:[s]}]}]});const t={className:"subst",begin:/\$$/,end:/$/,contains:[e.BACKSLASH_ESCAPE]},n={className:"string",begin:/"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,s,t]};t.contains.push(n);const a={begin:/\$$\(/,end:/$\)/,contains:[{begin:/\d+#[0-9a-f]+/,className:"number"},e.NUMBER_MODE,s]},i=e.SHEBANG({binary:"(fish|bash|zsh|sh|csh|ksh|tcsh|dash|scsh)",relevance:10}),c={className:"function",begin:/\w[\w\d_]*\s*$\s*$\s*\{/,returnBegin:!0,contains:[e.inherit(e.TITLE_MODE,{begin:/\w[\w\d_]*/})],relevance:0};return{name:"Bash",aliases:["sh","zsh"],keywords:{$pattern:/\b-?[a-z\._]+\b/,keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},contains:[i,e.SHEBANG(),c,a,e.HASH_COMMENT_MODE,n,{className:"",begin:/\\"/},{className:"string",begin:/'/,end:/'/},s]}}}());hljs.registerLanguage("c-like",function(){"use strict";return function(e){function t(e){return"(?:"+e+")?"}var n="(decltype\$auto\$|"+t("[a-zA-Z_]\\w*::")+"[a-zA-Z_]\\w*"+t("<.*?>")+")",r={className:"keyword",begin:"\\b[a-z\\d_]*_t\\b"},a={className:"string",variants:[{begin:'(u8?|U|L)?"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},{begin:"(u8?|U|L)?'(\\\$x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)|.)",end:"'",illegal:"."},e.END_SAME_AS_BEGIN({begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/$([^()\\ ]{0,16})"/})]},i={className:"number",variants:[{begin:"\\b(0b[01']+)"},{begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"},{begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"}],relevance:0},s={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{"meta-keyword":"if else elif endif define undef warning error line pragma _Pragma ifdef ifndef include"},contains:[{begin:/\\\n/,relevance:0},e.inherit(a,{className:"meta-string"}),{className:"meta-string",begin:/<.*?>/,end:/$/,illegal:"\\n"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},o={className:"title",begin:t("[a-zA-Z_]\\w*::")+e.IDENT_RE,relevance:0},c=t("[a-zA-Z_]\\w*::")+e.IDENT_RE+"\\s*\\(",l={keyword:"int float while private char char8_t char16_t char32_t catch import module export virtual operator sizeof dynamic_cast|10 typedef const_cast|10 const for static_cast|10 union namespace unsigned long volatile static protected bool template mutable if public friend do goto auto void enum else break extern using asm case typeid wchar_t short reinterpret_cast|10 default double register explicit signed typename try this switch continue inline delete alignas alignof constexpr consteval constinit decltype concept co_await co_return co_yield requires noexcept static_assert thread_local restrict final override atomic_bool atomic_char atomic_schar atomic_uchar atomic_short atomic_ushort atomic_int atomic_uint atomic_long atomic_ulong atomic_llong atomic_ullong new throw return and and_eq bitand bitor compl not not_eq or or_eq xor xor_eq",built_in:"std string wstring cin cout cerr clog stdin stdout stderr stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set pair bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap priority_queue make_pair array shared_ptr abort terminate abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf future isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc realloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf endl initializer_list unique_ptr _Bool complex _Complex imaginary _Imaginary",literal:"true false nullptr NULL"},d=[r,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,i,a],_={variants:[{begin:/=/,end:/;/},{begin:/$/,end:/$/},{beginKeywords:"new throw return else",end:/;/}],keywords:l,contains:d.concat([{begin:/$/,end:/$/,keywords:l,contains:d.concat(["self"]),relevance:0}]),relevance:0},u={className:"function",begin:"("+n+"[\\*&\\s]+)+"+c,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,keywords:l,illegal:/[^\w\s\*&:<>]/,contains:[{begin:"decltype\$auto\$",keywords:l,relevance:0},{begin:c,returnBegin:!0,contains:[o],relevance:0},{className:"params",begin:/$/,end:/$/,keywords:l,relevance:0,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,i,r,{begin:/$/,end:/$/,keywords:l,relevance:0,contains:["self",e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,i,r]}]},r,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,s]};return{aliases:["c","cc","h","c++","h++","hpp","hh","hxx","cxx"],keywords:l,disableAutodetect:!0,illegal:"</",contains:[].concat(_,u,d,[s,{begin:"\\b(deque|list|queue|priority_queue|pair|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array)\\s*<",end:">",keywords:l,contains:["self",r]},{begin:e.IDENT_RE+"::",keywords:l},{className:"class",beginKeywords:"class struct",end:/[{;:]/,contains:[{begin:/</,end:/>/,contains:["self"]},e.TITLE_MODE]}]),exports:{preprocessor:s,strings:a,keywords:l}}}}());hljs.registerLanguage("coffeescript",function(){"use strict";const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],a=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["arguments","this","super","console","window","document","localStorage","module","global"],["Intl","DataView","Number","Math","Date","String","RegExp","Object","Function","Boolean","Error","Symbol","Set","Map","WeakSet","WeakMap","Proxy","Reflect","JSON","Promise","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Float32Array","Array","Uint8Array","Uint8ClampedArray","ArrayBuffer"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"]);return function(r){var t={keyword:e.concat(["then","unless","until","loop","by","when","and","or","is","isnt","not"]).filter((e=>n=>!e.includes(n))(["var","const","let","function","static"])).join(" "),literal:n.concat(["yes","no","on","off"]).join(" "),built_in:a.concat(["npm","print"]).join(" ")},i="[A-Za-z$_][0-9A-Za-z$_]*",s={className:"subst",begin:/#\{/,end:/}/,keywords:t},o=[r.BINARY_NUMBER_MODE,r.inherit(r.C_NUMBER_MODE,{starts:{end:"(\\s*/)?",relevance:0}}),{className:"string",variants:[{begin:/'''/,end:/'''/,contains:[r.BACKSLASH_ESCAPE]},{begin:/'/,end:/'/,contains:[r.BACKSLASH_ESCAPE]},{begin:/"""/,end:/"""/,contains:[r.BACKSLASH_ESCAPE,s]},{begin:/"/,end:/"/,contains:[r.BACKSLASH_ESCAPE,s]}]},{className:"regexp",variants:[{begin:"///",end:"///",contains:[s,r.HASH_COMMENT_MODE]},{begin:"//[gim]{0,3}(?=\\W)",relevance:0},{begin:/\/(?![ *]).*?(?![\\]).\/[gim]{0,3}(?=\W)/}]},{begin:"@"+i},{subLanguage:"javascript",excludeBegin:!0,excludeEnd:!0,variants:[{begin:"```",end:"```"},{begin:"`",end:"`"}]}];s.contains=o;var c=r.inherit(r.TITLE_MODE,{begin:i}),l={className:"params",begin:"\$[^\\(]",returnBegin:!0,contains:[{begin:/\(/,end:/$/,keywords:t,contains:["self"].concat(o)}]};return{name:"CoffeeScript",aliases:["coffee","cson","iced"],keywords:t,illegal:/\/\*/,contains:o.concat([r.COMMENT("###","###"),r.HASH_COMMENT_MODE,{className:"function",begin:"^\\s*"+i+"\\s*=\\s*(\$.*\$)?\\s*\\B[-=]>",end:"[-=]>",returnBegin:!0,contains:[c,l]},{begin:/[:$,=]\s*/,relevance:0,contains:[{className:"function",begin:"(\\(.*\$)?\\s*\\B[-=]>",end:"[-=]>",returnBegin:!0,contains:[l]}]},{className:"class",beginKeywords:"class",end:"$",illegal:/[:="\[\]]/,contains:[{beginKeywords:"extends",endsWithParent:!0,illegal:/[:="\[\]]/,contains:[c]},c]},{begin:i+":",end:":",returnBegin:!0,returnEnd:!0,relevance:0}])}}}());hljs.registerLanguage("ruby",function(){"use strict";return function(e){var n="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",a={keyword:"and then defined module in return redo if BEGIN retry end for self when next until do begin unless END rescue else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor",literal:"true false nil"},s={className:"doctag",begin:"@[A-Za-z]+"},i={begin:"#<",end:">"},r=[e.COMMENT("#","$",{contains:[s]}),e.COMMENT("^\\=begin","^\\=end",{contains:[s],relevance:10}),e.COMMENT("^__END__","\\n$")],c={className:"subst",begin:"#\\{",end:"}",keywords:a},t={className:"string",contains:[e.BACKSLASH_ESCAPE,c],variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/`/,end:/`/},{begin:"%[qQwWx]?\$",end:"\$"},{begin:"%[qQwWx]?\\[",end:"\\]"},{begin:"%[qQwWx]?{",end:"}"},{begin:"%[qQwWx]?<",end:">"},{begin:"%[qQwWx]?/",end:"/"},{begin:"%[qQwWx]?%",end:"%"},{begin:"%[qQwWx]?-",end:"-"},{begin:"%[qQwWx]?\\|",end:"\\|"},{begin:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/},{begin:/<<[-~]?'?(\w+)(?:.|\n)*?\n\s*\1\b/,returnBegin:!0,contains:[{begin:/<<[-~]?'?/},e.END_SAME_AS_BEGIN({begin:/(\w+)/,end:/(\w+)/,contains:[e.BACKSLASH_ESCAPE,c]})]}]},b={className:"params",begin:"\$",end:"\$",endsParent:!0,keywords:a},d=[t,i,{className:"class",beginKeywords:"class module",end:"$|;",illegal:/=/,contains:[e.inherit(e.TITLE_MODE,{begin:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{begin:"<\\s*",contains:[{begin:"("+e.IDENT_RE+"::)?"+e.IDENT_RE}]}].concat(r)},{className:"function",beginKeywords:"def",end:"$|;",contains:[e.inherit(e.TITLE_MODE,{begin:n}),b].concat(r)},{begin:e.IDENT_RE+"::"},{className:"symbol",begin:e.UNDERSCORE_IDENT_RE+"(\\!|\\?)?:",relevance:0},{className:"symbol",begin:":(?!\\s)",contains:[t,{begin:n}],relevance:0},{className:"number",begin:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},{begin:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{className:"params",begin:/\|/,end:/\|/,keywords:a},{begin:"("+e.RE_STARTERS_RE+"|unless)\\s*",keywords:"unless",contains:[i,{className:"regexp",contains:[e.BACKSLASH_ESCAPE,c],illegal:/\n/,variants:[{begin:"/",end:"/[a-z]*"},{begin:"%r{",end:"}[a-z]*"},{begin:"%r\$",end:"\$[a-z]*"},{begin:"%r!",end:"![a-z]*"},{begin:"%r\\[",end:"\\][a-z]*"}]}].concat(r),relevance:0}].concat(r);c.contains=d,b.contains=d;var g=[{begin:/^\s*=>/,starts:{end:"$",contains:d}},{className:"meta",begin:"^([>?]>|[\\w#]+\$\\w+\$:\\d+:\\d+>|(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>)",starts:{end:"$",contains:d}}];return{name:"Ruby",aliases:["rb","gemspec","podspec","thor","irb"],keywords:a,illegal:/\/\*/,contains:r.concat(g).concat(d)}}}());hljs.registerLanguage("yaml",function(){"use strict";return function(e){var n="true false yes no null",a="[\\w#;/?:@&=+$,.~*\\'()[\\]]+",s={className:"string",relevance:0,variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/\S+/}],contains:[e.BACKSLASH_ESCAPE,{className:"template-variable",variants:[{begin:"{{",end:"}}"},{begin:"%{",end:"}"}]}]},i=e.inherit(s,{variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/[^\s,{}[\]]+/}]}),l={end:",",endsWithParent:!0,excludeEnd:!0,contains:[],keywords:n,relevance:0},t={begin:"{",end:"}",contains:[l],illegal:"\\n",relevance:0},g={begin:"\\[",end:"\\]",contains:[l],illegal:"\\n",relevance:0},b=[{className:"attr",variants:[{begin:"\\w[\\w :\\/.-]*:(?=[ \t]|$)"},{begin:'"\\w[\\w :\\/.-]*":(?=[ \t]|$)'},{begin:"'\\w[\\w :\\/.-]*':(?=[ \t]|$)"}]},{className:"meta",begin:"^---s*$",relevance:10},{className:"string",begin:"[\\|>]([0-9]?[+-])?[ ]*\\n( *)[\\S ]+\\n(\\2[\\S ]+\\n?)*"},{begin:"<%[%=-]?",end:"[%-]?%>",subLanguage:"ruby",excludeBegin:!0,excludeEnd:!0,relevance:0},{className:"type",begin:"!\\w+!"+a},{className:"type",begin:"!<"+a+">"},{className:"type",begin:"!"+a},{className:"type",begin:"!!"+a},{className:"meta",begin:"&"+e.UNDERSCORE_IDENT_RE+"$"},{className:"meta",begin:"\\*"+e.UNDERSCORE_IDENT_RE+"$"},{className:"bullet",begin:"\\-(?=[ ]|$)",relevance:0},e.HASH_COMMENT_MODE,{beginKeywords:n,keywords:{literal:n}},{className:"number",begin:"\\b[0-9]{4}(-[0-9][0-9]){0,2}([Tt \\t][0-9][0-9]?(:[0-9][0-9]){2})?(\\.[0-9]*)?([ \\t])*(Z|[-+][0-9][0-9]?(:[0-9][0-9])?)?\\b"},{className:"number",begin:e.C_NUMBER_RE+"\\b"},t,g,s],c=[...b];return c.pop(),c.push(i),l.contains=c,{name:"YAML",case_insensitive:!0,aliases:["yml","YAML"],contains:b}}}());hljs.registerLanguage("d",function(){"use strict";return function(e){var a={$pattern:e.UNDERSCORE_IDENT_RE,keyword:"abstract alias align asm assert auto body break byte case cast catch class const continue debug default delete deprecated do else enum export extern final finally for foreach foreach_reverse|10 goto if immutable import in inout int interface invariant is lazy macro mixin module new nothrow out override package pragma private protected public pure ref return scope shared static struct super switch synchronized template this throw try typedef typeid typeof union unittest version void volatile while with __FILE__ __LINE__ __gshared|10 __thread __traits __DATE__ __EOF__ __TIME__ __TIMESTAMP__ __VENDOR__ __VERSION__",built_in:"bool cdouble cent cfloat char creal dchar delegate double dstring float function idouble ifloat ireal long real short string ubyte ucent uint ulong ushort wchar wstring",literal:"false null true"},d="((0|[1-9][\\d_]*)|0[bB][01_]+|0[xX]([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*))",n="\\\\(['\"\\?\\\\abfnrtv]|u[\\dA-Fa-f]{4}|[0-7]{1,3}|x[\\dA-Fa-f]{2}|U[\\dA-Fa-f]{8})|&[a-zA-Z\\d]{2,};",t={className:"number",begin:"\\b"+d+"(L|u|U|Lu|LU|uL|UL)?",relevance:0},_={className:"number",begin:"\\b(((0[xX](([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)\\.([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)|\\.?([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*))[pP][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d))|((0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)(\\.\\d*|([eE][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)))|\\d+\\.(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)|\\.(0|[1-9][\\d_]*)([eE][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d))?))([fF]|L|i|[fF]i|Li)?|"+d+"(i|[fF]i|Li))",relevance:0},r={className:"string",begin:"'("+n+"|.)",end:"'",illegal:"."},i={className:"string",begin:'"',contains:[{begin:n,relevance:0}],end:'"[cwd]?'},s=e.COMMENT("\\/\\+","\\+\\/",{contains:["self"],relevance:10});return{name:"D",keywords:a,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,s,{className:"string",begin:'x"[\\da-fA-F\\s\\n\\r]*"[cwd]?',relevance:10},i,{className:"string",begin:'[rq]"',end:'"[cwd]?',relevance:5},{className:"string",begin:"`",end:"`[cwd]?"},{className:"string",begin:'q"\\{',end:'\\}"'},_,t,r,{className:"meta",begin:"^#!",end:"$",relevance:5},{className:"meta",begin:"#(line)",end:"$",relevance:5},{className:"keyword",begin:"@[a-zA-Z_][a-zA-Z_\\d]*"}]}}}());hljs.registerLanguage("properties",function(){"use strict";return function(e){var n="[ \\t\\f]*",t="("+n+"[:=]"+n+"|[ \\t\\f]+)",a="([^\\\\:= \\t\\f\\n]|\\\\.)+",s={end:t,relevance:0,starts:{className:"string",end:/$/,relevance:0,contains:[{begin:"\\\\\\n"}]}};return{name:".properties",case_insensitive:!0,illegal:/\S/,contains:[e.COMMENT("^\\s*[!#]","$"),{begin:"([^\\\\\\W:= \\t\\f\\n]|\\\\.)+"+t,returnBegin:!0,contains:[{className:"attr",begin:"([^\\\\\\W:= \\t\\f\\n]|\\\\.)+",endsParent:!0,relevance:0}],starts:s},{begin:a+t,returnBegin:!0,relevance:0,contains:[{className:"meta",begin:a,endsParent:!0,relevance:0}],starts:s},{className:"attr",relevance:0,begin:a+n+"$"}]}}}());hljs.registerLanguage("http",function(){"use strict";return function(e){var n="HTTP/[0-9\\.]+";return{name:"HTTP",aliases:["https"],illegal:"\\S",contains:[{begin:"^"+n,end:"$",contains:[{className:"number",begin:"\\b\\d{3}\\b"}]},{begin:"^[A-Z]+ (.*?) "+n+"$",returnBegin:!0,end:"$",contains:[{className:"string",begin:" ",end:" ",excludeBegin:!0,excludeEnd:!0},{begin:n},{className:"keyword",begin:"[A-Z]+"}]},{className:"attribute",begin:"^\\w",end:": ",excludeEnd:!0,illegal:"\\n|\\s|=",starts:{end:"$",relevance:0}},{begin:"\\n\\n",starts:{subLanguage:[],endsWithParent:!0}}]}}}());hljs.registerLanguage("haskell",function(){"use strict";return function(e){var n={variants:[e.COMMENT("--","$"),e.COMMENT("{-","-}",{contains:["self"]})]},i={className:"meta",begin:"{-#",end:"#-}"},a={className:"meta",begin:"^#",end:"$"},s={className:"type",begin:"\\b[A-Z][\\w']*",relevance:0},l={begin:"\$",end:"\$",illegal:'"',contains:[i,a,{className:"type",begin:"\\b[A-Z][\\w]*(\$(\\.\\.|,|\\w+)\$)?"},e.inherit(e.TITLE_MODE,{begin:"[_a-z][\\w']*"}),n]};return{name:"Haskell",aliases:["hs"],keywords:"let in if then else case of where do module import hiding qualified type data newtype deriving class instance as default infix infixl infixr foreign export ccall stdcall cplusplus jvm dotnet safe unsafe family forall mdo proc rec",contains:[{beginKeywords:"module",end:"where",keywords:"module where",contains:[l,n],illegal:"\\W\\.|;"},{begin:"\\bimport\\b",end:"$",keywords:"import qualified as hiding",contains:[l,n],illegal:"\\W\\.|;"},{className:"class",begin:"^(\\s*)?(class|instance)\\b",end:"where",keywords:"class family instance where",contains:[s,l,n]},{className:"class",begin:"\\b(data|(new)?type)\\b",end:"$",keywords:"data family type newtype deriving",contains:[i,s,l,{begin:"{",end:"}",contains:l.contains},n]},{beginKeywords:"default",end:"$",contains:[s,l,n]},{beginKeywords:"infix infixl infixr",end:"$",contains:[e.C_NUMBER_MODE,n]},{begin:"\\bforeign\\b",end:"$",keywords:"foreign import export ccall stdcall cplusplus jvm dotnet safe unsafe",contains:[s,e.QUOTE_STRING_MODE,n]},{className:"meta",begin:"#!\\/usr\\/bin\\/env runhaskell",end:"$"},i,a,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,s,e.inherit(e.TITLE_MODE,{begin:"^[_a-z][\\w']*"}),n,{begin:"->|<-"}]}}}());hljs.registerLanguage("handlebars",function(){"use strict";function e(...e){return e.map(e=>(function(e){return e?"string"==typeof e?e:e.source:null})(e)).join("")}return function(n){const a={"builtin-name":"action bindattr collection component concat debugger each each-in get hash if in input link-to loc log lookup mut outlet partial query-params render template textarea unbound unless view with yield"},t=/\[.*?\]/,s=/[^\s!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]+/,i=e("(",/'.*?'/,"|",/".*?"/,"|",t,"|",s,"|",/\.|\//,")+"),r=e("(",t,"|",s,")(?==)"),l={begin:i,lexemes:/[\w.\/]+/},c=n.inherit(l,{keywords:{literal:"true false undefined null"}}),o={begin:/$/,end:/$/},m={className:"attr",begin:r,relevance:0,starts:{begin:/=/,end:/=/,starts:{contains:[n.NUMBER_MODE,n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,c,o]}}},d={contains:[n.NUMBER_MODE,n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,{begin:/as\s+\|/,keywords:{keyword:"as"},end:/\|/,contains:[{begin:/\w+/}]},m,c,o],returnEnd:!0},g=n.inherit(l,{className:"name",keywords:a,starts:n.inherit(d,{end:/\)/})});o.contains=[g];const u=n.inherit(l,{keywords:a,className:"name",starts:n.inherit(d,{end:/}}/})}),b=n.inherit(l,{keywords:a,className:"name"}),h=n.inherit(l,{className:"name",keywords:a,starts:n.inherit(d,{end:/}}/})});return{name:"Handlebars",aliases:["hbs","html.hbs","html.handlebars","htmlbars"],case_insensitive:!0,subLanguage:"xml",contains:[{begin:/\\\{\{/,skip:!0},{begin:/\\\\(?=\{\{)/,skip:!0},n.COMMENT(/\{\{!--/,/--\}\}/),n.COMMENT(/\{\{!/,/\}\}/),{className:"template-tag",begin:/\{\{\{\{(?!\/)/,end:/\}\}\}\}/,contains:[u],starts:{end:/\{\{\{\{\//,returnEnd:!0,subLanguage:"xml"}},{className:"template-tag",begin:/\{\{\{\{\//,end:/\}\}\}\}/,contains:[b]},{className:"template-tag",begin:/\{\{#/,end:/\}\}/,contains:[u]},{className:"template-tag",begin:/\{\{(?=else\}\})/,end:/\}\}/,keywords:"else"},{className:"template-tag",begin:/\{\{\//,end:/\}\}/,contains:[b]},{className:"template-variable",begin:/\{\{\{/,end:/\}\}\}/,contains:[h]},{className:"template-variable",begin:/\{\{/,end:/\}\}/,contains:[h]}]}}}());hljs.registerLanguage("rust",function(){"use strict";return function(e){var n="([ui](8|16|32|64|128|size)|f(32|64))?",t="drop i8 i16 i32 i64 i128 isize u8 u16 u32 u64 u128 usize f32 f64 str char bool Box Option Result String Vec Copy Send Sized Sync Drop Fn FnMut FnOnce ToOwned Clone Debug PartialEq PartialOrd Eq Ord AsRef AsMut Into From Default Iterator Extend IntoIterator DoubleEndedIterator ExactSizeIterator SliceConcatExt ToString assert! assert_eq! bitflags! bytes! cfg! col! concat! concat_idents! debug_assert! debug_assert_eq! env! panic! file! format! format_args! include_bin! include_str! line! local_data_key! module_path! option_env! print! println! select! stringify! try! unimplemented! unreachable! vec! write! writeln! macro_rules! assert_ne! debug_assert_ne!";return{name:"Rust",aliases:["rs"],keywords:{$pattern:e.IDENT_RE+"!?",keyword:"abstract as async await become box break const continue crate do dyn else enum extern false final fn for if impl in let loop macro match mod move mut override priv pub ref return self Self static struct super trait true try type typeof unsafe unsized use virtual where while yield",literal:"true false Some None Ok Err",built_in:t},illegal:"</",contains:[e.C_LINE_COMMENT_MODE,e.COMMENT("/\\*","\\*/",{contains:["self"]}),e.inherit(e.QUOTE_STRING_MODE,{begin:/b?"/,illegal:null}),{className:"string",variants:[{begin:/r(#*)"(.|\n)*?"\1(?!#)/},{begin:/b?'\\?(x\w{2}|u\w{4}|U\w{8}|.)'/}]},{className:"symbol",begin:/'[a-zA-Z_][a-zA-Z0-9_]*/},{className:"number",variants:[{begin:"\\b0b([01_]+)"+n},{begin:"\\b0o([0-7_]+)"+n},{begin:"\\b0x([A-Fa-f0-9_]+)"+n},{begin:"\\b(\\d[\\d_]*(\\.[0-9_]+)?([eE][+-]?[0-9_]+)?)"+n}],relevance:0},{className:"function",beginKeywords:"fn",end:"(\\(|<)",excludeEnd:!0,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"meta",begin:"#\\!?\\[",end:"\\]",contains:[{className:"meta-string",begin:/"/,end:/"/}]},{className:"class",beginKeywords:"type",end:";",contains:[e.inherit(e.UNDERSCORE_TITLE_MODE,{endsParent:!0})],illegal:"\\S"},{className:"class",beginKeywords:"trait enum struct union",end:"{",contains:[e.inherit(e.UNDERSCORE_TITLE_MODE,{endsParent:!0})],illegal:"[\\w\\d]"},{begin:e.IDENT_RE+"::",keywords:{built_in:t}},{begin:"->"}]}}}());hljs.registerLanguage("cpp",function(){"use strict";return function(e){var t=e.getLanguage("c-like").rawDefinition();return t.disableAutodetect=!1,t.name="C++",t.aliases=["cc","c++","h++","hpp","hh","hxx","cxx"],t}}());hljs.registerLanguage("ini",function(){"use strict";function e(e){return e?"string"==typeof e?e:e.source:null}function n(...n){return n.map(n=>e(n)).join("")}return function(a){var s={className:"number",relevance:0,variants:[{begin:/([\+\-]+)?[\d]+_[\d_]+/},{begin:a.NUMBER_RE}]},i=a.COMMENT();i.variants=[{begin:/;/,end:/$/},{begin:/#/,end:/$/}];var t={className:"variable",variants:[{begin:/\$[\w\d"][\w\d_]*/},{begin:/\$\{(.*?)}/}]},r={className:"literal",begin:/\bon|off|true|false|yes|no\b/},l={className:"string",contains:[a.BACKSLASH_ESCAPE],variants:[{begin:"'''",end:"'''",relevance:10},{begin:'"""',end:'"""',relevance:10},{begin:'"',end:'"'},{begin:"'",end:"'"}]},c={begin:/\[/,end:/\]/,contains:[i,r,t,l,s,"self"],relevance:0},g="("+[/[A-Za-z0-9_-]+/,/"(\\"|[^"])*"/,/'[^']*'/].map(n=>e(n)).join("|")+")";return{name:"TOML, also INI",aliases:["toml"],case_insensitive:!0,illegal:/\S/,contains:[i,{className:"section",begin:/\[+/,end:/\]+/},{begin:n(g,"(\\s*\\.\\s*",g,")*",n("(?=",/\s*=\s*[^#\s]/,")")),className:"attr",starts:{end:/$/,contains:[i,c,r,t,l,s]}}]}}}());hljs.registerLanguage("objectivec",function(){"use strict";return function(e){var n=/[a-zA-Z@][a-zA-Z0-9_]*/,_={$pattern:n,keyword:"@interface @class @protocol @implementation"};return{name:"Objective-C",aliases:["mm","objc","obj-c"],keywords:{$pattern:n,keyword:"int float while char export sizeof typedef const struct for union unsigned long volatile static bool mutable if do return goto void enum else break extern asm case short default double register explicit signed typename this switch continue wchar_t inline readonly assign readwrite self @synchronized id typeof nonatomic super unichar IBOutlet IBAction strong weak copy in out inout bycopy byref oneway __strong __weak __block __autoreleasing @private @protected @public @try @property @end @throw @catch @finally @autoreleasepool @synthesize @dynamic @selector @optional @required @encode @package @import @defs @compatibility_alias __bridge __bridge_transfer __bridge_retained __bridge_retain __covariant __contravariant __kindof _Nonnull _Nullable _Null_unspecified __FUNCTION__ __PRETTY_FUNCTION__ __attribute__ getter setter retain unsafe_unretained nonnull nullable null_unspecified null_resettable class instancetype NS_DESIGNATED_INITIALIZER NS_UNAVAILABLE NS_REQUIRES_SUPER NS_RETURNS_INNER_POINTER NS_INLINE NS_AVAILABLE NS_DEPRECATED NS_ENUM NS_OPTIONS NS_SWIFT_UNAVAILABLE NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_END NS_REFINED_FOR_SWIFT NS_SWIFT_NAME NS_SWIFT_NOTHROW NS_DURING NS_HANDLER NS_ENDHANDLER NS_VALUERETURN NS_VOIDRETURN",literal:"false true FALSE TRUE nil YES NO NULL",built_in:"BOOL dispatch_once_t dispatch_queue_t dispatch_sync dispatch_async dispatch_once"},illegal:"</",contains:[{className:"built_in",begin:"\\b(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)\\w+"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.C_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,{className:"string",variants:[{begin:'@"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]}]},{className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{"meta-keyword":"if else elif endif define undef warning error line pragma ifdef ifndef include"},contains:[{begin:/\\\n/,relevance:0},e.inherit(e.QUOTE_STRING_MODE,{className:"meta-string"}),{className:"meta-string",begin:/<.*?>/,end:/$/,illegal:"\\n"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{className:"class",begin:"("+_.keyword.split(" ").join("|")+")\\b",end:"({|$)",excludeEnd:!0,keywords:_,contains:[e.UNDERSCORE_TITLE_MODE]},{begin:"\\."+e.UNDERSCORE_IDENT_RE,relevance:0}]}}}());hljs.registerLanguage("apache",function(){"use strict";return function(e){var n={className:"number",begin:"\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?"};return{name:"Apache config",aliases:["apacheconf"],case_insensitive:!0,contains:[e.HASH_COMMENT_MODE,{className:"section",begin:"</?",end:">",contains:[n,{className:"number",begin:":\\d{1,5}"},e.inherit(e.QUOTE_STRING_MODE,{relevance:0})]},{className:"attribute",begin:/\w+/,relevance:0,keywords:{nomarkup:"order deny allow setenv rewriterule rewriteengine rewritecond documentroot sethandler errordocument loadmodule options header listen serverroot servername"},starts:{end:/$/,relevance:0,keywords:{literal:"on off all deny allow"},contains:[{className:"meta",begin:"\\s\\[",end:"\\]$"},{className:"variable",begin:"[\\$%]\\{",end:"\\}",contains:["self",{className:"number",begin:"[\\$%]\\d+"}]},n,{className:"number",begin:"\\d+"},e.QUOTE_STRING_MODE]}}],illegal:/\S/}}}());hljs.registerLanguage("java",function(){"use strict";function e(e){return e?"string"==typeof e?e:e.source:null}function n(e){return a("(",e,")?")}function a(...n){return n.map(n=>e(n)).join("")}function s(...n){return"("+n.map(n=>e(n)).join("|")+")"}return function(e){var t="false synchronized int abstract float private char boolean var static null if const for true while long strictfp finally protected import native final void enum else break transient catch instanceof byte super volatile case assert short package default double public try this switch continue throws protected public private module requires exports do",i={className:"meta",begin:"@[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*",contains:[{begin:/$/,end:/$/,contains:["self"]}]},r=e=>a("[",e,"]+([",e,"_]*[",e,"]+)?"),c={className:"number",variants:[{begin:`\\b(0[bB]${r("01")})[lL]?`},{begin:`\\b(0${r("0-7")})[dDfFlL]?`},{begin:a(/\b0[xX]/,s(a(r("a-fA-F0-9"),/\./,r("a-fA-F0-9")),a(r("a-fA-F0-9"),/\.?/),a(/\./,r("a-fA-F0-9"))),/([pP][+-]?(\d+))?/,/[fFdDlL]?/)},{begin:a(/\b/,s(a(/\d*\./,r("\\d")),r("\\d")),/[eE][+-]?[\d]+[dDfF]?/)},{begin:a(/\b/,r(/\d/),n(/\.?/),n(r(/\d/)),/[dDfFlL]?/)}],relevance:0};return{name:"Java",aliases:["jsp"],keywords:t,illegal:/<\/|#/,contains:[e.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{begin:/\w+@/,relevance:0},{className:"doctag",begin:"@[A-Za-z]+"}]}),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{className:"class",beginKeywords:"class interface",end:/[{;=]/,excludeEnd:!0,keywords:"class interface",illegal:/[:"\[\]]/,contains:[{beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"new throw return else",relevance:0},{className:"function",begin:"([À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*(<[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*(\\s*,\\s*[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*)*>)?\\s+)+"+e.UNDERSCORE_IDENT_RE+"\\s*\$",returnBegin:!0,end:/[{;=]/,excludeEnd:!0,keywords:t,contains:[{begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"params",begin:/\(/,end:/$/,keywords:t,relevance:0,contains:[i,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE]},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},c,i]}}}());hljs.registerLanguage("x86asm",function(){"use strict";return function(s){return{name:"Intel x86 Assembly",case_insensitive:!0,keywords:{$pattern:"[.%]?"+s.IDENT_RE,keyword:"lock rep repe repz repne repnz xaquire xrelease bnd nobnd aaa aad aam aas adc add and arpl bb0_reset bb1_reset bound bsf bsr bswap bt btc btr bts call cbw cdq cdqe clc cld cli clts cmc cmp cmpsb cmpsd cmpsq cmpsw cmpxchg cmpxchg486 cmpxchg8b cmpxchg16b cpuid cpu_read cpu_write cqo cwd cwde daa das dec div dmint emms enter equ f2xm1 fabs fadd faddp fbld fbstp fchs fclex fcmovb fcmovbe fcmove fcmovnb fcmovnbe fcmovne fcmovnu fcmovu fcom fcomi fcomip fcomp fcompp fcos fdecstp fdisi fdiv fdivp fdivr fdivrp femms feni ffree ffreep fiadd ficom ficomp fidiv fidivr fild fimul fincstp finit fist fistp fisttp fisub fisubr fld fld1 fldcw fldenv fldl2e fldl2t fldlg2 fldln2 fldpi fldz fmul fmulp fnclex fndisi fneni fninit fnop fnsave fnstcw fnstenv fnstsw fpatan fprem fprem1 fptan frndint frstor fsave fscale fsetpm fsin fsincos fsqrt fst fstcw fstenv fstp fstsw fsub fsubp fsubr fsubrp ftst fucom fucomi fucomip fucomp fucompp fxam fxch fxtract fyl2x fyl2xp1 hlt ibts icebp idiv imul in inc incbin insb insd insw int int01 int1 int03 int3 into invd invpcid invlpg invlpga iret iretd iretq iretw jcxz jecxz jrcxz jmp jmpe lahf lar lds lea leave les lfence lfs lgdt lgs lidt lldt lmsw loadall loadall286 lodsb lodsd lodsq lodsw loop loope loopne loopnz loopz lsl lss ltr mfence monitor mov movd movq movsb movsd movsq movsw movsx movsxd movzx mul mwait neg nop not or out outsb outsd outsw packssdw packsswb packuswb paddb paddd paddsb paddsiw paddsw paddusb paddusw paddw pand pandn pause paveb pavgusb pcmpeqb pcmpeqd pcmpeqw pcmpgtb pcmpgtd pcmpgtw pdistib pf2id pfacc pfadd pfcmpeq pfcmpge pfcmpgt pfmax pfmin pfmul pfrcp pfrcpit1 pfrcpit2 pfrsqit1 pfrsqrt pfsub pfsubr pi2fd pmachriw pmaddwd pmagw pmulhriw pmulhrwa pmulhrwc pmulhw pmullw pmvgezb pmvlzb pmvnzb pmvzb pop popa popad popaw popf popfd popfq popfw por prefetch prefetchw pslld psllq psllw psrad psraw psrld psrlq psrlw psubb psubd psubsb psubsiw psubsw psubusb psubusw psubw punpckhbw punpckhdq punpckhwd punpcklbw punpckldq punpcklwd push pusha pushad pushaw pushf pushfd pushfq pushfw pxor rcl rcr rdshr rdmsr rdpmc rdtsc rdtscp ret retf retn rol ror rdm rsdc rsldt rsm rsts sahf sal salc sar sbb scasb scasd scasq scasw sfence sgdt shl shld shr shrd sidt sldt skinit smi smint smintold smsw stc std sti stosb stosd stosq stosw str sub svdc svldt svts swapgs syscall sysenter sysexit sysret test ud0 ud1 ud2b ud2 ud2a umov verr verw fwait wbinvd wrshr wrmsr xadd xbts xchg xlatb xlat xor cmove cmovz cmovne cmovnz cmova cmovnbe cmovae cmovnb cmovb cmovnae cmovbe cmovna cmovg cmovnle cmovge cmovnl cmovl cmovnge cmovle cmovng cmovc cmovnc cmovo cmovno cmovs cmovns cmovp cmovpe cmovnp cmovpo je jz jne jnz ja jnbe jae jnb jb jnae jbe jna jg jnle jge jnl jl jnge jle jng jc jnc jo jno js jns jpo jnp jpe jp sete setz setne setnz seta setnbe setae setnb setnc setb setnae setcset setbe setna setg setnle setge setnl setl setnge setle setng sets setns seto setno setpe setp setpo setnp addps addss andnps andps cmpeqps cmpeqss cmpleps cmpless cmpltps cmpltss cmpneqps cmpneqss cmpnleps cmpnless cmpnltps cmpnltss cmpordps cmpordss cmpunordps cmpunordss cmpps cmpss comiss cvtpi2ps cvtps2pi cvtsi2ss cvtss2si cvttps2pi cvttss2si divps divss ldmxcsr maxps maxss minps minss movaps movhps movlhps movlps movhlps movmskps movntps movss movups mulps mulss orps rcpps rcpss rsqrtps rsqrtss shufps sqrtps sqrtss stmxcsr subps subss ucomiss unpckhps unpcklps xorps fxrstor fxrstor64 fxsave fxsave64 xgetbv xsetbv xsave xsave64 xsaveopt xsaveopt64 xrstor xrstor64 prefetchnta prefetcht0 prefetcht1 prefetcht2 maskmovq movntq pavgb pavgw pextrw pinsrw pmaxsw pmaxub pminsw pminub pmovmskb pmulhuw psadbw pshufw pf2iw pfnacc pfpnacc pi2fw pswapd maskmovdqu clflush movntdq movnti movntpd movdqa movdqu movdq2q movq2dq paddq pmuludq pshufd pshufhw pshuflw pslldq psrldq psubq punpckhqdq punpcklqdq addpd addsd andnpd andpd cmpeqpd cmpeqsd cmplepd cmplesd cmpltpd cmpltsd cmpneqpd cmpneqsd cmpnlepd cmpnlesd cmpnltpd cmpnltsd cmpordpd cmpordsd cmpunordpd cmpunordsd cmppd comisd cvtdq2pd cvtdq2ps cvtpd2dq cvtpd2pi cvtpd2ps cvtpi2pd cvtps2dq cvtps2pd cvtsd2si cvtsd2ss cvtsi2sd cvtss2sd cvttpd2pi cvttpd2dq cvttps2dq cvttsd2si divpd divsd maxpd maxsd minpd minsd movapd movhpd movlpd movmskpd movupd mulpd mulsd orpd shufpd sqrtpd sqrtsd subpd subsd ucomisd unpckhpd unpcklpd xorpd addsubpd addsubps haddpd haddps hsubpd hsubps lddqu movddup movshdup movsldup clgi stgi vmcall vmclear vmfunc vmlaunch vmload vmmcall vmptrld vmptrst vmread vmresume vmrun vmsave vmwrite vmxoff vmxon invept invvpid pabsb pabsw pabsd palignr phaddw phaddd phaddsw phsubw phsubd phsubsw pmaddubsw pmulhrsw pshufb psignb psignw psignd extrq insertq movntsd movntss lzcnt blendpd blendps blendvpd blendvps dppd dpps extractps insertps movntdqa mpsadbw packusdw pblendvb pblendw pcmpeqq pextrb pextrd pextrq phminposuw pinsrb pinsrd pinsrq pmaxsb pmaxsd pmaxud pmaxuw pminsb pminsd pminud pminuw pmovsxbw pmovsxbd pmovsxbq pmovsxwd pmovsxwq pmovsxdq pmovzxbw pmovzxbd pmovzxbq pmovzxwd pmovzxwq pmovzxdq pmuldq pmulld ptest roundpd roundps roundsd roundss crc32 pcmpestri pcmpestrm pcmpistri pcmpistrm pcmpgtq popcnt getsec pfrcpv pfrsqrtv movbe aesenc aesenclast aesdec aesdeclast aesimc aeskeygenassist vaesenc vaesenclast vaesdec vaesdeclast vaesimc vaeskeygenassist vaddpd vaddps vaddsd vaddss vaddsubpd vaddsubps vandpd vandps vandnpd vandnps vblendpd vblendps vblendvpd vblendvps vbroadcastss vbroadcastsd vbroadcastf128 vcmpeq_ospd vcmpeqpd vcmplt_ospd vcmpltpd vcmple_ospd vcmplepd vcmpunord_qpd vcmpunordpd vcmpneq_uqpd vcmpneqpd vcmpnlt_uspd vcmpnltpd vcmpnle_uspd vcmpnlepd vcmpord_qpd vcmpordpd vcmpeq_uqpd vcmpnge_uspd vcmpngepd vcmpngt_uspd vcmpngtpd vcmpfalse_oqpd vcmpfalsepd vcmpneq_oqpd vcmpge_ospd vcmpgepd vcmpgt_ospd vcmpgtpd vcmptrue_uqpd vcmptruepd vcmplt_oqpd vcmple_oqpd vcmpunord_spd vcmpneq_uspd vcmpnlt_uqpd vcmpnle_uqpd vcmpord_spd vcmpeq_uspd vcmpnge_uqpd vcmpngt_uqpd vcmpfalse_ospd vcmpneq_ospd vcmpge_oqpd vcmpgt_oqpd vcmptrue_uspd vcmppd vcmpeq_osps vcmpeqps vcmplt_osps vcmpltps vcmple_osps vcmpleps vcmpunord_qps vcmpunordps vcmpneq_uqps vcmpneqps vcmpnlt_usps vcmpnltps vcmpnle_usps vcmpnleps vcmpord_qps vcmpordps vcmpeq_uqps vcmpnge_usps vcmpngeps vcmpngt_usps vcmpngtps vcmpfalse_oqps vcmpfalseps vcmpneq_oqps vcmpge_osps vcmpgeps vcmpgt_osps vcmpgtps vcmptrue_uqps vcmptrueps vcmplt_oqps vcmple_oqps vcmpunord_sps vcmpneq_usps vcmpnlt_uqps vcmpnle_uqps vcmpord_sps vcmpeq_usps vcmpnge_uqps vcmpngt_uqps vcmpfalse_osps vcmpneq_osps vcmpge_oqps vcmpgt_oqps vcmptrue_usps vcmpps vcmpeq_ossd vcmpeqsd vcmplt_ossd vcmpltsd vcmple_ossd vcmplesd vcmpunord_qsd vcmpunordsd vcmpneq_uqsd vcmpneqsd vcmpnlt_ussd vcmpnltsd vcmpnle_ussd vcmpnlesd vcmpord_qsd vcmpordsd vcmpeq_uqsd vcmpnge_ussd vcmpngesd vcmpngt_ussd vcmpngtsd vcmpfalse_oqsd vcmpfalsesd vcmpneq_oqsd vcmpge_ossd vcmpgesd vcmpgt_ossd vcmpgtsd vcmptrue_uqsd vcmptruesd vcmplt_oqsd vcmple_oqsd vcmpunord_ssd vcmpneq_ussd vcmpnlt_uqsd vcmpnle_uqsd vcmpord_ssd vcmpeq_ussd vcmpnge_uqsd vcmpngt_uqsd vcmpfalse_ossd vcmpneq_ossd vcmpge_oqsd vcmpgt_oqsd vcmptrue_ussd vcmpsd vcmpeq_osss vcmpeqss vcmplt_osss vcmpltss vcmple_osss vcmpless vcmpunord_qss vcmpunordss vcmpneq_uqss vcmpneqss vcmpnlt_usss vcmpnltss vcmpnle_usss vcmpnless vcmpord_qss vcmpordss vcmpeq_uqss vcmpnge_usss vcmpngess vcmpngt_usss vcmpngtss vcmpfalse_oqss vcmpfalsess vcmpneq_oqss vcmpge_osss vcmpgess vcmpgt_osss vcmpgtss vcmptrue_uqss vcmptruess vcmplt_oqss vcmple_oqss vcmpunord_sss vcmpneq_usss vcmpnlt_uqss vcmpnle_uqss vcmpord_sss vcmpeq_usss vcmpnge_uqss vcmpngt_uqss vcmpfalse_osss vcmpneq_osss vcmpge_oqss vcmpgt_oqss vcmptrue_usss vcmpss vcomisd vcomiss vcvtdq2pd vcvtdq2ps vcvtpd2dq vcvtpd2ps vcvtps2dq vcvtps2pd vcvtsd2si vcvtsd2ss vcvtsi2sd vcvtsi2ss vcvtss2sd vcvtss2si vcvttpd2dq vcvttps2dq vcvttsd2si vcvttss2si vdivpd vdivps vdivsd vdivss vdppd vdpps vextractf128 vextractps vhaddpd vhaddps vhsubpd vhsubps vinsertf128 vinsertps vlddqu vldqqu vldmxcsr vmaskmovdqu vmaskmovps vmaskmovpd vmaxpd vmaxps vmaxsd vmaxss vminpd vminps vminsd vminss vmovapd vmovaps vmovd vmovq vmovddup vmovdqa vmovqqa vmovdqu vmovqqu vmovhlps vmovhpd vmovhps vmovlhps vmovlpd vmovlps vmovmskpd vmovmskps vmovntdq vmovntqq vmovntdqa vmovntpd vmovntps vmovsd vmovshdup vmovsldup vmovss vmovupd vmovups vmpsadbw vmulpd vmulps vmulsd vmulss vorpd vorps vpabsb vpabsw vpabsd vpacksswb vpackssdw vpackuswb vpackusdw vpaddb vpaddw vpaddd vpaddq vpaddsb vpaddsw vpaddusb vpaddusw vpalignr vpand vpandn vpavgb vpavgw vpblendvb vpblendw vpcmpestri vpcmpestrm vpcmpistri vpcmpistrm vpcmpeqb vpcmpeqw vpcmpeqd vpcmpeqq vpcmpgtb vpcmpgtw vpcmpgtd vpcmpgtq vpermilpd vpermilps vperm2f128 vpextrb vpextrw vpextrd vpextrq vphaddw vphaddd vphaddsw vphminposuw vphsubw vphsubd vphsubsw vpinsrb vpinsrw vpinsrd vpinsrq vpmaddwd vpmaddubsw vpmaxsb vpmaxsw vpmaxsd vpmaxub vpmaxuw vpmaxud vpminsb vpminsw vpminsd vpminub vpminuw vpminud vpmovmskb vpmovsxbw vpmovsxbd vpmovsxbq vpmovsxwd vpmovsxwq vpmovsxdq vpmovzxbw vpmovzxbd vpmovzxbq vpmovzxwd vpmovzxwq vpmovzxdq vpmulhuw vpmulhrsw vpmulhw vpmullw vpmulld vpmuludq vpmuldq vpor vpsadbw vpshufb vpshufd vpshufhw vpshuflw vpsignb vpsignw vpsignd vpslldq vpsrldq vpsllw vpslld vpsllq vpsraw vpsrad vpsrlw vpsrld vpsrlq vptest vpsubb vpsubw vpsubd vpsubq vpsubsb vpsubsw vpsubusb vpsubusw vpunpckhbw vpunpckhwd vpunpckhdq vpunpckhqdq vpunpcklbw vpunpcklwd vpunpckldq vpunpcklqdq vpxor vrcpps vrcpss vrsqrtps vrsqrtss vroundpd vroundps vroundsd vroundss vshufpd vshufps vsqrtpd vsqrtps vsqrtsd vsqrtss vstmxcsr vsubpd vsubps vsubsd vsubss vtestps vtestpd vucomisd vucomiss vunpckhpd vunpckhps vunpcklpd vunpcklps vxorpd vxorps vzeroall vzeroupper pclmullqlqdq pclmulhqlqdq pclmullqhqdq pclmulhqhqdq pclmulqdq vpclmullqlqdq vpclmulhqlqdq vpclmullqhqdq vpclmulhqhqdq vpclmulqdq vfmadd132ps vfmadd132pd vfmadd312ps vfmadd312pd vfmadd213ps vfmadd213pd vfmadd123ps vfmadd123pd vfmadd231ps vfmadd231pd vfmadd321ps vfmadd321pd vfmaddsub132ps vfmaddsub132pd vfmaddsub312ps vfmaddsub312pd vfmaddsub213ps vfmaddsub213pd vfmaddsub123ps vfmaddsub123pd vfmaddsub231ps vfmaddsub231pd vfmaddsub321ps vfmaddsub321pd vfmsub132ps vfmsub132pd vfmsub312ps vfmsub312pd vfmsub213ps vfmsub213pd vfmsub123ps vfmsub123pd vfmsub231ps vfmsub231pd vfmsub321ps vfmsub321pd vfmsubadd132ps vfmsubadd132pd vfmsubadd312ps vfmsubadd312pd vfmsubadd213ps vfmsubadd213pd vfmsubadd123ps vfmsubadd123pd vfmsubadd231ps vfmsubadd231pd vfmsubadd321ps vfmsubadd321pd vfnmadd132ps vfnmadd132pd vfnmadd312ps vfnmadd312pd vfnmadd213ps vfnmadd213pd vfnmadd123ps vfnmadd123pd vfnmadd231ps vfnmadd231pd vfnmadd321ps vfnmadd321pd vfnmsub132ps vfnmsub132pd vfnmsub312ps vfnmsub312pd vfnmsub213ps vfnmsub213pd vfnmsub123ps vfnmsub123pd vfnmsub231ps vfnmsub231pd vfnmsub321ps vfnmsub321pd vfmadd132ss vfmadd132sd vfmadd312ss vfmadd312sd vfmadd213ss vfmadd213sd vfmadd123ss vfmadd123sd vfmadd231ss vfmadd231sd vfmadd321ss vfmadd321sd vfmsub132ss vfmsub132sd vfmsub312ss vfmsub312sd vfmsub213ss vfmsub213sd vfmsub123ss vfmsub123sd vfmsub231ss vfmsub231sd vfmsub321ss vfmsub321sd vfnmadd132ss vfnmadd132sd vfnmadd312ss vfnmadd312sd vfnmadd213ss vfnmadd213sd vfnmadd123ss vfnmadd123sd vfnmadd231ss vfnmadd231sd vfnmadd321ss vfnmadd321sd vfnmsub132ss vfnmsub132sd vfnmsub312ss vfnmsub312sd vfnmsub213ss vfnmsub213sd vfnmsub123ss vfnmsub123sd vfnmsub231ss vfnmsub231sd vfnmsub321ss vfnmsub321sd rdfsbase rdgsbase rdrand wrfsbase wrgsbase vcvtph2ps vcvtps2ph adcx adox rdseed clac stac xstore xcryptecb xcryptcbc xcryptctr xcryptcfb xcryptofb montmul xsha1 xsha256 llwpcb slwpcb lwpval lwpins vfmaddpd vfmaddps vfmaddsd vfmaddss vfmaddsubpd vfmaddsubps vfmsubaddpd vfmsubaddps vfmsubpd vfmsubps vfmsubsd vfmsubss vfnmaddpd vfnmaddps vfnmaddsd vfnmaddss vfnmsubpd vfnmsubps vfnmsubsd vfnmsubss vfrczpd vfrczps vfrczsd vfrczss vpcmov vpcomb vpcomd vpcomq vpcomub vpcomud vpcomuq vpcomuw vpcomw vphaddbd vphaddbq vphaddbw vphadddq vphaddubd vphaddubq vphaddubw vphaddudq vphadduwd vphadduwq vphaddwd vphaddwq vphsubbw vphsubdq vphsubwd vpmacsdd vpmacsdqh vpmacsdql vpmacssdd vpmacssdqh vpmacssdql vpmacsswd vpmacssww vpmacswd vpmacsww vpmadcsswd vpmadcswd vpperm vprotb vprotd vprotq vprotw vpshab vpshad vpshaq vpshaw vpshlb vpshld vpshlq vpshlw vbroadcasti128 vpblendd vpbroadcastb vpbroadcastw vpbroadcastd vpbroadcastq vpermd vpermpd vpermps vpermq vperm2i128 vextracti128 vinserti128 vpmaskmovd vpmaskmovq vpsllvd vpsllvq vpsravd vpsrlvd vpsrlvq vgatherdpd vgatherqpd vgatherdps vgatherqps vpgatherdd vpgatherqd vpgatherdq vpgatherqq xabort xbegin xend xtest andn bextr blci blcic blsi blsic blcfill blsfill blcmsk blsmsk blsr blcs bzhi mulx pdep pext rorx sarx shlx shrx tzcnt tzmsk t1mskc valignd valignq vblendmpd vblendmps vbroadcastf32x4 vbroadcastf64x4 vbroadcasti32x4 vbroadcasti64x4 vcompresspd vcompressps vcvtpd2udq vcvtps2udq vcvtsd2usi vcvtss2usi vcvttpd2udq vcvttps2udq vcvttsd2usi vcvttss2usi vcvtudq2pd vcvtudq2ps vcvtusi2sd vcvtusi2ss vexpandpd vexpandps vextractf32x4 vextractf64x4 vextracti32x4 vextracti64x4 vfixupimmpd vfixupimmps vfixupimmsd vfixupimmss vgetexppd vgetexpps vgetexpsd vgetexpss vgetmantpd vgetmantps vgetmantsd vgetmantss vinsertf32x4 vinsertf64x4 vinserti32x4 vinserti64x4 vmovdqa32 vmovdqa64 vmovdqu32 vmovdqu64 vpabsq vpandd vpandnd vpandnq vpandq vpblendmd vpblendmq vpcmpltd vpcmpled vpcmpneqd vpcmpnltd vpcmpnled vpcmpd vpcmpltq vpcmpleq vpcmpneqq vpcmpnltq vpcmpnleq vpcmpq vpcmpequd vpcmpltud vpcmpleud vpcmpnequd vpcmpnltud vpcmpnleud vpcmpud vpcmpequq vpcmpltuq vpcmpleuq vpcmpnequq vpcmpnltuq vpcmpnleuq vpcmpuq vpcompressd vpcompressq vpermi2d vpermi2pd vpermi2ps vpermi2q vpermt2d vpermt2pd vpermt2ps vpermt2q vpexpandd vpexpandq vpmaxsq vpmaxuq vpminsq vpminuq vpmovdb vpmovdw vpmovqb vpmovqd vpmovqw vpmovsdb vpmovsdw vpmovsqb vpmovsqd vpmovsqw vpmovusdb vpmovusdw vpmovusqb vpmovusqd vpmovusqw vpord vporq vprold vprolq vprolvd vprolvq vprord vprorq vprorvd vprorvq vpscatterdd vpscatterdq vpscatterqd vpscatterqq vpsraq vpsravq vpternlogd vpternlogq vptestmd vptestmq vptestnmd vptestnmq vpxord vpxorq vrcp14pd vrcp14ps vrcp14sd vrcp14ss vrndscalepd vrndscaleps vrndscalesd vrndscaless vrsqrt14pd vrsqrt14ps vrsqrt14sd vrsqrt14ss vscalefpd vscalefps vscalefsd vscalefss vscatterdpd vscatterdps vscatterqpd vscatterqps vshuff32x4 vshuff64x2 vshufi32x4 vshufi64x2 kandnw kandw kmovw knotw kortestw korw kshiftlw kshiftrw kunpckbw kxnorw kxorw vpbroadcastmb2q vpbroadcastmw2d vpconflictd vpconflictq vplzcntd vplzcntq vexp2pd vexp2ps vrcp28pd vrcp28ps vrcp28sd vrcp28ss vrsqrt28pd vrsqrt28ps vrsqrt28sd vrsqrt28ss vgatherpf0dpd vgatherpf0dps vgatherpf0qpd vgatherpf0qps vgatherpf1dpd vgatherpf1dps vgatherpf1qpd vgatherpf1qps vscatterpf0dpd vscatterpf0dps vscatterpf0qpd vscatterpf0qps vscatterpf1dpd vscatterpf1dps vscatterpf1qpd vscatterpf1qps prefetchwt1 bndmk bndcl bndcu bndcn bndmov bndldx bndstx sha1rnds4 sha1nexte sha1msg1 sha1msg2 sha256rnds2 sha256msg1 sha256msg2 hint_nop0 hint_nop1 hint_nop2 hint_nop3 hint_nop4 hint_nop5 hint_nop6 hint_nop7 hint_nop8 hint_nop9 hint_nop10 hint_nop11 hint_nop12 hint_nop13 hint_nop14 hint_nop15 hint_nop16 hint_nop17 hint_nop18 hint_nop19 hint_nop20 hint_nop21 hint_nop22 hint_nop23 hint_nop24 hint_nop25 hint_nop26 hint_nop27 hint_nop28 hint_nop29 hint_nop30 hint_nop31 hint_nop32 hint_nop33 hint_nop34 hint_nop35 hint_nop36 hint_nop37 hint_nop38 hint_nop39 hint_nop40 hint_nop41 hint_nop42 hint_nop43 hint_nop44 hint_nop45 hint_nop46 hint_nop47 hint_nop48 hint_nop49 hint_nop50 hint_nop51 hint_nop52 hint_nop53 hint_nop54 hint_nop55 hint_nop56 hint_nop57 hint_nop58 hint_nop59 hint_nop60 hint_nop61 hint_nop62 hint_nop63",built_in:"ip eip rip al ah bl bh cl ch dl dh sil dil bpl spl r8b r9b r10b r11b r12b r13b r14b r15b ax bx cx dx si di bp sp r8w r9w r10w r11w r12w r13w r14w r15w eax ebx ecx edx esi edi ebp esp eip r8d r9d r10d r11d r12d r13d r14d r15d rax rbx rcx rdx rsi rdi rbp rsp r8 r9 r10 r11 r12 r13 r14 r15 cs ds es fs gs ss st st0 st1 st2 st3 st4 st5 st6 st7 mm0 mm1 mm2 mm3 mm4 mm5 mm6 mm7 xmm0 xmm1 xmm2 xmm3 xmm4 xmm5 xmm6 xmm7 xmm8 xmm9 xmm10 xmm11 xmm12 xmm13 xmm14 xmm15 xmm16 xmm17 xmm18 xmm19 xmm20 xmm21 xmm22 xmm23 xmm24 xmm25 xmm26 xmm27 xmm28 xmm29 xmm30 xmm31 ymm0 ymm1 ymm2 ymm3 ymm4 ymm5 ymm6 ymm7 ymm8 ymm9 ymm10 ymm11 ymm12 ymm13 ymm14 ymm15 ymm16 ymm17 ymm18 ymm19 ymm20 ymm21 ymm22 ymm23 ymm24 ymm25 ymm26 ymm27 ymm28 ymm29 ymm30 ymm31 zmm0 zmm1 zmm2 zmm3 zmm4 zmm5 zmm6 zmm7 zmm8 zmm9 zmm10 zmm11 zmm12 zmm13 zmm14 zmm15 zmm16 zmm17 zmm18 zmm19 zmm20 zmm21 zmm22 zmm23 zmm24 zmm25 zmm26 zmm27 zmm28 zmm29 zmm30 zmm31 k0 k1 k2 k3 k4 k5 k6 k7 bnd0 bnd1 bnd2 bnd3 cr0 cr1 cr2 cr3 cr4 cr8 dr0 dr1 dr2 dr3 dr8 tr3 tr4 tr5 tr6 tr7 r0 r1 r2 r3 r4 r5 r6 r7 r0b r1b r2b r3b r4b r5b r6b r7b r0w r1w r2w r3w r4w r5w r6w r7w r0d r1d r2d r3d r4d r5d r6d r7d r0h r1h r2h r3h r0l r1l r2l r3l r4l r5l r6l r7l r8l r9l r10l r11l r12l r13l r14l r15l db dw dd dq dt ddq do dy dz resb resw resd resq rest resdq reso resy resz incbin equ times byte word dword qword nosplit rel abs seg wrt strict near far a32 ptr",meta:"%define %xdefine %+ %undef %defstr %deftok %assign %strcat %strlen %substr %rotate %elif %else %endif %if %ifmacro %ifctx %ifidn %ifidni %ifid %ifnum %ifstr %iftoken %ifempty %ifenv %error %warning %fatal %rep %endrep %include %push %pop %repl %pathsearch %depend %use %arg %stacksize %local %line %comment %endcomment .nolist __FILE__ __LINE__ __SECT__ __BITS__ __OUTPUT_FORMAT__ __DATE__ __TIME__ __DATE_NUM__ __TIME_NUM__ __UTC_DATE__ __UTC_TIME__ __UTC_DATE_NUM__ __UTC_TIME_NUM__ __PASS__ struc endstruc istruc at iend align alignb sectalign daz nodaz up down zero default option assume public bits use16 use32 use64 default section segment absolute extern global common cpu float __utf16__ __utf16le__ __utf16be__ __utf32__ __utf32le__ __utf32be__ __float8__ __float16__ __float32__ __float64__ __float80m__ __float80e__ __float128l__ __float128h__ __Infinity__ __QNaN__ __SNaN__ Inf NaN QNaN SNaN float8 float16 float32 float64 float80m float80e float128l float128h __FLOAT_DAZ__ __FLOAT_ROUND__ __FLOAT__"},contains:[s.COMMENT(";","$",{relevance:0}),{className:"number",variants:[{begin:"\\b(?:([0-9][0-9_]*)?\\.[0-9_]*(?:[eE][+-]?[0-9_]+)?|(0[Xx])?[0-9][0-9_]*\\.?[0-9_]*(?:[pP](?:[+-]?[0-9_]+)?)?)\\b",relevance:0},{begin:"\\$[0-9][0-9A-Fa-f]*",relevance:0},{begin:"\\b(?:[0-9A-Fa-f][0-9A-Fa-f_]*[Hh]|[0-9][0-9_]*[DdTt]?|[0-7][0-7_]*[QqOo]|[0-1][0-1_]*[BbYy])\\b"},{begin:"\\b(?:0[Xx][0-9A-Fa-f_]+|0[DdTt][0-9_]+|0[QqOo][0-7_]+|0[BbYy][0-1_]+)\\b"}]},s.QUOTE_STRING_MODE,{className:"string",variants:[{begin:"'",end:"[^\\\\]'"},{begin:"`",end:"[^\\\\]`"}],relevance:0},{className:"symbol",variants:[{begin:"^\\s*[A-Za-z._?][A-Za-z0-9_$#@~.?]*(:|\\s+label)"},{begin:"^\\s*%%[A-Za-z0-9_$#@~.?]*:"}],relevance:0},{className:"subst",begin:"%[0-9]+",relevance:0},{className:"subst",begin:"%!S+",relevance:0},{className:"meta",begin:/^\s*\.[\w_-]+/}]}}}());hljs.registerLanguage("kotlin",function(){"use strict";return function(e){var n={keyword:"abstract as val var vararg get set class object open private protected public noinline crossinline dynamic final enum if else do while for when throw try catch finally import package is in fun override companion reified inline lateinit init interface annotation data sealed internal infix operator out by constructor super tailrec where const inner suspend typealias external expect actual trait volatile transient native default",built_in:"Byte Short Char Int Long Boolean Float Double Void Unit Nothing",literal:"true false null"},a={className:"symbol",begin:e.UNDERSCORE_IDENT_RE+"@"},i={className:"subst",begin:"\\${",end:"}",contains:[e.C_NUMBER_MODE]},s={className:"variable",begin:"\\$"+e.UNDERSCORE_IDENT_RE},t={className:"string",variants:[{begin:'"""',end:'"""(?=[^"])',contains:[s,i]},{begin:"'",end:"'",illegal:/\n/,contains:[e.BACKSLASH_ESCAPE]},{begin:'"',end:'"',illegal:/\n/,contains:[e.BACKSLASH_ESCAPE,s,i]}]};i.contains.push(t);var r={className:"meta",begin:"@(?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:(?:\\s*"+e.UNDERSCORE_IDENT_RE+")?"},l={className:"meta",begin:"@"+e.UNDERSCORE_IDENT_RE,contains:[{begin:/$/,end:/$/,contains:[e.inherit(t,{className:"meta-string"})]}]},c=e.COMMENT("/\\*","\\*/",{contains:[e.C_BLOCK_COMMENT_MODE]}),o={variants:[{className:"type",begin:e.UNDERSCORE_IDENT_RE},{begin:/$/,end:/$/,contains:[]}]},d=o;return d.variants[1].contains=[o],o.variants[1].contains=[d],{name:"Kotlin",aliases:["kt"],keywords:n,contains:[e.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{className:"doctag",begin:"@[A-Za-z]+"}]}),e.C_LINE_COMMENT_MODE,c,{className:"keyword",begin:/\b(break|continue|return|this)\b/,starts:{contains:[{className:"symbol",begin:/@\w+/}]}},a,r,l,{className:"function",beginKeywords:"fun",end:"[(]|$",returnBegin:!0,excludeEnd:!0,keywords:n,illegal:/fun\s+(<.*>)?[^\s$]+(\s+[^\s\(]+)\s*=/,relevance:5,contains:[{begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"type",begin:/</,end:/>/,keywords:"reified",relevance:0},{className:"params",begin:/\(/,end:/$/,endsParent:!0,keywords:n,relevance:0,contains:[{begin:/:/,end:/[=,\/]/,endsWithParent:!0,contains:[o,e.C_LINE_COMMENT_MODE,c],relevance:0},e.C_LINE_COMMENT_MODE,c,r,l,t,e.C_NUMBER_MODE]},c]},{className:"class",beginKeywords:"class interface trait",end:/[:\{(]|$/,excludeEnd:!0,illegal:"extends implements",contains:[{beginKeywords:"public protected internal private constructor"},e.UNDERSCORE_TITLE_MODE,{className:"type",begin:/</,end:/>/,excludeBegin:!0,excludeEnd:!0,relevance:0},{className:"type",begin:/[,:]\s*/,end:/[<\(,]|$/,excludeBegin:!0,returnEnd:!0},r,l]},t,{className:"meta",begin:"^#!/usr/bin/env",end:"$",illegal:"\n"},{className:"number",begin:"\\b(0[bB]([01]+[01_]+[01]+|[01]+)|0[xX]([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)|(([\\d]+[\\d_]+[\\d]+|[\\d]+)(\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))?|\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))([eE][-+]?\\d+)?)[lLfF]?",relevance:0}]}}}());hljs.registerLanguage("armasm",function(){"use strict";return function(s){const e={variants:[s.COMMENT("^[ \\t]*(?=#)","$",{relevance:0,excludeBegin:!0}),s.COMMENT("[;@]","$",{relevance:0}),s.C_LINE_COMMENT_MODE,s.C_BLOCK_COMMENT_MODE]};return{name:"ARM Assembly",case_insensitive:!0,aliases:["arm"],keywords:{$pattern:"\\.?"+s.IDENT_RE,meta:".2byte .4byte .align .ascii .asciz .balign .byte .code .data .else .end .endif .endm .endr .equ .err .exitm .extern .global .hword .if .ifdef .ifndef .include .irp .long .macro .rept .req .section .set .skip .space .text .word .arm .thumb .code16 .code32 .force_thumb .thumb_func .ltorg ALIAS ALIGN ARM AREA ASSERT ATTR CN CODE CODE16 CODE32 COMMON CP DATA DCB DCD DCDU DCDO DCFD DCFDU DCI DCQ DCQU DCW DCWU DN ELIF ELSE END ENDFUNC ENDIF ENDP ENTRY EQU EXPORT EXPORTAS EXTERN FIELD FILL FUNCTION GBLA GBLL GBLS GET GLOBAL IF IMPORT INCBIN INCLUDE INFO KEEP LCLA LCLL LCLS LTORG MACRO MAP MEND MEXIT NOFP OPT PRESERVE8 PROC QN READONLY RELOC REQUIRE REQUIRE8 RLIST FN ROUT SETA SETL SETS SN SPACE SUBT THUMB THUMBX TTL WHILE WEND ",built_in:"r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 r15 pc lr sp ip sl sb fp a1 a2 a3 a4 v1 v2 v3 v4 v5 v6 v7 v8 f0 f1 f2 f3 f4 f5 f6 f7 p0 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 q0 q1 q2 q3 q4 q5 q6 q7 q8 q9 q10 q11 q12 q13 q14 q15 cpsr_c cpsr_x cpsr_s cpsr_f cpsr_cx cpsr_cxs cpsr_xs cpsr_xsf cpsr_sf cpsr_cxsf spsr_c spsr_x spsr_s spsr_f spsr_cx spsr_cxs spsr_xs spsr_xsf spsr_sf spsr_cxsf s0 s1 s2 s3 s4 s5 s6 s7 s8 s9 s10 s11 s12 s13 s14 s15 s16 s17 s18 s19 s20 s21 s22 s23 s24 s25 s26 s27 s28 s29 s30 s31 d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 d10 d11 d12 d13 d14 d15 d16 d17 d18 d19 d20 d21 d22 d23 d24 d25 d26 d27 d28 d29 d30 d31 {PC} {VAR} {TRUE} {FALSE} {OPT} {CONFIG} {ENDIAN} {CODESIZE} {CPU} {FPU} {ARCHITECTURE} {PCSTOREOFFSET} {ARMASM_VERSION} {INTER} {ROPI} {RWPI} {SWST} {NOSWST} . @"},contains:[{className:"keyword",begin:"\\b(adc|(qd?|sh?|u[qh]?)?add(8|16)?|usada?8|(q|sh?|u[qh]?)?(as|sa)x|and|adrl?|sbc|rs[bc]|asr|b[lx]?|blx|bxj|cbn?z|tb[bh]|bic|bfc|bfi|[su]bfx|bkpt|cdp2?|clz|clrex|cmp|cmn|cpsi[ed]|cps|setend|dbg|dmb|dsb|eor|isb|it[te]{0,3}|lsl|lsr|ror|rrx|ldm(([id][ab])|f[ds])?|ldr((s|ex)?[bhd])?|movt?|mvn|mra|mar|mul|[us]mull|smul[bwt][bt]|smu[as]d|smmul|smmla|mla|umlaal|smlal?([wbt][bt]|d)|mls|smlsl?[ds]|smc|svc|sev|mia([bt]{2}|ph)?|mrr?c2?|mcrr2?|mrs|msr|orr|orn|pkh(tb|bt)|rbit|rev(16|sh)?|sel|[su]sat(16)?|nop|pop|push|rfe([id][ab])?|stm([id][ab])?|str(ex)?[bhd]?|(qd?)?sub|(sh?|q|u[qh]?)?sub(8|16)|[su]xt(a?h|a?b(16)?)|srs([id][ab])?|swpb?|swi|smi|tst|teq|wfe|wfi|yield)(eq|ne|cs|cc|mi|pl|vs|vc|hi|ls|ge|lt|gt|le|al|hs|lo)?[sptrx]?(?=\\s)"},e,s.QUOTE_STRING_MODE,{className:"string",begin:"'",end:"[^\\\\]'",relevance:0},{className:"title",begin:"\\|",end:"\\|",illegal:"\\n",relevance:0},{className:"number",variants:[{begin:"[#$=]?0x[0-9a-f]+"},{begin:"[#$=]?0b[01]+"},{begin:"[#$=]\\d+"},{begin:"\\b\\d+"}],relevance:0},{className:"symbol",variants:[{begin:"^[ \\t]*[a-z_\\.\\$][a-z0-9_\\.\\$]+:"},{begin:"^[a-z_\\.\\$][a-z0-9_\\.\\$]+"},{begin:"[=#]\\w+"}],relevance:0}]}}}());hljs.registerLanguage("go",function(){"use strict";return function(e){var n={keyword:"break default func interface select case map struct chan else goto package switch const fallthrough if range type continue for import return var go defer bool byte complex64 complex128 float32 float64 int8 int16 int32 int64 string uint8 uint16 uint32 uint64 int uint uintptr rune",literal:"true false iota nil",built_in:"append cap close complex copy imag len make new panic print println real recover delete"};return{name:"Go",aliases:["golang"],keywords:n,illegal:"</",contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"string",variants:[e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,{begin:"`",end:"`"}]},{className:"number",variants:[{begin:e.C_NUMBER_RE+"[i]",relevance:1},e.C_NUMBER_MODE]},{begin:/:=/},{className:"function",beginKeywords:"func",end:"\\s*(\\{|$)",excludeEnd:!0,contains:[e.TITLE_MODE,{className:"params",begin:/$/,end:/$/,keywords:n,illegal:/["']/}]}]}}}());hljs.registerLanguage("diff",function(){"use strict";return function(e){return{name:"Diff",aliases:["patch"],contains:[{className:"meta",relevance:10,variants:[{begin:/^@@ +\-\d+,\d+ +\+\d+,\d+ +@@$/},{begin:/^\*\*\* +\d+,\d+ +\*\*\*\*$/},{begin:/^\-\-\- +\d+,\d+ +\-\-\-\-$/}]},{className:"comment",variants:[{begin:/Index: /,end:/$/},{begin:/={3,}/,end:/$/},{begin:/^\-{3}/,end:/$/},{begin:/^\*{3} /,end:/$/},{begin:/^\+{3}/,end:/$/},{begin:/^\*{15}$/}]},{className:"addition",begin:"^\\+",end:"$"},{className:"deletion",begin:"^\\-",end:"$"},{className:"addition",begin:"^\\!",end:"$"}]}}}());hljs.registerLanguage("python",function(){"use strict";return function(e){var n={keyword:"and elif is global as in if from raise for except finally print import pass return exec else break not with class assert yield try while continue del or def lambda async await nonlocal|10",built_in:"Ellipsis NotImplemented",literal:"False None True"},a={className:"meta",begin:/^(>>>|\.\.\.) /},i={className:"subst",begin:/\{/,end:/\}/,keywords:n,illegal:/#/},s={begin:/\{\{/,relevance:0},r={className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[{begin:/(u|b)?r?'''/,end:/'''/,contains:[e.BACKSLASH_ESCAPE,a],relevance:10},{begin:/(u|b)?r?"""/,end:/"""/,contains:[e.BACKSLASH_ESCAPE,a],relevance:10},{begin:/(fr|rf|f)'''/,end:/'''/,contains:[e.BACKSLASH_ESCAPE,a,s,i]},{begin:/(fr|rf|f)"""/,end:/"""/,contains:[e.BACKSLASH_ESCAPE,a,s,i]},{begin:/(u|r|ur)'/,end:/'/,relevance:10},{begin:/(u|r|ur)"/,end:/"/,relevance:10},{begin:/(b|br)'/,end:/'/},{begin:/(b|br)"/,end:/"/},{begin:/(fr|rf|f)'/,end:/'/,contains:[e.BACKSLASH_ESCAPE,s,i]},{begin:/(fr|rf|f)"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,s,i]},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},l={className:"number",relevance:0,variants:[{begin:e.BINARY_NUMBER_RE+"[lLjJ]?"},{begin:"\\b(0o[0-7]+)[lLjJ]?"},{begin:e.C_NUMBER_RE+"[lLjJ]?"}]},t={className:"params",variants:[{begin:/$\s*$/,skip:!0,className:null},{begin:/$/,end:/$/,excludeBegin:!0,excludeEnd:!0,contains:["self",a,l,r,e.HASH_COMMENT_MODE]}]};return i.contains=[r,l,a],{name:"Python",aliases:["py","gyp","ipython"],keywords:n,illegal:/(<\/|->|\?)|=>/,contains:[a,l,{beginKeywords:"if",relevance:0},r,e.HASH_COMMENT_MODE,{variants:[{className:"function",beginKeywords:"def"},{className:"class",beginKeywords:"class"}],end:/:/,illegal:/[${=;\n,]/,contains:[e.UNDERSCORE_TITLE_MODE,t,{begin:/->/,endsWithParent:!0,keywords:"None"}]},{className:"meta",begin:/^[\t ]*@/,end:/$/},{begin:/\b(print|exec)\(/}]}}}());hljs.registerLanguage("shell",function(){"use strict";return function(s){return{name:"Shell Session",aliases:["console"],contains:[{className:"meta",begin:"^\\s{0,3}[/\\w\\d\\[\\]()@-]*[>%$#]",starts:{end:"$",subLanguage:"bash"}}]}}}());hljs.registerLanguage("scala",function(){"use strict";return function(e){var n={className:"subst",variants:[{begin:"\\$[A-Za-z0-9_]+"},{begin:"\\${",end:"}"}]},a={className:"string",variants:[{begin:'"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},{begin:'"""',end:'"""',relevance:10},{begin:'[a-z]+"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE,n]},{className:"string",begin:'[a-z]+"""',end:'"""',contains:[n],relevance:10}]},s={className:"type",begin:"\\b[A-Z][A-Za-z0-9_]*",relevance:0},t={className:"title",begin:/[^0-9\n\t "'(),.`{}\[\]:;][^\n\t "'(),.`{}\[\]:;]+|[^0-9\n\t "'(),.`{}\[\]:;=]/,relevance:0},i={className:"class",beginKeywords:"class object trait type",end:/[:={\[\n;]/,excludeEnd:!0,contains:[{beginKeywords:"extends with",relevance:10},{begin:/\[/,end:/\]/,excludeBegin:!0,excludeEnd:!0,relevance:0,contains:[s]},{className:"params",begin:/$/,end:/$/,excludeBegin:!0,excludeEnd:!0,relevance:0,contains:[s]},t]},l={className:"function",beginKeywords:"def",end:/[:={\[(\n;]/,excludeEnd:!0,contains:[t]};return{name:"Scala",keywords:{literal:"true false null",keyword:"type yield lazy override def with val var sealed abstract private trait object if forSome for while throw finally protected extends import final return else break new catch super class case package default try this match continue throws implicit"},contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,{className:"symbol",begin:"'\\w[\\w\\d_]*(?!')"},s,l,i,e.C_NUMBER_MODE,{className:"meta",begin:"@[A-Za-z]+"}]}}}());hljs.registerLanguage("julia",function(){"use strict";return function(e){var r="[A-Za-z_\\u00A1-\\uFFFF][A-Za-z_0-9\\u00A1-\\uFFFF]*",t={$pattern:r,keyword:"in isa where baremodule begin break catch ccall const continue do else elseif end export false finally for function global if import importall let local macro module quote return true try using while type immutable abstract bitstype typealias ",literal:"true false ARGS C_NULL DevNull ENDIAN_BOM ENV I Inf Inf16 Inf32 Inf64 InsertionSort JULIA_HOME LOAD_PATH MergeSort NaN NaN16 NaN32 NaN64 PROGRAM_FILE QuickSort RoundDown RoundFromZero RoundNearest RoundNearestTiesAway RoundNearestTiesUp RoundToZero RoundUp STDERR STDIN STDOUT VERSION catalan e|0 eu|0 eulergamma golden im nothing pi γ π φ ",built_in:"ANY AbstractArray AbstractChannel AbstractFloat AbstractMatrix AbstractRNG AbstractSerializer AbstractSet AbstractSparseArray AbstractSparseMatrix AbstractSparseVector AbstractString AbstractUnitRange AbstractVecOrMat AbstractVector Any ArgumentError Array AssertionError Associative Base64DecodePipe Base64EncodePipe Bidiagonal BigFloat BigInt BitArray BitMatrix BitVector Bool BoundsError BufferStream CachingPool CapturedException CartesianIndex CartesianRange Cchar Cdouble Cfloat Channel Char Cint Cintmax_t Clong Clonglong ClusterManager Cmd CodeInfo Colon Complex Complex128 Complex32 Complex64 CompositeException Condition ConjArray ConjMatrix ConjVector Cptrdiff_t Cshort Csize_t Cssize_t Cstring Cuchar Cuint Cuintmax_t Culong Culonglong Cushort Cwchar_t Cwstring DataType Date DateFormat DateTime DenseArray DenseMatrix DenseVecOrMat DenseVector Diagonal Dict DimensionMismatch Dims DirectIndexString Display DivideError DomainError EOFError EachLine Enum Enumerate ErrorException Exception ExponentialBackOff Expr Factorization FileMonitor Float16 Float32 Float64 Function Future GlobalRef GotoNode HTML Hermitian IO IOBuffer IOContext IOStream IPAddr IPv4 IPv6 IndexCartesian IndexLinear IndexStyle InexactError InitError Int Int128 Int16 Int32 Int64 Int8 IntSet Integer InterruptException InvalidStateException Irrational KeyError LabelNode LinSpace LineNumberNode LoadError LowerTriangular MIME Matrix MersenneTwister Method MethodError MethodTable Module NTuple NewvarNode NullException Nullable Number ObjectIdDict OrdinalRange OutOfMemoryError OverflowError Pair ParseError PartialQuickSort PermutedDimsArray Pipe PollingFileWatcher ProcessExitedException Ptr QuoteNode RandomDevice Range RangeIndex Rational RawFD ReadOnlyMemoryError Real ReentrantLock Ref Regex RegexMatch RemoteChannel RemoteException RevString RoundingMode RowVector SSAValue SegmentationFault SerializationState Set SharedArray SharedMatrix SharedVector Signed SimpleVector Slot SlotNumber SparseMatrixCSC SparseVector StackFrame StackOverflowError StackTrace StepRange StepRangeLen StridedArray StridedMatrix StridedVecOrMat StridedVector String SubArray SubString SymTridiagonal Symbol Symmetric SystemError TCPSocket Task Text TextDisplay Timer Tridiagonal Tuple Type TypeError TypeMapEntry TypeMapLevel TypeName TypeVar TypedSlot UDPSocket UInt UInt128 UInt16 UInt32 UInt64 UInt8 UndefRefError UndefVarError UnicodeError UniformScaling Union UnionAll UnitRange Unsigned UpperTriangular Val Vararg VecElement VecOrMat Vector VersionNumber Void WeakKeyDict WeakRef WorkerConfig WorkerPool "},a={keywords:t,illegal:/<\//},n={className:"subst",begin:/\$$/,end:/$/,keywords:t},o={className:"variable",begin:"\\$"+r},i={className:"string",contains:[e.BACKSLASH_ESCAPE,n,o],variants:[{begin:/\w*"""/,end:/"""\w*/,relevance:10},{begin:/\w*"/,end:/"\w*/}]},l={className:"string",contains:[e.BACKSLASH_ESCAPE,n,o],begin:"`",end:"`"},s={className:"meta",begin:"@"+r};return a.name="Julia",a.contains=[{className:"number",begin:/(\b0x[\d_]*(\.[\d_]*)?|0x\.\d[\d_]*)p[-+]?\d+|\b0[box][a-fA-F0-9][a-fA-F0-9_]*|(\b\d[\d_]*(\.[\d_]*)?|\.\d[\d_]*)([eEfF][-+]?\d+)?/,relevance:0},{className:"string",begin:/'(.|\\[xXuU][a-zA-Z0-9]+)'/},i,l,s,{className:"comment",variants:[{begin:"#=",end:"=#",relevance:10},{begin:"#",end:"$"}]},e.HASH_COMMENT_MODE,{className:"keyword",begin:"\\b(((abstract|primitive)\\s+)type|(mutable\\s+)?struct)\\b"},{begin:/<:/}],n.contains=a.contains,a}}());hljs.registerLanguage("php-template",function(){"use strict";return function(n){return{name:"PHP template",subLanguage:"xml",contains:[{begin:/<\?(php|=)?/,end:/\?>/,subLanguage:"php",contains:[{begin:"/\\*",end:"\\*/",skip:!0},{begin:'b"',end:'"',skip:!0},{begin:"b'",end:"'",skip:!0},n.inherit(n.APOS_STRING_MODE,{illegal:null,className:null,contains:null,skip:!0}),n.inherit(n.QUOTE_STRING_MODE,{illegal:null,className:null,contains:null,skip:!0})]}]}}}());hljs.registerLanguage("scss",function(){"use strict";return function(e){var t={className:"variable",begin:"(\\$[a-zA-Z-][a-zA-Z0-9_-]*)\\b"},i={className:"number",begin:"#[0-9A-Fa-f]+"};return e.CSS_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,e.C_BLOCK_COMMENT_MODE,{name:"SCSS",case_insensitive:!0,illegal:"[=/|']",contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"selector-id",begin:"\\#[A-Za-z0-9_-]+",relevance:0},{className:"selector-class",begin:"\\.[A-Za-z0-9_-]+",relevance:0},{className:"selector-attr",begin:"\\[",end:"\\]",illegal:"$"},{className:"selector-tag",begin:"\\b(a|abbr|acronym|address|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|command|datalist|dd|del|details|dfn|div|dl|dt|em|embed|fieldset|figcaption|figure|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|keygen|label|legend|li|link|map|mark|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|rp|rt|ruby|samp|script|section|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video)\\b",relevance:0},{className:"selector-pseudo",begin:":(visited|valid|root|right|required|read-write|read-only|out-range|optional|only-of-type|only-child|nth-of-type|nth-last-of-type|nth-last-child|nth-child|not|link|left|last-of-type|last-child|lang|invalid|indeterminate|in-range|hover|focus|first-of-type|first-line|first-letter|first-child|first|enabled|empty|disabled|default|checked|before|after|active)"},{className:"selector-pseudo",begin:"::(after|before|choices|first-letter|first-line|repeat-index|repeat-item|selection|value)"},t,{className:"attribute",begin:"\\b(src|z-index|word-wrap|word-spacing|word-break|width|widows|white-space|visibility|vertical-align|unicode-bidi|transition-timing-function|transition-property|transition-duration|transition-delay|transition|transform-style|transform-origin|transform|top|text-underline-position|text-transform|text-shadow|text-rendering|text-overflow|text-indent|text-decoration-style|text-decoration-line|text-decoration-color|text-decoration|text-align-last|text-align|tab-size|table-layout|right|resize|quotes|position|pointer-events|perspective-origin|perspective|page-break-inside|page-break-before|page-break-after|padding-top|padding-right|padding-left|padding-bottom|padding|overflow-y|overflow-x|overflow-wrap|overflow|outline-width|outline-style|outline-offset|outline-color|outline|orphans|order|opacity|object-position|object-fit|normal|none|nav-up|nav-right|nav-left|nav-index|nav-down|min-width|min-height|max-width|max-height|mask|marks|margin-top|margin-right|margin-left|margin-bottom|margin|list-style-type|list-style-position|list-style-image|list-style|line-height|letter-spacing|left|justify-content|initial|inherit|ime-mode|image-orientation|image-resolution|image-rendering|icon|hyphens|height|font-weight|font-variant-ligatures|font-variant|font-style|font-stretch|font-size-adjust|font-size|font-language-override|font-kerning|font-feature-settings|font-family|font|float|flex-wrap|flex-shrink|flex-grow|flex-flow|flex-direction|flex-basis|flex|filter|empty-cells|display|direction|cursor|counter-reset|counter-increment|content|column-width|column-span|column-rule-width|column-rule-style|column-rule-color|column-rule|column-gap|column-fill|column-count|columns|color|clip-path|clip|clear|caption-side|break-inside|break-before|break-after|box-sizing|box-shadow|box-decoration-break|bottom|border-width|border-top-width|border-top-style|border-top-right-radius|border-top-left-radius|border-top-color|border-top|border-style|border-spacing|border-right-width|border-right-style|border-right-color|border-right|border-radius|border-left-width|border-left-style|border-left-color|border-left|border-image-width|border-image-source|border-image-slice|border-image-repeat|border-image-outset|border-image|border-color|border-collapse|border-bottom-width|border-bottom-style|border-bottom-right-radius|border-bottom-left-radius|border-bottom-color|border-bottom|border|background-size|background-repeat|background-position|background-origin|background-image|background-color|background-clip|background-attachment|background-blend-mode|background|backface-visibility|auto|animation-timing-function|animation-play-state|animation-name|animation-iteration-count|animation-fill-mode|animation-duration|animation-direction|animation-delay|animation|align-self|align-items|align-content)\\b",illegal:"[^\\s]"},{begin:"\\b(whitespace|wait|w-resize|visible|vertical-text|vertical-ideographic|uppercase|upper-roman|upper-alpha|underline|transparent|top|thin|thick|text|text-top|text-bottom|tb-rl|table-header-group|table-footer-group|sw-resize|super|strict|static|square|solid|small-caps|separate|se-resize|scroll|s-resize|rtl|row-resize|ridge|right|repeat|repeat-y|repeat-x|relative|progress|pointer|overline|outside|outset|oblique|nowrap|not-allowed|normal|none|nw-resize|no-repeat|no-drop|newspaper|ne-resize|n-resize|move|middle|medium|ltr|lr-tb|lowercase|lower-roman|lower-alpha|loose|list-item|line|line-through|line-edge|lighter|left|keep-all|justify|italic|inter-word|inter-ideograph|inside|inset|inline|inline-block|inherit|inactive|ideograph-space|ideograph-parenthesis|ideograph-numeric|ideograph-alpha|horizontal|hidden|help|hand|groove|fixed|ellipsis|e-resize|double|dotted|distribute|distribute-space|distribute-letter|distribute-all-lines|disc|disabled|default|decimal|dashed|crosshair|collapse|col-resize|circle|char|center|capitalize|break-word|break-all|bottom|both|bolder|bold|block|bidi-override|below|baseline|auto|always|all-scroll|absolute|table|table-cell)\\b"},{begin:":",end:";",contains:[t,i,e.CSS_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,{className:"meta",begin:"!important"}]},{begin:"@(page|font-face)",lexemes:"@[a-z-]+",keywords:"@page @font-face"},{begin:"@",end:"[{;]",returnBegin:!0,keywords:"and or not only",contains:[{begin:"@[a-z-]+",className:"keyword"},t,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,i,e.CSS_NUMBER_MODE]}]}}}());hljs.registerLanguage("r",function(){"use strict";return function(e){var n="([a-zA-Z]|\\.[a-zA-Z.])[a-zA-Z0-9._]*";return{name:"R",contains:[e.HASH_COMMENT_MODE,{begin:n,keywords:{$pattern:n,keyword:"function if in break next repeat else for return switch while try tryCatch stop warning require library attach detach source setMethod setGeneric setGroupGeneric setClass ...",literal:"NULL NA TRUE FALSE T F Inf NaN NA_integer_|10 NA_real_|10 NA_character_|10 NA_complex_|10"},relevance:0},{className:"number",begin:"0[xX][0-9a-fA-F]+[Li]?\\b",relevance:0},{className:"number",begin:"\\d+(?:[eE][+\\-]?\\d*)?L\\b",relevance:0},{className:"number",begin:"\\d+\\.(?!\\d)(?:i\\b)?",relevance:0},{className:"number",begin:"\\d+(?:\\.\\d*)?(?:[eE][+\\-]?\\d*)?i?\\b",relevance:0},{className:"number",begin:"\\.\\d+(?:[eE][+\\-]?\\d*)?i?\\b",relevance:0},{begin:"`",end:"`",relevance:0},{className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[{begin:'"',end:'"'},{begin:"'",end:"'"}]}]}}}());hljs.registerLanguage("sql",function(){"use strict";return function(e){var t=e.COMMENT("--","$");return{name:"SQL",case_insensitive:!0,illegal:/[<>{}*]/,contains:[{beginKeywords:"begin end start commit rollback savepoint lock alter create drop rename call delete do handler insert load replace select truncate update set show pragma grant merge describe use explain help declare prepare execute deallocate release unlock purge reset change stop analyze cache flush optimize repair kill install uninstall checksum restore check backup revoke comment values with",end:/;/,endsWithParent:!0,keywords:{$pattern:/[\w\.]+/,keyword:"as abort abs absolute acc acce accep accept access accessed accessible account acos action activate add addtime admin administer advanced advise aes_decrypt aes_encrypt after agent aggregate ali alia alias all allocate allow alter always analyze ancillary and anti any anydata anydataset anyschema anytype apply archive archived archivelog are as asc ascii asin assembly assertion associate asynchronous at atan atn2 attr attri attrib attribu attribut attribute attributes audit authenticated authentication authid authors auto autoallocate autodblink autoextend automatic availability avg backup badfile basicfile before begin beginning benchmark between bfile bfile_base big bigfile bin binary_double binary_float binlog bit_and bit_count bit_length bit_or bit_xor bitmap blob_base block blocksize body both bound bucket buffer_cache buffer_pool build bulk by byte byteordermark bytes cache caching call calling cancel capacity cascade cascaded case cast catalog category ceil ceiling chain change changed char_base char_length character_length characters characterset charindex charset charsetform charsetid check checksum checksum_agg child choose chr chunk class cleanup clear client clob clob_base clone close cluster_id cluster_probability cluster_set clustering coalesce coercibility col collate collation collect colu colum column column_value columns columns_updated comment commit compact compatibility compiled complete composite_limit compound compress compute concat concat_ws concurrent confirm conn connec connect connect_by_iscycle connect_by_isleaf connect_by_root connect_time connection consider consistent constant constraint constraints constructor container content contents context contributors controlfile conv convert convert_tz corr corr_k corr_s corresponding corruption cos cost count count_big counted covar_pop covar_samp cpu_per_call cpu_per_session crc32 create creation critical cross cube cume_dist curdate current current_date current_time current_timestamp current_user cursor curtime customdatum cycle data database databases datafile datafiles datalength date_add date_cache date_format date_sub dateadd datediff datefromparts datename datepart datetime2fromparts day day_to_second dayname dayofmonth dayofweek dayofyear days db_role_change dbtimezone ddl deallocate declare decode decompose decrement decrypt deduplicate def defa defau defaul default defaults deferred defi defin define degrees delayed delegate delete delete_all delimited demand dense_rank depth dequeue des_decrypt des_encrypt des_key_file desc descr descri describ describe descriptor deterministic diagnostics difference dimension direct_load directory disable disable_all disallow disassociate discardfile disconnect diskgroup distinct distinctrow distribute distributed div do document domain dotnet double downgrade drop dumpfile duplicate duration each edition editionable editions element ellipsis else elsif elt empty enable enable_all enclosed encode encoding encrypt end end-exec endian enforced engine engines enqueue enterprise entityescaping eomonth error errors escaped evalname evaluate event eventdata events except exception exceptions exchange exclude excluding execu execut execute exempt exists exit exp expire explain explode export export_set extended extent external external_1 external_2 externally extract failed failed_login_attempts failover failure far fast feature_set feature_value fetch field fields file file_name_convert filesystem_like_logging final finish first first_value fixed flash_cache flashback floor flush following follows for forall force foreign form forma format found found_rows freelist freelists freepools fresh from from_base64 from_days ftp full function general generated get get_format get_lock getdate getutcdate global global_name globally go goto grant grants greatest group group_concat group_id grouping grouping_id groups gtid_subtract guarantee guard handler hash hashkeys having hea head headi headin heading heap help hex hierarchy high high_priority hosts hour hours http id ident_current ident_incr ident_seed identified identity idle_time if ifnull ignore iif ilike ilm immediate import in include including increment index indexes indexing indextype indicator indices inet6_aton inet6_ntoa inet_aton inet_ntoa infile initial initialized initially initrans inmemory inner innodb input insert install instance instantiable instr interface interleaved intersect into invalidate invisible is is_free_lock is_ipv4 is_ipv4_compat is_not is_not_null is_used_lock isdate isnull isolation iterate java join json json_exists keep keep_duplicates key keys kill language large last last_day last_insert_id last_value lateral lax lcase lead leading least leaves left len lenght length less level levels library like like2 like4 likec limit lines link list listagg little ln load load_file lob lobs local localtime localtimestamp locate locator lock locked log log10 log2 logfile logfiles logging logical logical_reads_per_call logoff logon logs long loop low low_priority lower lpad lrtrim ltrim main make_set makedate maketime managed management manual map mapping mask master master_pos_wait match matched materialized max maxextents maximize maxinstances maxlen maxlogfiles maxloghistory maxlogmembers maxsize maxtrans md5 measures median medium member memcompress memory merge microsecond mid migration min minextents minimum mining minus minute minutes minvalue missing mod mode model modification modify module monitoring month months mount move movement multiset mutex name name_const names nan national native natural nav nchar nclob nested never new newline next nextval no no_write_to_binlog noarchivelog noaudit nobadfile nocheck nocompress nocopy nocycle nodelay nodiscardfile noentityescaping noguarantee nokeep nologfile nomapping nomaxvalue nominimize nominvalue nomonitoring none noneditionable nonschema noorder nopr nopro noprom nopromp noprompt norely noresetlogs noreverse normal norowdependencies noschemacheck noswitch not nothing notice notnull notrim novalidate now nowait nth_value nullif nulls num numb numbe nvarchar nvarchar2 object ocicoll ocidate ocidatetime ociduration ociinterval ociloblocator ocinumber ociref ocirefcursor ocirowid ocistring ocitype oct octet_length of off offline offset oid oidindex old on online only opaque open operations operator optimal optimize option optionally or oracle oracle_date oradata ord ordaudio orddicom orddoc order ordimage ordinality ordvideo organization orlany orlvary out outer outfile outline output over overflow overriding package pad parallel parallel_enable parameters parent parse partial partition partitions pascal passing password password_grace_time password_lock_time password_reuse_max password_reuse_time password_verify_function patch path patindex pctincrease pctthreshold pctused pctversion percent percent_rank percentile_cont percentile_disc performance period period_add period_diff permanent physical pi pipe pipelined pivot pluggable plugin policy position post_transaction pow power pragma prebuilt precedes preceding precision prediction prediction_cost prediction_details prediction_probability prediction_set prepare present preserve prior priority private private_sga privileges procedural procedure procedure_analyze processlist profiles project prompt protection public publishingservername purge quarter query quick quiesce quota quotename radians raise rand range rank raw read reads readsize rebuild record records recover recovery recursive recycle redo reduced ref reference referenced references referencing refresh regexp_like register regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy reject rekey relational relative relaylog release release_lock relies_on relocate rely rem remainder rename repair repeat replace replicate replication required reset resetlogs resize resource respect restore restricted result result_cache resumable resume retention return returning returns reuse reverse revoke right rlike role roles rollback rolling rollup round row row_count rowdependencies rowid rownum rows rtrim rules safe salt sample save savepoint sb1 sb2 sb4 scan schema schemacheck scn scope scroll sdo_georaster sdo_topo_geometry search sec_to_time second seconds section securefile security seed segment select self semi sequence sequential serializable server servererror session session_user sessions_per_user set sets settings sha sha1 sha2 share shared shared_pool short show shrink shutdown si_averagecolor si_colorhistogram si_featurelist si_positionalcolor si_stillimage si_texture siblings sid sign sin size size_t sizes skip slave sleep smalldatetimefromparts smallfile snapshot some soname sort soundex source space sparse spfile split sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_small_result sql_variant_property sqlcode sqldata sqlerror sqlname sqlstate sqrt square standalone standby start starting startup statement static statistics stats_binomial_test stats_crosstab stats_ks_test stats_mode stats_mw_test stats_one_way_anova stats_t_test_ stats_t_test_indep stats_t_test_one stats_t_test_paired stats_wsr_test status std stddev stddev_pop stddev_samp stdev stop storage store stored str str_to_date straight_join strcmp strict string struct stuff style subdate subpartition subpartitions substitutable substr substring subtime subtring_index subtype success sum suspend switch switchoffset switchover sync synchronous synonym sys sys_xmlagg sysasm sysaux sysdate sysdatetimeoffset sysdba sysoper system system_user sysutcdatetime table tables tablespace tablesample tan tdo template temporary terminated tertiary_weights test than then thread through tier ties time time_format time_zone timediff timefromparts timeout timestamp timestampadd timestampdiff timezone_abbr timezone_minute timezone_region to to_base64 to_date to_days to_seconds todatetimeoffset trace tracking transaction transactional translate translation treat trigger trigger_nestlevel triggers trim truncate try_cast try_convert try_parse type ub1 ub2 ub4 ucase unarchived unbounded uncompress under undo unhex unicode uniform uninstall union unique unix_timestamp unknown unlimited unlock unnest unpivot unrecoverable unsafe unsigned until untrusted unusable unused update updated upgrade upped upper upsert url urowid usable usage use use_stored_outlines user user_data user_resources users using utc_date utc_timestamp uuid uuid_short validate validate_password_strength validation valist value values var var_samp varcharc vari varia variab variabl variable variables variance varp varraw varrawc varray verify version versions view virtual visible void wait wallet warning warnings week weekday weekofyear wellformed when whene whenev wheneve whenever where while whitespace window with within without work wrapped xdb xml xmlagg xmlattributes xmlcast xmlcolattval xmlelement xmlexists xmlforest xmlindex xmlnamespaces xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltype xor year year_to_month years yearweek",literal:"true false null unknown",built_in:"array bigint binary bit blob bool boolean char character date dec decimal float int int8 integer interval number numeric real record serial serial8 smallint text time timestamp tinyint varchar varchar2 varying void"},contains:[{className:"string",begin:"'",end:"'",contains:[{begin:"''"}]},{className:"string",begin:'"',end:'"',contains:[{begin:'""'}]},{className:"string",begin:"`",end:"`"},e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE,t,e.HASH_COMMENT_MODE]},e.C_BLOCK_COMMENT_MODE,t,e.HASH_COMMENT_MODE]}}}());hljs.registerLanguage("c",function(){"use strict";return function(e){var n=e.getLanguage("c-like").rawDefinition();return n.name="C",n.aliases=["c","h"],n}}());hljs.registerLanguage("json",function(){"use strict";return function(n){var e={literal:"true false null"},i=[n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE],t=[n.QUOTE_STRING_MODE,n.C_NUMBER_MODE],a={end:",",endsWithParent:!0,excludeEnd:!0,contains:t,keywords:e},l={begin:"{",end:"}",contains:[{className:"attr",begin:/"/,end:/"/,contains:[n.BACKSLASH_ESCAPE],illegal:"\\n"},n.inherit(a,{begin:/:/})].concat(i),illegal:"\\S"},s={begin:"\\[",end:"\\]",contains:[n.inherit(a)],illegal:"\\S"};return t.push(l,s),i.forEach((function(n){t.push(n)})),{name:"JSON",contains:t,keywords:e,illegal:"\\S"}}}());hljs.registerLanguage("python-repl",function(){"use strict";return function(n){return{aliases:["pycon"],contains:[{className:"meta",starts:{end:/ |$/,starts:{end:"$",subLanguage:"python"}},variants:[{begin:/^>>>(?=[ ]|$)/},{begin:/^\.\.\.(?=[ ]|$)/}]}]}}}());hljs.registerLanguage("markdown",function(){"use strict";return function(n){const e={begin:"<",end:">",subLanguage:"xml",relevance:0},a={begin:"\\[.+?\\][\$\\[].*?[\$\\]]",returnBegin:!0,contains:[{className:"string",begin:"\\[",end:"\\]",excludeBegin:!0,returnEnd:!0,relevance:0},{className:"link",begin:"\\]\$",end:"\$",excludeBegin:!0,excludeEnd:!0},{className:"symbol",begin:"\\]\\[",end:"\\]",excludeBegin:!0,excludeEnd:!0}],relevance:10},i={className:"strong",contains:[],variants:[{begin:/_{2}/,end:/_{2}/},{begin:/\*{2}/,end:/\*{2}/}]},s={className:"emphasis",contains:[],variants:[{begin:/\*(?!\*)/,end:/\*/},{begin:/_(?!_)/,end:/_/,relevance:0}]};i.contains.push(s),s.contains.push(i);var c=[e,a];return i.contains=i.contains.concat(c),s.contains=s.contains.concat(c),{name:"Markdown",aliases:["md","mkdown","mkd"],contains:[{className:"section",variants:[{begin:"^#{1,6}",end:"$",contains:c=c.concat(i,s)},{begin:"(?=^.+?\\n[=-]{2,}$)",contains:[{begin:"^[=-]*$"},{begin:"^",end:"\\n",contains:c}]}]},e,{className:"bullet",begin:"^[ \t]*([*+-]|(\\d+\\.))(?=\\s+)",end:"\\s+",excludeEnd:!0},i,s,{className:"quote",begin:"^>\\s+",contains:c,end:"$"},{className:"code",variants:[{begin:"(`{3,})(.|\\n)*?\\1`*[ ]*"},{begin:"(~{3,})(.|\\n)*?\\1~*[ ]*"},{begin:"```",end:"```+[ ]*$"},{begin:"~~~",end:"~~~+[ ]*$"},{begin:"`.+?`"},{begin:"(?=^( {4}|\\t))",contains:[{begin:"^( {4}|\\t)",end:"(\\n)$"}],relevance:0}]},{begin:"^[-\\*]{3,}",end:"$"},a,{begin:/^\[[^\n]+\]:/,returnBegin:!0,contains:[{className:"symbol",begin:/\[/,end:/\]/,excludeBegin:!0,excludeEnd:!0},{className:"link",begin:/:\s*/,end:/$/,excludeBegin:!0}]}]}}}());hljs.registerLanguage("javascript",function(){"use strict";const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],a=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["arguments","this","super","console","window","document","localStorage","module","global"],["Intl","DataView","Number","Math","Date","String","RegExp","Object","Function","Boolean","Error","Symbol","Set","Map","WeakSet","WeakMap","Proxy","Reflect","JSON","Promise","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Float32Array","Array","Uint8Array","Uint8ClampedArray","ArrayBuffer"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"]);function s(e){return r("(?=",e,")")}function r(...e){return e.map(e=>(function(e){return e?"string"==typeof e?e:e.source:null})(e)).join("")}return function(t){var i="[A-Za-z$_][0-9A-Za-z$_]*",c={begin:/<[A-Za-z0-9\\._:-]+/,end:/\/[A-Za-z0-9\\._:-]+>|\/>/},o={$pattern:"[A-Za-z$_][0-9A-Za-z$_]*",keyword:e.join(" "),literal:n.join(" "),built_in:a.join(" ")},l={className:"number",variants:[{begin:"\\b(0[bB][01]+)n?"},{begin:"\\b(0[oO][0-7]+)n?"},{begin:t.C_NUMBER_RE+"n?"}],relevance:0},E={className:"subst",begin:"\\$\\{",end:"\\}",keywords:o,contains:[]},d={begin:"html`",end:"",starts:{end:"`",returnEnd:!1,contains:[t.BACKSLASH_ESCAPE,E],subLanguage:"xml"}},g={begin:"css`",end:"",starts:{end:"`",returnEnd:!1,contains:[t.BACKSLASH_ESCAPE,E],subLanguage:"css"}},u={className:"string",begin:"`",end:"`",contains:[t.BACKSLASH_ESCAPE,E]};E.contains=[t.APOS_STRING_MODE,t.QUOTE_STRING_MODE,d,g,u,l,t.REGEXP_MODE];var b=E.contains.concat([{begin:/$/,end:/$/,contains:["self"].concat(E.contains,[t.C_BLOCK_COMMENT_MODE,t.C_LINE_COMMENT_MODE])},t.C_BLOCK_COMMENT_MODE,t.C_LINE_COMMENT_MODE]),_={className:"params",begin:/$/,end:/$/,excludeBegin:!0,excludeEnd:!0,contains:b};return{name:"JavaScript",aliases:["js","jsx","mjs","cjs"],keywords:o,contains:[t.SHEBANG({binary:"node",relevance:5}),{className:"meta",relevance:10,begin:/^\s*['"]use (strict|asm)['"]/},t.APOS_STRING_MODE,t.QUOTE_STRING_MODE,d,g,u,t.C_LINE_COMMENT_MODE,t.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{className:"doctag",begin:"@[A-Za-z]+",contains:[{className:"type",begin:"\\{",end:"\\}",relevance:0},{className:"variable",begin:i+"(?=\\s*(-)|$)",endsParent:!0,relevance:0},{begin:/(?=[^\n])\s/,relevance:0}]}]}),t.C_BLOCK_COMMENT_MODE,l,{begin:r(/[{,\n]\s*/,s(r(/(((\/\/.*)|(\/\*(.|\n)*\*\/))\s*)*/,i+"\\s*:"))),relevance:0,contains:[{className:"attr",begin:i+s("\\s*:"),relevance:0}]},{begin:"("+t.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",keywords:"return throw case",contains:[t.C_LINE_COMMENT_MODE,t.C_BLOCK_COMMENT_MODE,t.REGEXP_MODE,{className:"function",begin:"(\$[^(]*(\\([^(]*(\\([^(]*\$)?\\))?\\)|"+t.UNDERSCORE_IDENT_RE+")\\s*=>",returnBegin:!0,end:"\\s*=>",contains:[{className:"params",variants:[{begin:t.UNDERSCORE_IDENT_RE},{className:null,begin:/$\s*$/,skip:!0},{begin:/$/,end:/$/,excludeBegin:!0,excludeEnd:!0,keywords:o,contains:b}]}]},{begin:/,/,relevance:0},{className:"",begin:/\s/,end:/\s*/,skip:!0},{variants:[{begin:"<>",end:"</>"},{begin:c.begin,end:c.end}],subLanguage:"xml",contains:[{begin:c.begin,end:c.end,skip:!0,contains:["self"]}]}],relevance:0},{className:"function",beginKeywords:"function",end:/\{/,excludeEnd:!0,contains:[t.inherit(t.TITLE_MODE,{begin:i}),_],illegal:/\[|%/},{begin:/\$[(.]/},t.METHOD_GUARD,{className:"class",beginKeywords:"class",end:/[{;=]/,excludeEnd:!0,illegal:/[:"\[\]]/,contains:[{beginKeywords:"extends"},t.UNDERSCORE_TITLE_MODE]},{beginKeywords:"constructor",end:/\{/,excludeEnd:!0},{begin:"(get|set)\\s+(?="+i+"\$)",end:/{/,keywords:"get set",contains:[t.inherit(t.TITLE_MODE,{begin:i}),{begin:/\($/},_]}],illegal:/#(?!!)/}}}());hljs.registerLanguage("typescript",function(){"use strict";const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],a=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["arguments","this","super","console","window","document","localStorage","module","global"],["Intl","DataView","Number","Math","Date","String","RegExp","Object","Function","Boolean","Error","Symbol","Set","Map","WeakSet","WeakMap","Proxy","Reflect","JSON","Promise","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Float32Array","Array","Uint8Array","Uint8ClampedArray","ArrayBuffer"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"]);return function(r){var t={$pattern:"[A-Za-z$_][0-9A-Za-z$_]*",keyword:e.concat(["type","namespace","typedef","interface","public","private","protected","implements","declare","abstract","readonly"]).join(" "),literal:n.join(" "),built_in:a.concat(["any","void","number","boolean","string","object","never","enum"]).join(" ")},s={className:"meta",begin:"@[A-Za-z$_][0-9A-Za-z$_]*"},i={className:"number",variants:[{begin:"\\b(0[bB][01]+)n?"},{begin:"\\b(0[oO][0-7]+)n?"},{begin:r.C_NUMBER_RE+"n?"}],relevance:0},o={className:"subst",begin:"\\$\\{",end:"\\}",keywords:t,contains:[]},c={begin:"html`",end:"",starts:{end:"`",returnEnd:!1,contains:[r.BACKSLASH_ESCAPE,o],subLanguage:"xml"}},l={begin:"css`",end:"",starts:{end:"`",returnEnd:!1,contains:[r.BACKSLASH_ESCAPE,o],subLanguage:"css"}},E={className:"string",begin:"`",end:"`",contains:[r.BACKSLASH_ESCAPE,o]};o.contains=[r.APOS_STRING_MODE,r.QUOTE_STRING_MODE,c,l,E,i,r.REGEXP_MODE];var d={begin:"\$",end:/$/,keywords:t,contains:["self",r.QUOTE_STRING_MODE,r.APOS_STRING_MODE,r.NUMBER_MODE]},u={className:"params",begin:/$/,end:/$/,excludeBegin:!0,excludeEnd:!0,keywords:t,contains:[r.C_LINE_COMMENT_MODE,r.C_BLOCK_COMMENT_MODE,s,d]};return{name:"TypeScript",aliases:["ts"],keywords:t,contains:[r.SHEBANG(),{className:"meta",begin:/^\s*['"]use strict['"]/},r.APOS_STRING_MODE,r.QUOTE_STRING_MODE,c,l,E,r.C_LINE_COMMENT_MODE,r.C_BLOCK_COMMENT_MODE,i,{begin:"("+r.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",keywords:"return throw case",contains:[r.C_LINE_COMMENT_MODE,r.C_BLOCK_COMMENT_MODE,r.REGEXP_MODE,{className:"function",begin:"(\$[^(]*(\\([^(]*(\\([^(]*\$)?\\))?\\)|"+r.UNDERSCORE_IDENT_RE+")\\s*=>",returnBegin:!0,end:"\\s*=>",contains:[{className:"params",variants:[{begin:r.UNDERSCORE_IDENT_RE},{className:null,begin:/$\s*$/,skip:!0},{begin:/$/,end:/$/,excludeBegin:!0,excludeEnd:!0,keywords:t,contains:d.contains}]}]}],relevance:0},{className:"function",beginKeywords:"function",end:/[\{;]/,excludeEnd:!0,keywords:t,contains:["self",r.inherit(r.TITLE_MODE,{begin:"[A-Za-z$_][0-9A-Za-z$_]*"}),u],illegal:/%/,relevance:0},{beginKeywords:"constructor",end:/[\{;]/,excludeEnd:!0,contains:["self",u]},{begin:/module\./,keywords:{built_in:"module"},relevance:0},{beginKeywords:"module",end:/\{/,excludeEnd:!0},{beginKeywords:"interface",end:/\{/,excludeEnd:!0,keywords:"interface extends"},{begin:/\$[(.]/},{begin:"\\."+r.IDENT_RE,relevance:0},s,d]}}}());hljs.registerLanguage("plaintext",function(){"use strict";return function(t){return{name:"Plain text",aliases:["text","txt"],disableAutodetect:!0}}}());hljs.registerLanguage("less",function(){"use strict";return function(e){var n="([\\w-]+|@{[\\w-]+})",a=[],s=[],t=function(e){return{className:"string",begin:"~?"+e+".*?"+e}},r=function(e,n,a){return{className:e,begin:n,relevance:a}},i={begin:"\$",end:"\$",contains:s,relevance:0};s.push(e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,t("'"),t('"'),e.CSS_NUMBER_MODE,{begin:"(url|data-uri)\$",starts:{className:"string",end:"[\$\\n]",excludeEnd:!0}},r("number","#[0-9A-Fa-f]+\\b"),i,r("variable","@@?[\\w-]+",10),r("variable","@{[\\w-]+}"),r("built_in","~?`[^`]*?`"),{className:"attribute",begin:"[\\w-]+\\s*:",end:":",returnBegin:!0,excludeEnd:!0},{className:"meta",begin:"!important"});var c=s.concat({begin:"{",end:"}",contains:a}),l={beginKeywords:"when",endsWithParent:!0,contains:[{beginKeywords:"and not"}].concat(s)},o={begin:n+"\\s*:",returnBegin:!0,end:"[;}]",relevance:0,contains:[{className:"attribute",begin:n,end:":",excludeEnd:!0,starts:{endsWithParent:!0,illegal:"[<=$]",relevance:0,contains:s}}]},g={className:"keyword",begin:"@(import|media|charset|font-face|(-[a-z]+-)?keyframes|supports|document|namespace|page|viewport|host)\\b",starts:{end:"[;{}]",returnEnd:!0,contains:s,relevance:0}},d={className:"variable",variants:[{begin:"@[\\w-]+\\s*:",relevance:15},{begin:"@[\\w-]+"}],starts:{end:"[;}]",returnEnd:!0,contains:c}},b={variants:[{begin:"[\\.#:&\\[>]",end:"[;{}]"},{begin:n,end:"{"}],returnBegin:!0,returnEnd:!0,illegal:"[<='$\"]",relevance:0,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,l,r("keyword","all\\b"),r("variable","@{[\\w-]+}"),r("selector-tag",n+"%?",0),r("selector-id","#"+n),r("selector-class","\\."+n,0),r("selector-tag","&",0),{className:"selector-attr",begin:"\\[",end:"\\]"},{className:"selector-pseudo",begin:/:(:)?[a-zA-Z0-9\_\-\+"'.]+/},{begin:"\$",end:"\$",contains:c},{begin:"!important"}]};return a.push(e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,g,d,o,b),{name:"Less",case_insensitive:!0,illegal:"[=>'/<($\"]",contains:a}}}());hljs.registerLanguage("lua",function(){"use strict";return function(e){var t={begin:"\\[=*\\[",end:"\\]=*\\]",contains:["self"]},a=[e.COMMENT("--(?!\\[=*\\[)","$"),e.COMMENT("--\\[=*\\[","\\]=*\\]",{contains:[t],relevance:10})];return{name:"Lua",keywords:{$pattern:e.UNDERSCORE_IDENT_RE,literal:"true false nil",keyword:"and break do else elseif end for goto if in local not or repeat return then until while",built_in:"_G _ENV _VERSION __index __newindex __mode __call __metatable __tostring __len __gc __add __sub __mul __div __mod __pow __concat __unm __eq __lt __le assert collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstring module next pairs pcall print rawequal rawget rawset require select setfenv setmetatable tonumber tostring type unpack xpcall arg self coroutine resume yield status wrap create running debug getupvalue debug sethook getmetatable gethook setmetatable setlocal traceback setfenv getinfo setupvalue getlocal getregistry getfenv io lines write close flush open output type read stderr stdin input stdout popen tmpfile math log max acos huge ldexp pi cos tanh pow deg tan cosh sinh random randomseed frexp ceil floor rad abs sqrt modf asin min mod fmod log10 atan2 exp sin atan os exit setlocale date getenv difftime remove time clock tmpname rename execute package preload loadlib loaded loaders cpath config path seeall string sub upper len gfind rep find match char dump gmatch reverse byte format gsub lower table setn insert getn foreachi maxn foreach concat sort remove"},contains:a.concat([{className:"function",beginKeywords:"function",end:"\\)",contains:[e.inherit(e.TITLE_MODE,{begin:"([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*"}),{className:"params",begin:"\\(",endsWithParent:!0,contains:a}].concat(a)},e.C_NUMBER_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{className:"string",begin:"\\[=*\\[",end:"\\]=*\\]",contains:[t],relevance:5}])}}}());

book/theme/index.hbs+87−51

@@ -1,11 +1,11 @@

11<!DOCTYPE HTML>

2−<html lang="{{ language }}" class="sidebar-visible no-js {{ default_theme }}">

2+<html lang="{{ language }}" class="{{ default_theme }}" dir="{{ text_direction }}">

33 <head>

44

55 <meta charset="UTF-8">

66 <title>{{ title }}</title>

77 {{#if is_print }}

8− <meta name="robots" content="noindex" />

8+ <meta name="robots" content="noindex">

99 {{/if}}

1010 {{#if base_url}}

1111 <base href="{{ base_url }}">

@@ -15,10 +15,9 @@

1515

1616 {{> head}}

1717

18− <meta content="text/html; charset=utf-8" http-equiv="Content-Type">

1918 <meta name="description" content="{{ description }}">

2019 <meta name="viewport" content="width=device-width, initial-scale=1">

21− <meta name="theme-color" content="#ffffff" />

20+ <meta name="theme-color" content="#ffffff">

2221

2322 {{#if favicon_svg}}

2423 <link rel="icon" href="{{ path_to_root }}favicon.svg">

@@ -35,8 +34,6 @@

3534

3635

3736 <link rel="stylesheet" href="{{ path_to_root }}FontAwesome/css/font-awesome.css">

38− <link rel="preconnect" href="https://fonts.gstatic.com">

39− <link href="https://fonts.googleapis.com/css2?family=Inter:wght@200;400;500;700&display=swap" rel="stylesheet">

4037 {{#if copy_fonts}}

4138 <link rel="stylesheet" href="{{ path_to_root }}fonts/fonts.css">

4239 {{/if}}

@@ -53,18 +50,19 @@

5350

5451 {{#if mathjax_support}}

5552

56− <script async type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>

53+ <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>

5754 {{/if}}

5855 </head>

59− <body>

56+ <body class="sidebar-visible no-js">

57+ <div id="body-container">

6058

61− <script type="text/javascript">

59+ <script>

6260 var path_to_root = "{{ path_to_root }}";

6361 var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}";

6462 </script>

6563

6664

67− <script type="text/javascript">

65+ <script>

6866 try {

6967 var theme = localStorage.getItem('mdbook-theme');

7068 var sidebar = localStorage.getItem('mdbook-sidebar');

@@ -80,27 +78,34 @@

8078 </script>

8179

8280

83− <script type="text/javascript">

81+ <script>

8482 var theme;

8583 try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }

8684 if (theme === null || theme === undefined) { theme = default_theme; }

8785 var html = document.querySelector('html');

88− html.classList.remove('no-js')

8986 html.classList.remove('{{ default_theme }}')

9087 html.classList.add(theme);

91− html.classList.add('js');

88+ var body = document.querySelector('body');

89+ body.classList.remove('no-js')

90+ body.classList.add('js');

9291 </script>

9392

93+ <input type="checkbox" id="sidebar-toggle-anchor" class="hidden">

94+

9495

95− <script type="text/javascript">

96− var html = document.querySelector('html');

97− var sidebar = 'hidden';

96+ <script>

97+ var body = document.querySelector('body');

98+ var sidebar = null;

99+ var sidebar_toggle = document.getElementById("sidebar-toggle-anchor");

98100 if (document.body.clientWidth >= 1080) {

99101 try { sidebar = localStorage.getItem('mdbook-sidebar'); } catch(e) { }

100102 sidebar = sidebar || 'visible';

103+ } else {

104+ sidebar = 'hidden';

101105 }

102− html.classList.remove('sidebar-visible');

103− html.classList.add("sidebar-" + sidebar);

106+ sidebar_toggle.checked = sidebar === 'visible';

107+ body.classList.remove('sidebar-visible');

108+ body.classList.add("sidebar-" + sidebar);

104109 </script>

105110

106111 <nav id="sidebar" class="sidebar" aria-label="Table of contents">

@@ -110,26 +115,48 @@

110115 <div id="sidebar-resize-handle" class="sidebar-resize-handle"></div>

111116 </nav>

112117

118+

119+ <script>

120+ var sidebarScrollbox = document.querySelector('#sidebar .sidebar-scrollbox');

121+ sidebarScrollbox.addEventListener('click', function(e) {

122+ if (e.target.tagName === 'A') {

123+ sessionStorage.setItem('sidebar-scroll', sidebarScrollbox.scrollTop);

124+ }

125+ }, { passive: true });

126+ var sidebarScrollTop = sessionStorage.getItem('sidebar-scroll');

127+ sessionStorage.removeItem('sidebar-scroll');

128+ if (sidebarScrollTop) {

129+ // preserve sidebar scroll position when navigating via links within sidebar

130+ sidebarScrollbox.scrollTop = sidebarScrollTop;

131+ } else {

132+ // scroll sidebar to current active section when navigating via "next/previous chapter" buttons

133+ var activeSection = document.querySelector('#sidebar .active');

134+ if (activeSection) {

135+ activeSection.scrollIntoView({ block: 'center' });

136+ }

137+ }

138+ </script>

139+

113140 <div id="page-wrapper" class="page-wrapper">

114141

115142 <div class="page">

116143 {{> header}}

117144 <div id="menu-bar-hover-placeholder"></div>

118− <div id="menu-bar" class="menu-bar sticky bordered">

145+ <div id="menu-bar" class="menu-bar sticky">

119146 <div class="left-buttons">

120− <button id="sidebar-toggle" class="icon-button" type="button" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">

147+ <label id="sidebar-toggle" class="icon-button" for="sidebar-toggle-anchor" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">

121148 <i class="fa fa-bars"></i>

122− </button>

149+ </label>

123150 <button id="theme-toggle" class="icon-button" type="button" title="Change theme" aria-label="Change theme" aria-haspopup="true" aria-expanded="false" aria-controls="theme-list">

124151 <i class="fa fa-paint-brush"></i>

125152 </button>

126153 <ul id="theme-list" class="theme-popup" aria-label="Themes" role="menu">

127− <li role="none"><button role="menuitem" class="theme" id="light">{{ theme_option "Light" }}</button></li>

128− <li role="none"><button role="menuitem" class="theme" id="rust">{{ theme_option "Rust" }}</button></li>

129− <li role="none"><button role="menuitem" class="theme" id="coal">{{ theme_option "Coal" }}</button></li>

130− <li role="none"><button role="menuitem" class="theme" id="navy">{{ theme_option "Navy" }}</button></li>

131− <li role="none"><button role="menuitem" class="theme" id="ayu">{{ theme_option "Ayu" }}</button></li>

132− <li role="none"><button role="menuitem" class="theme" id="colibri">{{ theme_option "Colibri" }}</button></li>

154+ <li role="none"><button role="menuitem" class="theme" id="light">Light</button></li>

155+ <li role="none"><button role="menuitem" class="theme" id="rust">Rust</button></li>

156+ <li role="none"><button role="menuitem" class="theme" id="coal">Coal</button></li>

157+ <li role="none"><button role="menuitem" class="theme" id="navy">Navy</button></li>

158+ <li role="none"><button role="menuitem" class="theme" id="ayu">Ayu</button></li>

159+ <li role="none"><button role="menuitem" class="theme" id="colibri">Colibri</button></li>

133160 </ul>

134161 {{#if search_enabled}}

135162 <button id="search-toggle" class="icon-button" type="button" title="Search. (Shortkey: s)" aria-label="Toggle Searchbar" aria-expanded="false" aria-keyshortcuts="S" aria-controls="searchbar">

@@ -151,13 +178,19 @@

151178 <i id="git-repository-button" class="fa {{git_repository_icon}}"></i>

152179 </a>

153180 {{/if}}

181+ {{#if git_repository_edit_url}}

182+ <a href="{{git_repository_edit_url}}" title="Suggest an edit" aria-label="Suggest an edit">

183+ <i id="git-edit-button" class="fa fa-edit"></i>

184+ </a>

185+ {{/if}}

186+

154187 </div>

155188 </div>

156189

157190 {{#if search_enabled}}

158191 <div id="search-wrapper" class="hidden">

159192 <form id="searchbar-outer" class="searchbar-outer">

160− <input type="search" name="search" id="searchbar" name="searchbar" placeholder="Search this book ..." aria-controls="searchresults-outer" aria-describedby="searchresults-header">

193+ <input type="search" id="searchbar" name="searchbar" placeholder="Search this book ..." aria-controls="searchresults-outer" aria-describedby="searchresults-header">

161194 </form>

162195 <div id="searchresults-outer" class="searchresults-outer hidden">

163196 <div id="searchresults-header" class="searchresults-header"></div>

@@ -168,7 +201,7 @@

168201 {{/if}}

169202

170203

171− <script type="text/javascript">

204+ <script>

172205 document.getElementById('sidebar-toggle').setAttribute('aria-expanded', sidebar === 'visible');

173206 document.getElementById('sidebar').setAttribute('aria-hidden', sidebar !== 'visible');

174207 Array.from(document.querySelectorAll('#sidebar a')).forEach(function(link) {

@@ -190,7 +223,7 @@

190223 {{/previous}}

191224

192225 {{#next}}

193− <a rel="next" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">

226+ <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">

194227 <i class="fa fa-angle-right"></i>

195228 </a>

196229 {{/next}}

@@ -208,7 +241,7 @@

208241 {{/previous}}

209242

210243 {{#next}}

211− <a rel="next" href="{{ path_to_root }}{{link}}" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">

244+ <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">

212245 <i class="fa fa-angle-right"></i>

213246 </a>

214247 {{/next}}

@@ -216,10 +249,12 @@

216249

217250 </div>

218251

219− {{#if livereload}}

252+ {{#if live_reload_endpoint}}

220253

221− <script type="text/javascript">

222− var socket = new WebSocket("{{{livereload}}}");

254+ <script>

255+ const wsProtocol = location.protocol === 'https:' ? 'wss:' : 'ws:';

256+ const wsAddress = wsProtocol + "//" + location.host + "/" + "{{{live_reload_endpoint}}}";

257+ const socket = new WebSocket(wsAddress);

223258 socket.onmessage = function (event) {

224259 if (event.data === "reload") {

225260 socket.close();

@@ -235,7 +270,7 @@

235270

236271 {{#if google_analytics}}

237272

238− <script type="text/javascript">

273+ <script>

239274 var localAddrs = ["localhost", "127.0.0.1", ""];

240275

241276 // make sure we don't activate google analytics if the developer is

@@ -253,43 +288,43 @@

253288 {{/if}}

254289

255290 {{#if playground_line_numbers}}

256− <script type="text/javascript">

291+ <script>

257292 window.playground_line_numbers = true;

258293 </script>

259294 {{/if}}

260295

261296 {{#if playground_copyable}}

262− <script type="text/javascript">

297+ <script>

263298 window.playground_copyable = true;

264299 </script>

265300 {{/if}}

266301

267302 {{#if playground_js}}

268− <script src="{{ path_to_root }}ace.js" type="text/javascript" charset="utf-8"></script>

269− <script src="{{ path_to_root }}editor.js" type="text/javascript" charset="utf-8"></script>

270− <script src="{{ path_to_root }}mode-rust.js" type="text/javascript" charset="utf-8"></script>

271− <script src="{{ path_to_root }}theme-dawn.js" type="text/javascript" charset="utf-8"></script>

272− <script src="{{ path_to_root }}theme-tomorrow_night.js" type="text/javascript" charset="utf-8"></script>

303+ <script src="{{ path_to_root }}ace.js"></script>

304+ <script src="{{ path_to_root }}editor.js"></script>

305+ <script src="{{ path_to_root }}mode-rust.js"></script>

306+ <script src="{{ path_to_root }}theme-dawn.js"></script>

307+ <script src="{{ path_to_root }}theme-tomorrow_night.js"></script>

273308 {{/if}}

274309

275310 {{#if search_js}}

276− <script src="{{ path_to_root }}elasticlunr.min.js" type="text/javascript" charset="utf-8"></script>

277− <script src="{{ path_to_root }}mark.min.js" type="text/javascript" charset="utf-8"></script>

278− <script src="{{ path_to_root }}searcher.js" type="text/javascript" charset="utf-8"></script>

311+ <script src="{{ path_to_root }}elasticlunr.min.js"></script>

312+ <script src="{{ path_to_root }}mark.min.js"></script>

313+ <script src="{{ path_to_root }}searcher.js"></script>

279314 {{/if}}

280315

281− <script src="{{ path_to_root }}clipboard.min.js" type="text/javascript" charset="utf-8"></script>

282− <script src="{{ path_to_root }}highlight.js" type="text/javascript" charset="utf-8"></script>

283− <script src="{{ path_to_root }}book.js" type="text/javascript" charset="utf-8"></script>

316+ <script src="{{ path_to_root }}clipboard.min.js"></script>

317+ <script src="{{ path_to_root }}highlight.js"></script>

318+ <script src="{{ path_to_root }}book.js"></script>

284319

285320

286321 {{#each additional_js}}

287− <script type="text/javascript" src="{{ ../path_to_root }}{{this}}"></script>

322+ <script src="{{ ../path_to_root }}{{this}}"></script>

288323 {{/each}}

289324

290325 {{#if is_print}}

291326 {{#if mathjax_support}}

292− <script type="text/javascript">

327+ <script>

293328 window.addEventListener('load', function() {

294329 MathJax.Hub.Register.StartupHook('End', function() {

295330 window.setTimeout(window.print, 100);

@@ -297,7 +332,7 @@

297332 });

298333 </script>

299334 {{else}}

300− <script type="text/javascript">

335+ <script>

301336 window.addEventListener('load', function() {

302337 window.setTimeout(window.print, 100);

303338 });

@@ -305,5 +340,6 @@

305340 {{/if}}

306341 {{/if}}

307342

343+ </div>

308344 </body>

309345</html>

contrib/Helix.appdata.xmlnew file+108

@@ -0,0 +1,108 @@

1+<?xml version="1.0" encoding="UTF-8"?>

2+<component type="desktop-application">

3+ <id>com.helix_editor.Helix</id>

4+ <metadata_license>CC0-1.0</metadata_license>

5+ <project_license>MPL-2.0</project_license>

6+ <name>Helix</name>

7+ <summary>A post-modern text editor</summary>

8+ <summary xml:lang="ar">مُحَرِّرُ نُصُوصٍ سَابِقٌ لِعَهدِه</summary>

10+ <description>

11+ <p>

12+ Helix is a terminal-based text editor inspired by Kakoune / Neovim and written in Rust.

13+ </p>

14+ <ul>

15+ <li>Vim-like modal editing</li>

16+ <li>Multiple selections</li>

17+ <li>Built-in language server support</li>

18+ <li>Smart, incremental syntax highlighting and code editing via tree-sitter</li>

19+ </ul>

20+ </description>

21+ <description xml:lang="ar">

22+ <p>

23+ مُحَرِّرُ نُصُوصٍ يَعمَلُ فِي الطَّرَفِيَّة، مُستَلهَمٌ مِن Kakoune وَ Neovim وَمَكتُوبٌ بِلُغَةِ رَست البَرمَجِيَّة.

24+ </p>

25+ <ul>

26+ <li>تَحرِيرٌ وَضعِيٌّ شَبيهٌ بِـVim</li>

27+ <li>تَحدِيدَاتٌ لِلنَّصِ مُتَعَدِّدَة</li>

28+ <li>دَعْمٌ مُدمَجٌ لِخَوادِمِ اللُّغَات</li>

29+ <li>تَحرِيرُ التَّعلِيمَاتِ البَّرمَجِيَّةِ مَعَ تَمييزٍ لِلتَّركِيبِ النَّحُويِّ بِواسِطَةِ tree-sitter</li>

30+ </ul>

31+ </description>

32+

33+ <launchable type="desktop-id">Helix.desktop</launchable>

34+

35+ <screenshots>

36+ <screenshot type="default">

37+ <caption>Helix with default theme</caption>

38+ <image>https://github.com/helix-editor/helix/raw/d4565b4404cabc522bd60822abd374755581d751/screenshot.png</image>

39+ </screenshot>

40+ </screenshots>

41+

42+ <url type="homepage">https://helix-editor.com/</url>

43+ <url type="donation">https://opencollective.com/helix-editor</url>

44+ <url type="help">https://docs.helix-editor.com/</url>

45+ <url type="vcs-browser">https://github.com/helix-editor/helix</url>

46+ <url type="bugtracker">https://github.com/helix-editor/helix/issues</url>

47+

48+ <content_rating type="oars-1.1" />

49+

50+ <releases>

51+ <release version="23.10" date="2023-10-24">

52+ <url>https://helix-editor.com/news/release-23-10-highlights/</url>

53+ </release>

54+ <release version="23.05" date="2023-05-18">

55+ <url>https://github.com/helix-editor/helix/releases/tag/23.05</url>

56+ </release>

57+ <release version="23.03" date="2023-03-31">

58+ <url>https://helix-editor.com/news/release-23-03-highlights/</url>

59+ </release>

60+ <release version="22.12" date="2022-12-6">

61+ <url>https://helix-editor.com/news/release-22-12-highlights/</url>

62+ </release>

63+ <release version="22.08" date="2022-8-31">

64+ <url>https://helix-editor.com/news/release-22-08-highlights/</url>

65+ </release>

66+ <release version="22.05" date="2022-5-28">

67+ <url>https://helix-editor.com/news/release-22-05-highlights/</url>

68+ </release>

69+ <release version="22.03" date="2022-3-28">

70+ <url>https://helix-editor.com/news/release-22-03-highlights/</url>

71+ </release>

72+ </releases>

73+

74+ <requires>

75+ <control>keyboard</control>

76+ </requires>

77+

78+ <categories>

79+ <category>Utility</category>

80+ <category>TextEditor</category>

81+ </categories>

82+

83+ <keywords>

84+ <keyword>text</keyword>

85+ <keyword>editor</keyword>

86+ <keyword>development</keyword>

87+ <keyword>programming</keyword>

88+ </keywords>

89+

90+ <provides>

91+ <binary>hx</binary>

92+ <mediatype>text/english</mediatype>

93+ <mediatype>text/plain</mediatype>

94+ <mediatype>text/x-makefile</mediatype>

95+ <mediatype>text/x-c++hdr</mediatype>

96+ <mediatype>text/x-c++src</mediatype>

97+ <mediatype>text/x-chdr</mediatype>

98+ <mediatype>text/x-csrc</mediatype>

99+ <mediatype>text/x-java</mediatype>

100+ <mediatype>text/x-moc</mediatype>

101+ <mediatype>text/x-pascal</mediatype>

102+ <mediatype>text/x-tcl</mediatype>

103+ <mediatype>text/x-tex</mediatype>

104+ <mediatype>application/x-shellscript</mediatype>

105+ <mediatype>text/x-c</mediatype>

106+ <mediatype>text/x-c++</mediatype>

107+ </provides>

108+</component>

contrib/Helix.desktopnew file+91

@@ -0,0 +1,91 @@

1+[Desktop Entry]

2+Name=Helix

3+GenericName=Text Editor

4+GenericName[ar]=مُحَرِّرُ نُصُوص

5+GenericName[de]=Texteditor

6+GenericName[fr]=Éditeur de texte

7+GenericName[ru]=Текстовый редактор

8+GenericName[sr]=Едитор текст

9+GenericName[tr]=Metin Düzenleyici

10+Comment=Edit text files

11+Comment[af]=Redigeer tekslêers

12+Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ

13+Comment[ar]=مُحَرِّرُ مِلَفَّاتٍ نَصِّيَّة

14+Comment[az]=Mətn fayllarını redaktə edin

15+Comment[be]=Рэдагаваньне тэкставых файлаў

16+Comment[bg]=Редактиране на текстови файлове

17+Comment[bn]=টেক্স্ট ফাইল এডিট করুন

18+Comment[bs]=Izmijeni tekstualne datoteke

19+Comment[ca]=Edita fitxers de text

20+Comment[cs]=Úprava textových souborů

21+Comment[cy]=Golygu ffeiliau testun

22+Comment[da]=Redigér tekstfiler

23+Comment[de]=Textdateien bearbeiten

24+Comment[el]=Επεξεργασία αρχείων κειμένου

25+Comment[en_CA]=Edit text files

26+Comment[en_GB]=Edit text files

27+Comment[es]=Edita archivos de texto

28+Comment[et]=Redigeeri tekstifaile

29+Comment[eu]=Editatu testu-fitxategiak

30+Comment[fa]=ویرایش پرونده‌های متنی

31+Comment[fi]=Muokkaa tekstitiedostoja

32+Comment[fr]=Éditer des fichiers texte

33+Comment[ga]=Eagar comhad Téacs

34+Comment[gu]=લખાણ ફાઇલોમાં ફેરફાર કરો

35+Comment[he]=ערוך קבצי טקסט

36+Comment[hi]=पाठ फ़ाइलें संपादित करें

37+Comment[hr]=Uređivanje tekstualne datoteke

38+Comment[hu]=Szövegfájlok szerkesztése

39+Comment[id]=Edit file teks

40+Comment[it]=Modifica file di testo

41+Comment[ja]=テキストファイルを編集します

42+Comment[kn]=ಪಠ್ಯ ಕಡತಗಳನ್ನು ಸಂಪಾದಿಸು

43+Comment[ko]=텍스트 파일을 편집합니다

44+Comment[lt]=Redaguoti tekstines bylas

45+Comment[lv]=Rediģēt teksta failus

46+Comment[mk]=Уреди текстуални фајлови

47+Comment[ml]=വാചക രചനകള് തിരുത്തുക

48+Comment[mn]=Текст файл боловсруулах

49+Comment[mr]=गद्य फाइल संपादित करा

50+Comment[ms]=Edit fail teks

51+Comment[nb]=Rediger tekstfiler

52+Comment[ne]=पाठ फाइललाई संशोधन गर्नुहोस्

53+Comment[nl]=Tekstbestanden bewerken

54+Comment[nn]=Rediger tekstfiler

55+Comment[no]=Rediger tekstfiler

56+Comment[or]=ପାଠ୍ଯ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ

57+Comment[pa]=ਪਾਠ ਫਾਇਲਾਂ ਸੰਪਾਦਨ

58+Comment[pl]=Edytor plików tekstowych

59+Comment[pt]=Editar ficheiros de texto

60+Comment[pt_BR]=Edite arquivos de texto

61+Comment[ro]=Editare fişiere text

62+Comment[ru]=Редактирование текстовых файлов

63+Comment[sk]=Úprava textových súborov

64+Comment[sl]=Urejanje datotek z besedili

65+Comment[sq]=Përpuno files teksti

66+Comment[sr]=Уређујте текст фајлове

67+Comment[sr@Latn]=Izmeni tekstualne datoteke

68+Comment[sv]=Redigera textfiler

69+Comment[ta]=உரை கோப்புகளை தொகுக்கவும்

70+Comment[th]=แก้ไขแฟ้มข้อความ

71+Comment[tk]=Metin faýllary editle

72+Comment[tr]=Metin dosyaları düzenleyin

73+Comment[uk]=Редактор текстових файлів

74+Comment[vi]=Soạn thảo tập tin văn bản

75+Comment[wa]=Asspougnî des fitchîs tecses

76+Comment[zh_CN]=编辑文本文件

77+Comment[zh_TW]=編輯文字檔

78+TryExec=hx

79+Exec=hx %F

80+Terminal=true

81+Type=Application

82+Keywords=Text;editor;

83+Keywords[ar]=نص;نصوص;محرر;

84+Keywords[fr]=Texte;éditeur;

85+Keywords[ru]=текст;текстовый редактор;

86+Keywords[sr]=Текст;едитор;

87+Keywords[tr]=Metin;düzenleyici;

88+Icon=helix

89+Categories=Utility;TextEditor;

90+StartupNotify=false

91+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;

contrib/completion/hx.bash+2−2

@@ -16,8 +16,8 @@ _hx() {

1616 COMPREPLY=($(compgen -W "$languages" -- $2))

1717 ;;

1818 *)

19− COMPREPLY=($(compgen -fd -W "-h --help --tutor -V --version -v -vv -vvv --health -g --grammar" -- $2))

19+ COMPREPLY=($(compgen -fd -W "-h --help --tutor -V --version -v -vv -vvv --health -g --grammar --vsplit --hsplit -c --config --log" -- $2))

2020 ;;

2121 esac

22−} && complete -F _hx hx

22+} && complete -o filenames -F _hx hx

2323

contrib/completion/hx.elvnew file+55

@@ -0,0 +1,55 @@

1+# You can move it here ~/.config/elvish/lib/hx.elv

2+# Or add `eval (slurp < ~/$REPOS/helix/contrib/completion/hx.elv)`

3+# Be sure to replace `$REPOS` with something that makes sense for you!

5+### Renders a pretty completion candidate

6+var candidate = { | _stem _desc |

7+ edit:complex-candidate $_stem &display=(styled $_stem bold)(styled " "$_desc dim)

8+}

10+### These commands will invalidate further input (i.e. not react to them)

11+var skips = [ "--tutor" "--help" "--version" "-V" "--health" ]

12+

13+### Grammar commands

14+var grammar = [ "--grammar" "-g" ]

15+

16+### Config commands

17+var config = [ "--config" "-c" ]

18+

19+### Set an arg-completer for the `hx` binary

20+set edit:completion:arg-completer[hx] = {|@args|

21+ var n = (count $args)

22+ if (>= $n 3) {

23+ # Stop completions if passed arg will take presedence

24+ # and invalidate further input

25+ if (has-value $skips $args[-2]) {

26+ return

27+ }

28+ # If the previous arg == --grammar, then only suggest:

29+ if (has-value $grammar $args[-2]) {

30+ $candidate "fetch" "Fetch the tree-sitter grammars"

31+ $candidate "build" "Build the tree-sitter grammars"

32+ return

33+ }

34+ # When we have --config, we need a file

35+ if (has-values $config $args[-2]) {

36+ edit:complete-filename $args[-1] | each { |v| put $v[stem] }

37+ return

38+ }

39+ # When we have --log, we need a file

40+ if (has-values "log" $args[-2]) {

41+ edit:complete-filename $args[-1] | each { |v| put $v[stem] }

42+ return

43+ }

44+ }

45+ edit:complete-filename $args[-1] | each { |v| put $v[stem]}

46+ $candidate "--help" "(Prints help information)"

47+ $candidate "--version" "(Prints version information)"

48+ $candidate "--tutor" "(Loads the tutorial)"

49+ $candidate "--health" "(Checks for errors in editor setup)"

50+ $candidate "--grammar" "(Fetch or build the tree-sitter grammars)"

51+ $candidate "--vsplit" "(Splits all given files vertically)"

52+ $candidate "--hsplit" "(Splits all given files horizontally)"

53+ $candidate "--config" "(Specifies a file to use for configuration)"

54+ $candidate "--log" "(Specifies a file to write log data into)"

55+}

contrib/completion/hx.fish+4−1

@@ -9,4 +9,7 @@ complete -c hx -l health -x -a "$langs" -d "Checks for errors in editor setup"

99complete -c hx -s g -l grammar -x -a "fetch build" -d "Fetches or builds tree-sitter grammars"

1010complete -c hx -s v -o vv -o vvv -d "Increases logging verbosity"

1111complete -c hx -s V -l version -d "Prints version information"

12−

12+complete -c hx -l vsplit -d "Splits all given files vertically into different windows"

13+complete -c hx -l hsplit -d "Splits all given files horizontally into different windows"

14+complete -c hx -s c -l config -r -d "Specifies a file to use for completion"

15+complete -c hx -l log -r -d "Specifies a file to write log data into"

contrib/completion/hx.zsh+5

@@ -14,6 +14,11 @@ _hx() {

1414 "--health[Checks for errors in editor setup]:language:->health" \

1515 "-g[Fetches or builds tree-sitter grammars]:action:->grammar" \

1616 "--grammar[Fetches or builds tree-sitter grammars]:action:->grammar" \

17+ "--vsplit[Splits all given files vertically into different windows]" \

18+ "--hsplit[Splits all given files horizontally into different windows]" \

19+ "-c[Specifies a file to use for configuration]" \

20+ "--config[Specifies a file to use for configuration]" \

21+ "--log[Specifies a file to write log data into]" \

1722 "*:file:_files"

1823

1924 case "$state" in

contrib/helix.pngnew file

Binary file not shown.

default.nixnew file+8

@@ -0,0 +1,8 @@

1+# Flake's default package for non-flake-enabled nix instances

2+let

3+ compat = builtins.fetchTarball {

4+ url = "https://github.com/edolstra/flake-compat/archive/b4a34015c698c7793d592d66adbab377907a2be8.tar.gz";

5+ sha256 = "sha256:1qc703yg0babixi6wshn5wm2kgl5y1drcswgszh4xxzbrwkk9sv7";

6+ };

7+in

8+ (import compat {src = ./.;}).defaultNix.default

docs/CONTRIBUTING.md+35−4

@@ -8,7 +8,10 @@ Some suggestions to get started:

88- Help with packaging on various distributions needed!

99- To use print debugging to the [Helix log file][log-file], you must:

1010 * Print using `log::info!`, `warn!`, or `error!`. (`log::info!("helix!")`)

11− * Pass the appropriate verbosity level option for the desired log level. (`hx -v <file>` for info, more `v`s for higher severity inclusive)

11+ * Pass the appropriate verbosity level option for the desired log level. (`hx -v <file>` for info, more `v`s for higher verbosity)

12+ * Want to display the logs in a separate file instead of using the `:log-open` command in your compiled Helix editor? Start your debug version with `cargo run -- --log foo.log` and in a new terminal use `tail -f foo.log`

13+- Instead of running a release version of Helix, while developing you may want to run in debug mode with `cargo run` which is way faster to compile

14+- Looking for even faster compile times? Give a try to [mold](https://github.com/rui314/mold)

1215- If your preferred language is missing, integrating a tree-sitter grammar for

1316 it and defining syntax highlight queries for it is straight forward and

1417 doesn't require much knowledge of the internals.

@@ -26,12 +29,40 @@ files, run

2629cargo xtask docgen

2730```

2831

29−inside the project. We use [xtask][xtask] as an ad-hoc task runner and

30−thus do not require any dependencies other than `cargo` (You don't have

31−to `cargo install` anything either).

32+inside the project. We use [xtask][xtask] as an ad-hoc task runner.

3233

34+To preview the book itself, install [mdbook][mdbook]. Then, run

35+

36+```shell

37+mdbook serve book

38+```

39+

40+and visit [http://localhost:3000](http://localhost:3000).

41+

42+# Testing

43+

44+## Unit tests/Documentation tests

45+

46+Run `cargo test --workspace` to run unit tests and documentation tests in all packages.

47+

48+## Integration tests

49+

50+Integration tests for helix-term can be run with `cargo integration-test`. Code

51+contributors are strongly encouraged to write integration tests for their code.

52+Existing tests can be used as examples. Helpers can be found in

53+[helpers.rs][helpers.rs]. The log level can be set with the `HELIX_LOG_LEVEL`

54+environment variable, e.g. `HELIX_LOG_LEVEL=debug cargo integration-test`.

55+

56+## Minimum Stable Rust Version (MSRV) Policy

57+

58+Helix follows the MSRV of Firefox.

59+The current MSRV and future changes to the MSRV are listed in the [Firefox documentation].

60+

61+[Firefox documentation]: https://firefox-source-docs.mozilla.org/writing-rust-code/update-policy.html

3362[good-first-issue]: https://github.com/helix-editor/helix/labels/E-easy

3463[log-file]: https://github.com/helix-editor/helix/wiki/FAQ#access-the-log-file

3564[architecture.md]: ./architecture.md

3665[docs]: https://docs.helix-editor.com/

3766[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

docs/architecture.md+2−2

@@ -32,7 +32,7 @@ represented by a `Selection`. Each `Range` in the selection consists of a moving

3232a selection with a single range, with the head and the anchor in the same

3333position.

3434

35−Ropes are modified by constructing an OT-like `Transaction`. It's represents

35+Ropes are modified by constructing an OT-like `Transaction`. It represents

3636a single coherent change to the document and can be applied to the rope.

3737A transaction can be inverted to produce an undo. Selections and marks can be

3838mapped over a transaction to translate to a position in the new text state after

@@ -42,7 +42,7 @@ applying the transaction.

4242> interface used to generate text edits.

4343

4444`Syntax` is the interface used to interact with tree-sitter ASTs for syntax

45−highling and other features.

45+highlighting and other features.

4646

4747## View

4848

docs/releases.mdnew file+67

@@ -0,0 +1,67 @@

1+## Checklist

3+Helix releases are versioned in the Calendar Versioning scheme:

4+`YY.0M(.MICRO)`, for example, `22.05` for May of 2022, or in a patch release,

5+`22.05.1`. In these instructions we'll use `<tag>` as a placeholder for the tag

6+being published.

8+* 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)

10+* Tag and push

11+ * `git tag -s -m "<tag>" -a <tag> && git push`

12+ * Make sure to switch to master and pull first

13+* Edit the `Cargo.toml` file and change the date in the `version` field to the next planned release

14+ * Due to Cargo having a strict requirement on SemVer with 3 or more version

15+ numbers, a `0` is required in the micro version; however, unless we are

16+ publishing a patch release after a major release, the `.0` is dropped in

17+ the user facing version.

18+ * Releases are planned to happen every two months, so `22.05.0` would change to `22.07.0`

19+ * If we are pushing a patch/bugfix release in the same month as the previous

20+ release, bump the micro version, e.g. `22.07.0` to `22.07.1`

21+* Wait for the Release CI to finish

22+ * It will automatically turn the git tag into a GitHub release when it uploads artifacts

23+* Edit the new release

24+ * Use `<tag>` as the title

25+ * Link to the changelog and release notes

26+* Merge the release notes PR

27+* Download the macos and linux binaries and update the `sha256`s in the [homebrew formula]

28+ * Use `sha256sum` on the downloaded `.tar.xz` files to determine the hash

29+* Link to the release notes in this-week-in-rust

30+ * [Example PR](https://github.com/rust-lang/this-week-in-rust/pull/3300)

31+* Post to reddit

32+ * [Example post](https://www.reddit.com/r/rust/comments/uzp5ze/helix_editor_2205_released/)

33+

34+[homebrew formula]: https://github.com/Homebrew/homebrew-core/blob/master/Formula/helix.rb

35+

36+## Changelog Curation

37+

38+The changelog is currently created manually by reading through commits in the

39+log since the last release. GitHub's compare view is a nice way to approach

40+this. For example, when creating the 22.07 release notes, this compare link

41+may be used

42+

43+```

44+https://github.com/helix-editor/helix/compare/22.05...master

45+```

46+

47+Either side of the triple-dot may be replaced with an exact revision, so if

48+you wish to incrementally compile the changelog, you can tackle a weeks worth

49+or so, record the revision where you stopped, and use that as a starting point

50+next week:

51+

52+```

53+https://github.com/helix-editor/helix/compare/7706a4a0d8b67b943c31d0c5f7b00d357b5d838d...master

54+```

55+

56+A work-in-progress commit for a changelog might look like

57+[this example](https://github.com/helix-editor/helix/commit/831adfd4c709ca16b248799bfef19698d5175e55).

58+

59+Not every PR or commit needs a blurb in the changelog. Each release section

60+tends to have a blurb that links to a GitHub comparison between release

61+versions for convenience:

62+

63+> As usual, the following is a summary of each of the changes since the last

64+> release. For the full log, check out the git log.

65+

66+Typically, small changes like dependencies or documentation updates, refactors,

67+or meta changes like GitHub Actions work are left out.

docs/vision.md+1−1

@@ -20,5 +20,5 @@ Vision statements are all well and good, but are also vague and subjective. Her

2020* **Built-in tools** for working with code bases efficiently. Most projects aren't a single file, and an editor should handle that as a first-class use case. In Helix's case, this means (among other things) a fuzzy-search file navigator and LSP support.

2121* **Edit anything** that comes up when coding, within reason. Whether it's a 200 MB XML file, a megabyte of minified javascript on a single line, or Japanese text encoded in ShiftJIS, you should be able to open it and edit it without problems. (Note: this doesn't mean handle every esoteric use case. Sometimes you do just need a specialized tool, and Helix isn't that.)

2222* **Configurable**, within reason. Although the defaults should be good, not everyone will agree on what "good" is. Within the bounds of Helix's core interaction models, it should be reasonably configurable so that it can be "good" for more people. This means, for example, custom key maps among other things.

23−* **Extensible**, within reason. Although we want Helix to be productive out-of-the-box, it's not practical or desirable to cram every useful feature and use case into the core editor. The basics should be built-in, but you should be able to extend it with additional functionality as needed. Right now we're thinking Wasm-based plugins.

23+* **Extensible**, within reason. Although we want Helix to be productive out-of-the-box, it's not practical or desirable to cram every useful feature and use case into the core editor. The basics should be built-in, but you should be able to extend it with additional functionality as needed.

2424* **Clean code base.** Sometimes other factors (e.g. significant performance gains, important features, correctness, etc.) will trump strict readability, but we nevertheless want to keep the code base straightforward and easy to understand to the extent we can.

flake.lock+38−126

@@ -1,116 +1,35 @@

11{

22 "nodes": {

33 "crane": {

4− "flake": false,

5− "locked": {

6− "lastModified": 1644785799,

7− "narHash": "sha256-VpAJO1L0XeBvtCuNGK4IDKp6ENHIpTrlaZT7yfBCvwo=",

8− "owner": "ipetkov",

9− "repo": "crane",

10− "rev": "fc7a94f841347c88f2cb44217b2a3faa93e2a0b2",

11− "type": "github"

12− },

13− "original": {

14− "owner": "ipetkov",

15− "repo": "crane",

16− "type": "github"

17− }

18− },

19− "devshell": {

204 "inputs": {

21− "flake-utils": "flake-utils",

225 "nixpkgs": [

23− "nixCargoIntegration",

246 "nixpkgs"

257 ]

268 },

279 "locked": {

28− "lastModified": 1646667754,

29− "narHash": "sha256-LahZHvCC3UVzGQ55iWDRZkuDssXl1rYgqgScrPV9S38=",

30− "owner": "numtide",

31− "repo": "devshell",

32− "rev": "59fbe1dfc0de8c3332957c16998a7d16dff365d8",

33− "type": "github"

34− },

35− "original": {

36− "owner": "numtide",

37− "repo": "devshell",

38− "type": "github"

39− }

40− },

41− "dream2nix": {

42− "inputs": {

43− "alejandra": [

44− "nixCargoIntegration",

45− "nixpkgs"

46− ],

47− "crane": "crane",

48− "flake-utils-pre-commit": [

49− "nixCargoIntegration",

50− "nixpkgs"

51− ],

52− "gomod2nix": [

53− "nixCargoIntegration",

54− "nixpkgs"

55− ],

56− "mach-nix": [

57− "nixCargoIntegration",

58− "nixpkgs"

59− ],

60− "nixpkgs": [

61− "nixCargoIntegration",

62− "nixpkgs"

63− ],

64− "node2nix": [

65− "nixCargoIntegration",

66− "nixpkgs"

67− ],

68− "poetry2nix": [

69− "nixCargoIntegration",

70− "nixpkgs"

71− ],

72− "pre-commit-hooks": [

73− "nixCargoIntegration",

74− "nixpkgs"

75− ]

76− },

77− "locked": {

78− "lastModified": 1646710334,

79− "narHash": "sha256-eLBcDgcbOUfeH4k6SEW5a5v0PTp2KNCn+5ZXIoWGYww=",

80− "owner": "nix-community",

81− "repo": "dream2nix",

82− "rev": "5dcfbfd3b60ce0208b894c1bdea00e2bdf80ca6a",

10+ "lastModified": 1701025348,

11+ "narHash": "sha256-42GHmYH+GF7VjwGSt+fVT1CQuNpGanJbNgVHTAZppUM=",

12+ "owner": "ipetkov",

13+ "repo": "crane",

14+ "rev": "42afaeb1a0325194a7cdb526332d2cb92fddd07b",

8315 "type": "github"

8416 },

8517 "original": {

86− "owner": "nix-community",

87− "ref": "main",

88− "repo": "dream2nix",

18+ "owner": "ipetkov",

19+ "repo": "crane",

8920 "type": "github"

9021 }

9122 },

9223 "flake-utils": {

93− "locked": {

94− "lastModified": 1642700792,

95− "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",

96− "owner": "numtide",

97− "repo": "flake-utils",

98− "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",

99− "type": "github"

24+ "inputs": {

25+ "systems": "systems"

10026 },

101− "original": {

102− "owner": "numtide",

103− "repo": "flake-utils",

104− "type": "github"

105− }

106− },

107− "flake-utils_2": {

10827 "locked": {

109− "lastModified": 1637014545,

110− "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",

28+ "lastModified": 1694529238,

29+ "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",

11130 "owner": "numtide",

11231 "repo": "flake-utils",

113− "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",

32+ "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",

11433 "type": "github"

11534 },

11635 "original": {

@@ -119,38 +38,13 @@

11938 "type": "github"

12039 }

12140 },

122− "nixCargoIntegration": {

123− "inputs": {

124− "devshell": "devshell",

125− "dream2nix": "dream2nix",

126− "nixpkgs": [

127− "nixpkgs"

128− ],

129− "rustOverlay": [

130− "rust-overlay"

131− ]

132− },

133− "locked": {

134− "lastModified": 1646766572,

135− "narHash": "sha256-DV3+zxvAIKsMHsHedJKYFsracvFyLKpFQqurUBR86oY=",

136− "owner": "yusdacra",

137− "repo": "nix-cargo-integration",

138− "rev": "3a3f47f43ba486b7554164a698c8dfc5a38624ce",

139− "type": "github"

140− },

141− "original": {

142− "owner": "yusdacra",

143− "repo": "nix-cargo-integration",

144− "type": "github"

145− }

146− },

14741 "nixpkgs": {

14842 "locked": {

149− "lastModified": 1646497237,

150− "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=",

43+ "lastModified": 1700794826,

44+ "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",

15145 "owner": "nixos",

15246 "repo": "nixpkgs",

153− "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026",

47+ "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",

15448 "type": "github"

15549 },

15650 "original": {

@@ -162,24 +56,27 @@

16256 },

16357 "root": {

16458 "inputs": {

165− "nixCargoIntegration": "nixCargoIntegration",

59+ "crane": "crane",

60+ "flake-utils": "flake-utils",

16661 "nixpkgs": "nixpkgs",

16762 "rust-overlay": "rust-overlay"

16863 }

16964 },

17065 "rust-overlay": {

17166 "inputs": {

172− "flake-utils": "flake-utils_2",

67+ "flake-utils": [

68+ "flake-utils"

69+ ],

17370 "nixpkgs": [

17471 "nixpkgs"

17572 ]

17673 },

17774 "locked": {

178− "lastModified": 1646792695,

179− "narHash": "sha256-2drCXIKIQnJMlTZbcCfuHZAh+iPcdlRkCqtZnA6MHLY=",

75+ "lastModified": 1701137803,

76+ "narHash": "sha256-0LcPAdql5IhQSUXJx3Zna0dYTgdIoYO7zUrsKgiBd04=",

18077 "owner": "oxalica",

18178 "repo": "rust-overlay",

182− "rev": "7f599870402c8d2a5806086c8ee0f2d92b175c54",

79+ "rev": "9dd940c967502f844eacea52a61e9596268d4f70",

18380 "type": "github"

18481 },

18582 "original": {

@@ -187,6 +84,21 @@

18784 "repo": "rust-overlay",

18885 "type": "github"

18986 }

87+ },

88+ "systems": {

89+ "locked": {

90+ "lastModified": 1681028828,

91+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

92+ "owner": "nix-systems",

93+ "repo": "default",

94+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",

95+ "type": "github"

96+ },

97+ "original": {

98+ "owner": "nix-systems",

99+ "repo": "default",

100+ "type": "github"

101+ }

190102 }

191103 },

192104 "root": "root",

flake.nix+182−47

@@ -3,63 +3,198 @@

44 inputs = {

55 nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";

6+ flake-utils.url = "github:numtide/flake-utils";

67 rust-overlay = {

78 url = "github:oxalica/rust-overlay";

8− inputs.nixpkgs.follows = "nixpkgs";

9+ inputs = {

10+ nixpkgs.follows = "nixpkgs";

11+ flake-utils.follows = "flake-utils";

12+ };

913 };

10− nixCargoIntegration = {

11− url = "github:yusdacra/nix-cargo-integration";

14+ crane = {

15+ url = "github:ipetkov/crane";

1216 inputs.nixpkgs.follows = "nixpkgs";

13− inputs.rustOverlay.follows = "rust-overlay";

1417 };

1518 };

1619

17− outputs = inputs@{ nixCargoIntegration, ... }:

18− nixCargoIntegration.lib.makeOutputs {

19− root = ./.;

20− renameOutputs = { "helix-term" = "helix"; };

21− # Set default app to hx (binary is from helix-term release build)

22− # Set default package to helix-term release build

23− defaultOutputs = {

24− app = "hx";

25− package = "helix";

20+ outputs = {

21+ self,

22+ nixpkgs,

23+ crane,

24+ flake-utils,

25+ rust-overlay,

26+ ...

27+ }:

28+ flake-utils.lib.eachDefaultSystem (system: let

29+ pkgs = import nixpkgs {

30+ inherit system;

31+ overlays = [(import rust-overlay)];

2632 };

27− overrides = {

28− crateOverrides = common: _: {

29− helix-term = prev:

30− let

31− inherit (common) pkgs;

32− grammars = pkgs.callPackage ./grammars.nix { };

33− runtimeDir = pkgs.runCommand "helix-runtime" { } ''

34− mkdir -p $out

35− ln -s ${common.root}/runtime/* $out

36− rm -r $out/grammars

37− ln -s ${grammars} $out/grammars

38− '';

39− in

40− {

41− # disable fetching and building of tree-sitter grammars in the helix-term build.rs

42− HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";

43− # link languages and theme toml files since helix-term expects them (for tests)

44− preConfigure = "ln -s ${common.root}/{languages.toml,theme.toml,base16_theme.toml} ..";

45− buildInputs = (prev.buildInputs or [ ]) ++ [ common.cCompiler.cc.lib ];

46− nativeBuildInputs = [ pkgs.makeWrapper ];

47−

48− postFixup = ''

49− if [ -f "$out/bin/hx" ]; then

50− wrapProgram "$out/bin/hx" --set HELIX_RUNTIME "${runtimeDir}"

51− fi

52− '';

53− };

33+ mkRootPath = rel:

34+ builtins.path {

35+ path = "${toString ./.}/${rel}";

36+ name = rel;

5437 };

55− shell = common: prev: {

56− packages = prev.packages ++ (with common.pkgs; [ lld_13 lldb cargo-tarpaulin cargo-flamegraph ]);

57− env = prev.env ++ [

58− { name = "HELIX_RUNTIME"; eval = "$PWD/runtime"; }

59− { name = "RUST_BACKTRACE"; value = "1"; }

60− { name = "RUSTFLAGS"; value = "-C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment"; }

61− ];

38+ filteredSource = let

39+ pathsToIgnore = [

40+ ".envrc"

41+ ".ignore"

42+ ".github"

43+ ".gitignore"

44+ "logo_dark.svg"

45+ "logo_light.svg"

46+ "rust-toolchain.toml"

47+ "rustfmt.toml"

48+ "runtime"

49+ "screenshot.png"

50+ "book"

51+ "docs"

52+ "README.md"

53+ "CHANGELOG.md"

54+ "shell.nix"

55+ "default.nix"

56+ "grammars.nix"

57+ "flake.nix"

58+ "flake.lock"

59+ ];

60+ ignorePaths = path: type: let

61+ inherit (nixpkgs) lib;

62+ # split the nix store path into its components

63+ components = lib.splitString "/" path;

64+ # drop off the `/nix/hash-source` section from the path

65+ relPathComponents = lib.drop 4 components;

66+ # reassemble the path components

67+ relPath = lib.concatStringsSep "/" relPathComponents;

68+ in

69+ lib.all (p: ! (lib.hasPrefix p relPath)) pathsToIgnore;

70+ in

71+ builtins.path {

72+ name = "helix-source";

73+ path = toString ./.;

74+ # filter out unnecessary paths

75+ filter = ignorePaths;

6276 };

77+ makeOverridableHelix = old: config: let

78+ grammars = pkgs.callPackage ./grammars.nix config;

79+ runtimeDir = pkgs.runCommand "helix-runtime" {} ''

80+ mkdir -p $out

81+ ln -s ${mkRootPath "runtime"}/* $out

82+ rm -r $out/grammars

83+ ln -s ${grammars} $out/grammars

84+ '';

85+ helix-wrapped =

86+ pkgs.runCommand

87+ old.name

88+ {

89+ inherit (old) pname version;

90+ meta = old.meta or {};

91+ passthru =

92+ (old.passthru or {})

93+ // {

94+ unwrapped = old;

95+ };

96+ nativeBuildInputs = [pkgs.makeWrapper];

97+ makeWrapperArgs = config.makeWrapperArgs or [];

98+ }

99+ ''

100+ cp -rs --no-preserve=mode,ownership ${old} $out

101+ wrapProgram "$out/bin/hx" ''${makeWrapperArgs[@]} --set HELIX_RUNTIME "${runtimeDir}"

102+ '';

103+ in

104+ helix-wrapped

105+ // {

106+ override = makeOverridableHelix old;

107+ passthru =

108+ helix-wrapped.passthru

109+ // {

110+ wrapper = old: makeOverridableHelix old config;

111+ };

112+ };

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+

153+ checks = {

154+ # Build the crate itself

155+ inherit (self.packages.${system}) helix;

156+

157+ clippy = craneLibMSRV.cargoClippy (commonArgs

158+ // {

159+ inherit cargoArtifacts;

160+ cargoClippyExtraArgs = "--all-targets -- --deny warnings";

161+ });

162+

163+ fmt = craneLibMSRV.cargoFmt commonArgs;

164+

165+ doc = craneLibMSRV.cargoDoc (commonArgs

166+ // {

167+ inherit cargoArtifacts;

168+ });

169+

170+ test = craneLibMSRV.cargoTest (commonArgs

171+ // {

172+ inherit cargoArtifacts;

173+ });

174+ };

175+

176+ devShells.default = pkgs.mkShell {

177+ inputsFrom = builtins.attrValues self.checks.${system};

178+ nativeBuildInputs = with pkgs;

179+ [lld_13 cargo-flamegraph rust-analyzer]

180+ ++ (lib.optional (stdenv.isx86_64 && stdenv.isLinux) pkgs.cargo-tarpaulin)

181+ ++ (lib.optional stdenv.isLinux pkgs.lldb)

182+ ++ (lib.optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.CoreFoundation);

183+ shellHook = ''

184+ export HELIX_RUNTIME="$PWD/runtime"

185+ export RUST_BACKTRACE="1"

186+ export RUSTFLAGS="${rustFlagsEnv}"

187+ '';

188+ };

189+ })

190+ // {

191+ overlays.default = final: prev: {

192+ inherit (self.packages.${final.system}) helix;

63193 };

64194 };

195+

196+ nixConfig = {

197+ extra-substituters = ["https://helix.cachix.org"];

198+ extra-trusted-public-keys = ["helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="];

199+ };

65200}

grammars.nix+65−47

@@ -1,17 +1,26 @@

1−{ stdenv, lib, runCommand, yj }:

2−let

1+{

2+ stdenv,

3+ lib,

4+ runCommandLocal,

5+ runCommand,

6+ yj,

7+ includeGrammarIf ? _: true,

8+ grammarOverlays ? [],

9+ ...

10+}: let

311 # HACK: nix < 2.6 has a bug in the toml parser, so we convert to JSON

412 # before parsing

5− languages-json = runCommand "languages-toml-to-json" { } ''

13+ languages-json = runCommandLocal "languages-toml-to-json" {} ''

614 ${yj}/bin/yj -t < ${./languages.toml} > $out

715 '';

8− languagesConfig = if lib.versionAtLeast builtins.nixVersion "2.6.0" then

9− builtins.fromTOML (builtins.readFile ./languages.toml)

10− else

11− builtins.fromJSON (builtins.readFile (builtins.toPath languages-json));

12− isGitGrammar = (grammar:

13− builtins.hasAttr "source" grammar && builtins.hasAttr "git" grammar.source

14− && builtins.hasAttr "rev" grammar.source);

16+ languagesConfig =

17+ if lib.versionAtLeast builtins.nixVersion "2.6.0"

18+ then builtins.fromTOML (builtins.readFile ./languages.toml)

19+ else builtins.fromJSON (builtins.readFile (builtins.toPath languages-json));

20+ isGitGrammar = grammar:

21+ builtins.hasAttr "source" grammar

22+ && builtins.hasAttr "git" grammar.source

23+ && builtins.hasAttr "rev" grammar.source;

1524 isGitHubGrammar = grammar: lib.hasPrefix "https://github.com" grammar.source.git;

1625 toGitHubFetcher = url: let

1726 match = builtins.match "https://github\.com/([^/]*)/([^/]*)/?" url;

@@ -20,39 +29,42 @@ let

2029 repo = builtins.elemAt match 1;

2130 };

2231 gitGrammars = builtins.filter isGitGrammar languagesConfig.grammar;

23− buildGrammar = grammar:

24− let

25− gh = toGitHubFetcher grammar.source.git;

26− sourceGit = builtins.fetchTree {

27− type = "git";

28− url = grammar.source.git;

29− rev = grammar.source.rev;

30− ref = grammar.source.ref or "HEAD";

31− shallow = true;

32− };

33− sourceGitHub = builtins.fetchTree {

34− type = "github";

35− owner = gh.owner;

36− repo = gh.repo;

37− inherit (grammar.source) rev;

38− };

39− source = if isGitHubGrammar grammar then sourceGitHub else sourceGit;

40− in stdenv.mkDerivation rec {

32+ buildGrammar = grammar: let

33+ gh = toGitHubFetcher grammar.source.git;

34+ sourceGit = builtins.fetchTree {

35+ type = "git";

36+ url = grammar.source.git;

37+ rev = grammar.source.rev;

38+ ref = grammar.source.ref or "HEAD";

39+ shallow = true;

40+ };

41+ sourceGitHub = builtins.fetchTree {

42+ type = "github";

43+ owner = gh.owner;

44+ repo = gh.repo;

45+ inherit (grammar.source) rev;

46+ };

47+ source =

48+ if isGitHubGrammar grammar

49+ then sourceGitHub

50+ else sourceGit;

51+ in

52+ stdenv.mkDerivation {

4153 # see https://github.com/NixOS/nixpkgs/blob/fbdd1a7c0bc29af5325e0d7dd70e804a972eb465/pkgs/development/tools/parsing/tree-sitter/grammar.nix

4254

4355 pname = "helix-tree-sitter-${grammar.name}";

4456 version = grammar.source.rev;

4557

46− src = if builtins.hasAttr "subpath" grammar.source then

47− "${source}/${grammar.source.subpath}"

58+ src = source;

59+ sourceRoot = if builtins.hasAttr "subpath" grammar.source then

60+ "source/${grammar.source.subpath}"

4861 else

49− source;

62+ "source";

5063

51− dontUnpack = true;

5264 dontConfigure = true;

5365

5466 FLAGS = [

55− "-I${src}/src"

67+ "-Isrc"

5668 "-g"

5769 "-O3"

5870 "-fPIC"

@@ -65,13 +77,13 @@ let

6577 buildPhase = ''

6678 runHook preBuild

6779

68− if [[ -e "$src/src/scanner.cc" ]]; then

69− $CXX -c "$src/src/scanner.cc" -o scanner.o $FLAGS

70− elif [[ -e "$src/src/scanner.c" ]]; then

71− $CC -c "$src/src/scanner.c" -o scanner.o $FLAGS

80+ if [[ -e src/scanner.cc ]]; then

81+ $CXX -c src/scanner.cc -o scanner.o $FLAGS

82+ elif [[ -e src/scanner.c ]]; then

83+ $CC -c src/scanner.c -o scanner.o $FLAGS

7284 fi

7385

74− $CC -c "$src/src/parser.c" -o parser.o $FLAGS

86+ $CC -c src/parser.c -o parser.o $FLAGS

7587 $CXX -shared -o $NAME.so *.o

7688

7789 ls -al

@@ -93,14 +105,20 @@ let

93105 runHook postFixup

94106 '';

95107 };

108+ grammarsToBuild = builtins.filter includeGrammarIf gitGrammars;

96109 builtGrammars = builtins.map (grammar: {

97110 inherit (grammar) name;

98− artifact = buildGrammar grammar;

99− }) gitGrammars;

100− grammarLinks = builtins.map (grammar:

101− "ln -s ${grammar.artifact}/${grammar.name}.so $out/${grammar.name}.so")

102− builtGrammars;

103−in runCommand "consolidated-helix-grammars" { } ''

104− mkdir -p $out

105− ${builtins.concatStringsSep "\n" grammarLinks}

106−''

111+ value = buildGrammar grammar;

112+ }) grammarsToBuild;

113+ extensibleGrammars =

114+ lib.makeExtensible (self: builtins.listToAttrs builtGrammars);

115+ overlayedGrammars = lib.pipe extensibleGrammars

116+ (builtins.map (overlay: grammar: grammar.extend overlay) grammarOverlays);

117+ grammarLinks = lib.mapAttrsToList

118+ (name: artifact: "ln -s ${artifact}/${name}.so $out/${name}.so")

119+ (lib.filterAttrs (n: v: lib.isDerivation v) overlayedGrammars);

120+in

121+ runCommand "consolidated-helix-grammars" {} ''

122+ mkdir -p $out

123+ ${builtins.concatStringsSep "\n" grammarLinks}

124+ ''

helix-core/Cargo.toml+28−17

@@ -1,46 +1,57 @@

11[package]

22name = "helix-core"

3−version = "0.6.0"

4−authors = ["Blaž Hrastnik <blaz@mxxn.io>"]

5−edition = "2021"

6−license = "MPL-2.0"

73description = "Helix editor core editing primitives"

8−categories = ["editor"]

9−repository = "https://github.com/helix-editor/helix"

10−homepage = "https://helix-editor.com"

114include = ["src/**/*", "README.md"]

5+version.workspace = true

6+authors.workspace = true

7+edition.workspace = true

8+license.workspace = true

9+rust-version.workspace = true

10+categories.workspace = true

11+repository.workspace = true

12+homepage.workspace = true

1213

1314[features]

1415unicode-lines = ["ropey/unicode_lines"]

16+integration = []

1517

1618[dependencies]

17−helix-loader = { version = "0.6", path = "../helix-loader" }

19+helix-loader = { path = "../helix-loader" }

1820

19−ropey = { version = "1.4", default-features = false }

20−smallvec = "1.8"

21+ropey = { version = "1.6.1", default-features = false, features = ["simd"] }

22+smallvec = "1.11"

2123smartstring = "1.0.1"

22−unicode-segmentation = "1.9"

24+unicode-segmentation = "1.10"

2325unicode-width = "0.1"

24−unicode-general-category = "0.5"

26+unicode-general-category = "0.6"

2527# slab = "0.4.2"

2628slotmap = "1.0"

27−tree-sitter = "0.20"

28−once_cell = "1.10"

29+tree-sitter.workspace = true

30+once_cell = "1.19"

2931arc-swap = "1"

3032regex = "1"

33+bitflags = "2.4"

34+ahash = "0.8.6"

35+hashbrown = { version = "0.14.3", features = ["raw"] }

36+dunce = "1.0"

3137

3238log = "0.4"

3339serde = { version = "1.0", features = ["derive"] }

3440serde_json = "1.0"

35−toml = "0.5"

41+toml = "0.7"

3642

37−similar = "2.1"

43+imara-diff = "0.1.0"

3844

3945encoding_rs = "0.8"

4046

4147chrono = { version = "0.4", default-features = false, features = ["alloc", "std"] }

4248

43−etcetera = "0.3"

49+etcetera = "0.8"

50+textwrap = "0.16.0"

51+

52+nucleo.workspace = true

53+parking_lot = "0.12"

4454

4555[dev-dependencies]

4656quickcheck = { version = "1", default-features = false }

57+indoc = "2.0.4"

helix-core/src/auto_pairs.rs+31−595

@@ -1,16 +1,12 @@

11//! When typing the opening character of one of the possible pairs defined below,

22//! this module provides the functionality to insert the paired closing character.

4−use crate::{

5− graphemes, movement::Direction, Range, Rope, RopeGraphemes, Selection, Tendril, Transaction,

6−};

4+use crate::{graphemes, movement::Direction, Range, Rope, Selection, Tendril, Transaction};

75use std::collections::HashMap;

9−use log::debug;

107use smallvec::SmallVec;

118

129// Heavily based on https://github.com/codemirror/closebrackets/

13−

1410pub const DEFAULT_PAIRS: &[(char, char)] = &[

1511 ('(', ')'),

1612 ('{', '}'),

@@ -21,7 +17,7 @@ pub const DEFAULT_PAIRS: &[(char, char)] = &[

2117];

2218

2319/// The type that represents the collection of auto pairs,

24−/// keyed by the opener.

20+/// keyed by both opener and closer.

2521#[derive(Debug, Clone)]

2622pub struct AutoPairs(HashMap<char, Pair>);

2723

@@ -125,7 +121,7 @@ impl Default for AutoPairs {

125121

126122#[must_use]

127123pub fn hook(doc: &Rope, selection: &Selection, ch: char, pairs: &AutoPairs) -> Option<Transaction> {

128− debug!("autopairs hook selection: {:#?}", selection);

124+ log::trace!("autopairs hook selection: {:#?}", selection);

129125

130126 if let Some(pair) = pairs.get(ch) {

131127 if pair.same() {

@@ -149,22 +145,8 @@ fn prev_char(doc: &Rope, pos: usize) -> Option<char> {

149145 doc.get_char(pos - 1)

150146}

151147

152−fn is_single_grapheme(doc: &Rope, range: &Range) -> bool {

153− let mut graphemes = RopeGraphemes::new(doc.slice(range.from()..range.to()));

154− let first = graphemes.next();

155− let second = graphemes.next();

156− debug!("first: {:#?}, second: {:#?}", first, second);

157− first.is_some() && second.is_none()

158−}

159−

160148/// calculate what the resulting range should be for an auto pair insertion

161−fn get_next_range(

162− doc: &Rope,

163− start_range: &Range,

164− offset: usize,

165− typed_char: char,

166− len_inserted: usize,

167−) -> Range {

149+fn get_next_range(doc: &Rope, start_range: &Range, offset: usize, len_inserted: usize) -> Range {

168150 // When the character under the cursor changes due to complete pair

169151 // insertion, we must look backward a grapheme and then add the length

170152 // of the insertion to put the resulting cursor in the right place, e.g.

@@ -184,13 +166,13 @@ fn get_next_range(

184166 // inserting at the very end of the document after the last newline

185167 if start_range.head == doc.len_chars() && start_range.anchor == doc.len_chars() {

186168 return Range::new(

187− start_range.anchor + offset + typed_char.len_utf8(),

188− start_range.head + offset + typed_char.len_utf8(),

169+ start_range.anchor + offset + 1,

170+ start_range.head + offset + 1,

189171 );

190172 }

191173

192− let single_grapheme = is_single_grapheme(doc, start_range);

193174 let doc_slice = doc.slice(..);

175+ let single_grapheme = start_range.is_single_grapheme(doc_slice);

194176

195177 // just skip over graphemes

196178 if len_inserted == 0 {

@@ -215,29 +197,28 @@ fn get_next_range(

215197 // trivial case: only inserted a single-char opener, just move the selection

216198 if len_inserted == 1 {

217199 let end_anchor = if single_grapheme || start_range.direction() == Direction::Backward {

218− start_range.anchor + offset + typed_char.len_utf8()

200+ start_range.anchor + offset + 1

219201 } else {

220202 start_range.anchor + offset

221203 };

222204

223− return Range::new(

224− end_anchor,

225− start_range.head + offset + typed_char.len_utf8(),

226− );

205+ return Range::new(end_anchor, start_range.head + offset + 1);

227206 }

228207

229208 // If the head = 0, then we must be in insert mode with a backward

230209 // cursor, which implies the head will just move

231210 let end_head = if start_range.head == 0 || start_range.direction() == Direction::Backward {

232− start_range.head + offset + typed_char.len_utf8()

211+ start_range.head + offset + 1

233212 } else {

234213 // We must have a forward cursor, which means we must move to the

235214 // other end of the grapheme to get to where the new characters

236215 // are inserted, then move the head to where it should be

237216 let prev_bound = graphemes::prev_grapheme_boundary(doc_slice, start_range.head);

238− debug!(

217+ log::trace!(

239218 "prev_bound: {}, offset: {}, len_inserted: {}",

240− prev_bound, offset, len_inserted

219+ prev_bound,

220+ offset,

221+ len_inserted

241222 );

242223 prev_bound + offset + len_inserted

243224 };

@@ -253,8 +234,7 @@ fn get_next_range(

253234

254235 (_, Direction::Forward) => {

255236 if single_grapheme {

256− graphemes::prev_grapheme_boundary(doc.slice(..), start_range.head)

257− + typed_char.len_utf8()

237+ graphemes::prev_grapheme_boundary(doc.slice(..), start_range.head) + 1

258238

259239 // if we are appending, the anchor stays where it is; only offset

260240 // for multiple range insertions

@@ -268,7 +248,9 @@ fn get_next_range(

268248 // if we're backward, then the head is at the first char

269249 // of the typed char, so we need to add the length of

270250 // the closing char

271− graphemes::prev_grapheme_boundary(doc.slice(..), start_range.anchor) + len_inserted

251+ graphemes::prev_grapheme_boundary(doc.slice(..), start_range.anchor)

252+ + len_inserted

253+ + offset

272254 } else {

273255 // when we are inserting in front of a selection, we need to move

274256 // the anchor over by however many characters were inserted overall

@@ -289,9 +271,12 @@ fn handle_open(doc: &Rope, selection: &Selection, pair: &Pair) -> Transaction {

289271 let next_char = doc.get_char(cursor);

290272 let len_inserted;

291273

274+ // Since auto pairs are currently limited to single chars, we're either

275+ // inserting exactly one or two chars. When arbitrary length pairs are

276+ // added, these will need to be changed.

292277 let change = match next_char {

293278 Some(_) if !pair.should_close(doc, start_range) => {

294− len_inserted = pair.open.len_utf8();

279+ len_inserted = 1;

295280 let mut tendril = Tendril::new();

296281 tendril.push(pair.open);

297282 (cursor, cursor, Some(tendril))

@@ -299,12 +284,12 @@ fn handle_open(doc: &Rope, selection: &Selection, pair: &Pair) -> Transaction {

299284 _ => {

300285 // insert open & close

301286 let pair_str = Tendril::from_iter([pair.open, pair.close]);

302− len_inserted = pair.open.len_utf8() + pair.close.len_utf8();

287+ len_inserted = 2;

303288 (cursor, cursor, Some(pair_str))

304289 }

305290 };

306291

307− let next_range = get_next_range(doc, start_range, offs, pair.open, len_inserted);

292+ let next_range = get_next_range(doc, start_range, offs, len_inserted);

308293 end_ranges.push(next_range);

309294 offs += len_inserted;

310295

@@ -312,13 +297,12 @@ fn handle_open(doc: &Rope, selection: &Selection, pair: &Pair) -> Transaction {

312297 });

313298

314299 let t = transaction.with_selection(Selection::new(end_ranges, selection.primary_index()));

315− debug!("auto pair transaction: {:#?}", t);

300+ log::debug!("auto pair transaction: {:#?}", t);

316301 t

317302}

318303

319304fn handle_close(doc: &Rope, selection: &Selection, pair: &Pair) -> Transaction {

320305 let mut end_ranges = SmallVec::with_capacity(selection.len());

321−

322306 let mut offs = 0;

323307

324308 let transaction = Transaction::change_by_selection(doc, selection, |start_range| {

@@ -330,13 +314,13 @@ fn handle_close(doc: &Rope, selection: &Selection, pair: &Pair) -> Transaction {

330314 // return transaction that moves past close

331315 (cursor, cursor, None) // no-op

332316 } else {

333− len_inserted += pair.close.len_utf8();

317+ len_inserted = 1;

334318 let mut tendril = Tendril::new();

335319 tendril.push(pair.close);

336320 (cursor, cursor, Some(tendril))

337321 };

338322

339− let next_range = get_next_range(doc, start_range, offs, pair.close, len_inserted);

323+ let next_range = get_next_range(doc, start_range, offs, len_inserted);

340324 end_ranges.push(next_range);

341325 offs += len_inserted;

342326

@@ -344,7 +328,7 @@ fn handle_close(doc: &Rope, selection: &Selection, pair: &Pair) -> Transaction {

344328 });

345329

346330 let t = transaction.with_selection(Selection::new(end_ranges, selection.primary_index()));

347− debug!("auto pair transaction: {:#?}", t);

331+ log::debug!("auto pair transaction: {:#?}", t);

348332 t

349333}

350334

@@ -372,11 +356,11 @@ fn handle_same(doc: &Rope, selection: &Selection, pair: &Pair) -> Transaction {

372356 pair_str.push(pair.close);

373357 }

374358

375− len_inserted += pair_str.len();

359+ len_inserted += pair_str.chars().count();

376360 (cursor, cursor, Some(pair_str))

377361 };

378362

379− let next_range = get_next_range(doc, start_range, offs, pair.open, len_inserted);

363+ let next_range = get_next_range(doc, start_range, offs, len_inserted);

380364 end_ranges.push(next_range);

381365 offs += len_inserted;

382366

@@ -384,554 +368,6 @@ fn handle_same(doc: &Rope, selection: &Selection, pair: &Pair) -> Transaction {

384368 });

385369

386370 let t = transaction.with_selection(Selection::new(end_ranges, selection.primary_index()));

387− debug!("auto pair transaction: {:#?}", t);

371+ log::debug!("auto pair transaction: {:#?}", t);

388372 t

389373}

390−

391−#[cfg(test)]

392−mod test {

393− use super::*;

394− use smallvec::smallvec;

395−

396− const LINE_END: &str = crate::DEFAULT_LINE_ENDING.as_str();

397−

398− fn differing_pairs() -> impl Iterator<Item = &'static (char, char)> {

399− DEFAULT_PAIRS.iter().filter(|(open, close)| open != close)

400− }

401−

402− fn matching_pairs() -> impl Iterator<Item = &'static (char, char)> {

403− DEFAULT_PAIRS.iter().filter(|(open, close)| open == close)

404− }

405−

406− fn test_hooks(

407− in_doc: &Rope,

408− in_sel: &Selection,

409− ch: char,

410− pairs: &[(char, char)],

411− expected_doc: &Rope,

412− expected_sel: &Selection,

413− ) {

414− let pairs = AutoPairs::new(pairs.iter());

415− let trans = hook(in_doc, in_sel, ch, &pairs).unwrap();

416− let mut actual_doc = in_doc.clone();

417− assert!(trans.apply(&mut actual_doc));

418− assert_eq!(expected_doc, &actual_doc);

419− assert_eq!(expected_sel, trans.selection().unwrap());

420− }

421−

422− fn test_hooks_with_pairs<I, F, R>(

423− in_doc: &Rope,

424− in_sel: &Selection,

425− test_pairs: I,

426− pairs: &[(char, char)],

427− get_expected_doc: F,

428− actual_sel: &Selection,

429− ) where

430− I: IntoIterator<Item = &'static (char, char)>,

431− F: Fn(char, char) -> R,

432− R: Into<Rope>,

433− Rope: From<R>,

434− {

435− test_pairs.into_iter().for_each(|(open, close)| {

436− test_hooks(

437− in_doc,

438− in_sel,

439− *open,

440− pairs,

441− &Rope::from(get_expected_doc(*open, *close)),

442− actual_sel,

443− )

444− });

445− }

446−

447− // [] indicates range

448−

449− /// [] -> insert ( -> ([])

450− #[test]

451− fn test_insert_blank() {

452− test_hooks_with_pairs(

453− &Rope::from(LINE_END),

454− &Selection::single(1, 0),

455− DEFAULT_PAIRS,

456− DEFAULT_PAIRS,

457− |open, close| format!("{}{}{}", open, close, LINE_END),

458− &Selection::single(2, 1),

459− );

460−

461− let empty_doc = Rope::from(format!("{line_end}{line_end}", line_end = LINE_END));

462−

463− test_hooks_with_pairs(

464− &empty_doc,

465− &Selection::single(empty_doc.len_chars(), LINE_END.len()),

466− DEFAULT_PAIRS,

467− DEFAULT_PAIRS,

468− |open, close| {

469− format!(

470− "{line_end}{open}{close}{line_end}",

471− open = open,

472− close = close,

473− line_end = LINE_END

474− )

475− },

476− &Selection::single(LINE_END.len() + 2, LINE_END.len() + 1),

477− );

478− }

479−

480− #[test]

481− fn test_insert_before_multi_code_point_graphemes() {

482− for (_, close) in differing_pairs() {

483− test_hooks(

484− &Rope::from(format!("hello 👨‍👩‍👧‍👦 goodbye{}", LINE_END)),

485− &Selection::single(13, 6),

486− *close,

487− DEFAULT_PAIRS,

488− &Rope::from(format!("hello {}👨‍👩‍👧‍👦 goodbye{}", close, LINE_END)),

489− &Selection::single(14, 7),

490− );

491− }

492− }

493−

494− #[test]

495− fn test_insert_at_end_of_document() {

496− test_hooks_with_pairs(

497− &Rope::from(LINE_END),

498− &Selection::single(LINE_END.len(), LINE_END.len()),

499− DEFAULT_PAIRS,

500− DEFAULT_PAIRS,

501− |open, close| format!("{}{}{}", LINE_END, open, close),

502− &Selection::single(LINE_END.len() + 1, LINE_END.len() + 1),

503− );

504−

505− test_hooks_with_pairs(

506− &Rope::from(format!("foo{}", LINE_END)),

507− &Selection::single(3 + LINE_END.len(), 3 + LINE_END.len()),

508− DEFAULT_PAIRS,

509− DEFAULT_PAIRS,

510− |open, close| format!("foo{}{}{}", LINE_END, open, close),

511− &Selection::single(LINE_END.len() + 4, LINE_END.len() + 4),

512− );

513− }

514−

515− /// [] -> append ( -> ([])

516− #[test]

517− fn test_append_blank() {

518− test_hooks_with_pairs(

519− // this is what happens when you have a totally blank document and then append

520− &Rope::from(format!("{line_end}{line_end}", line_end = LINE_END)),

521− // before inserting the pair, the cursor covers all of both empty lines

522− &Selection::single(0, LINE_END.len() * 2),

523− DEFAULT_PAIRS,

524− DEFAULT_PAIRS,

525− |open, close| {

526− format!(

527− "{line_end}{open}{close}{line_end}",

528− line_end = LINE_END,

529− open = open,

530− close = close

531− )

532− },

533− // after inserting pair, the cursor covers the first new line and the open char

534− &Selection::single(0, LINE_END.len() + 2),

535− );

536− }

537−

538− /// [] ([])

539− /// [] -> insert -> ([])

540− /// [] ([])

541− #[test]

542− fn test_insert_blank_multi_cursor() {

543− test_hooks_with_pairs(

544− &Rope::from("\n\n\n"),

545− &Selection::new(

546− smallvec!(Range::new(1, 0), Range::new(2, 1), Range::new(3, 2),),

547− 0,

548− ),

549− DEFAULT_PAIRS,

550− DEFAULT_PAIRS,

551− |open, close| {

552− format!(

553− "{open}{close}\n{open}{close}\n{open}{close}\n",

554− open = open,

555− close = close

556− )

557− },

558− &Selection::new(

559− smallvec!(Range::new(2, 1), Range::new(5, 4), Range::new(8, 7),),

560− 0,

561− ),

562− );

563− }

564−

565− /// fo[o] -> append ( -> fo[o(])

566− #[test]

567− fn test_append() {

568− test_hooks_with_pairs(

569− &Rope::from("foo\n"),

570− &Selection::single(2, 4),

571− differing_pairs(),

572− DEFAULT_PAIRS,

573− |open, close| format!("foo{}{}\n", open, close),

574− &Selection::single(2, 5),

575− );

576− }

577−

578− /// foo[] -> append to end of line ( -> foo([])

579− #[test]

580− fn test_append_single_cursor() {

581− test_hooks_with_pairs(

582− &Rope::from(format!("foo{}", LINE_END)),

583− &Selection::single(3, 3 + LINE_END.len()),

584− differing_pairs(),

585− DEFAULT_PAIRS,

586− |open, close| format!("foo{}{}{}", open, close, LINE_END),

587− &Selection::single(4, 5),

588− );

589− }

590−

591− /// fo[o] fo[o(])

592− /// fo[o] -> append ( -> fo[o(])

593− /// fo[o] fo[o(])

594− #[test]

595− fn test_append_multi() {

596− test_hooks_with_pairs(

597− &Rope::from("foo\nfoo\nfoo\n"),

598− &Selection::new(

599− smallvec!(Range::new(2, 4), Range::new(6, 8), Range::new(10, 12)),

600− 0,

601− ),

602− differing_pairs(),

603− DEFAULT_PAIRS,

604− |open, close| {

605− format!(

606− "foo{open}{close}\nfoo{open}{close}\nfoo{open}{close}\n",

607− open = open,

608− close = close

609− )

610− },

611− &Selection::new(

612− smallvec!(Range::new(2, 5), Range::new(8, 11), Range::new(14, 17)),

613− 0,

614− ),

615− );

616− }

617−

618− /// ([)] -> insert ) -> ()[]

619− #[test]

620− fn test_insert_close_inside_pair() {

621− for (open, close) in DEFAULT_PAIRS {

622− let doc = Rope::from(format!("{}{}{}", open, close, LINE_END));

623−

624− test_hooks(

625− &doc,

626− &Selection::single(2, 1),

627− *close,

628− DEFAULT_PAIRS,

629− &doc,

630− &Selection::single(2 + LINE_END.len(), 2),

631− );

632− }

633− }

634−

635− /// [(]) -> append ) -> [()]

636− #[test]

637− fn test_append_close_inside_pair() {

638− for (open, close) in DEFAULT_PAIRS {

639− let doc = Rope::from(format!("{}{}{}", open, close, LINE_END));

640−

641− test_hooks(

642− &doc,

643− &Selection::single(0, 2),

644− *close,

645− DEFAULT_PAIRS,

646− &doc,

647− &Selection::single(0, 2 + LINE_END.len()),

648− );

649− }

650− }

651−

652− /// ([]) ()[]

653− /// ([]) -> insert ) -> ()[]

654− /// ([]) ()[]

655− #[test]

656− fn test_insert_close_inside_pair_multi_cursor() {

657− let sel = Selection::new(

658− smallvec!(Range::new(2, 1), Range::new(5, 4), Range::new(8, 7),),

659− 0,

660− );

661−

662− let expected_sel = Selection::new(

663− smallvec!(Range::new(3, 2), Range::new(6, 5), Range::new(9, 8),),

664− 0,

665− );

666−

667− for (open, close) in DEFAULT_PAIRS {

668− let doc = Rope::from(format!(

669− "{open}{close}\n{open}{close}\n{open}{close}\n",

670− open = open,

671− close = close

672− ));

673−

674− test_hooks(&doc, &sel, *close, DEFAULT_PAIRS, &doc, &expected_sel);

675− }

676− }

677−

678− /// [(]) [()]

679− /// [(]) -> append ) -> [()]

680− /// [(]) [()]

681− #[test]

682− fn test_append_close_inside_pair_multi_cursor() {

683− let sel = Selection::new(

684− smallvec!(Range::new(0, 2), Range::new(3, 5), Range::new(6, 8),),

685− 0,

686− );

687−

688− let expected_sel = Selection::new(

689− smallvec!(Range::new(0, 3), Range::new(3, 6), Range::new(6, 9),),

690− 0,

691− );

692−

693− for (open, close) in DEFAULT_PAIRS {

694− let doc = Rope::from(format!(

695− "{open}{close}\n{open}{close}\n{open}{close}\n",

696− open = open,

697− close = close

698− ));

699−

700− test_hooks(&doc, &sel, *close, DEFAULT_PAIRS, &doc, &expected_sel);

701− }

702− }

703−

704− /// ([]) -> insert ( -> (([]))

705− #[test]

706− fn test_insert_open_inside_pair() {

707− let sel = Selection::single(2, 1);

708− let expected_sel = Selection::single(3, 2);

709−

710− for (open, close) in differing_pairs() {

711− let doc = Rope::from(format!("{}{}", open, close));

712− let expected_doc = Rope::from(format!(

713− "{open}{open}{close}{close}",

714− open = open,

715− close = close

716− ));

717−

718− test_hooks(

719− &doc,

720− &sel,

721− *open,

722− DEFAULT_PAIRS,

723− &expected_doc,

724− &expected_sel,

725− );

726− }

727− }

728−

729− /// [word(]) -> append ( -> [word((]))

730− #[test]

731− fn test_append_open_inside_pair() {

732− let sel = Selection::single(0, 6);

733− let expected_sel = Selection::single(0, 7);

734−

735− for (open, close) in differing_pairs() {

736− let doc = Rope::from(format!("word{}{}", open, close));

737− let expected_doc = Rope::from(format!(

738− "word{open}{open}{close}{close}",

739− open = open,

740− close = close

741− ));

742−

743− test_hooks(

744− &doc,

745− &sel,

746− *open,

747− DEFAULT_PAIRS,

748− &expected_doc,

749− &expected_sel,

750− );

751− }

752− }

753−

754− /// ([]) -> insert " -> ("[]")

755− #[test]

756− fn test_insert_nested_open_inside_pair() {

757− let sel = Selection::single(2, 1);

758− let expected_sel = Selection::single(3, 2);

759−

760− for (outer_open, outer_close) in differing_pairs() {

761− let doc = Rope::from(format!("{}{}", outer_open, outer_close,));

762−

763− for (inner_open, inner_close) in matching_pairs() {

764− let expected_doc = Rope::from(format!(

765− "{}{}{}{}",

766− outer_open, inner_open, inner_close, outer_close

767− ));

768−

769− test_hooks(

770− &doc,

771− &sel,

772− *inner_open,

773− DEFAULT_PAIRS,

774− &expected_doc,

775− &expected_sel,

776− );

777− }

778− }

779− }

780−

781− /// [(]) -> append " -> [("]")

782− #[test]

783− fn test_append_nested_open_inside_pair() {

784− let sel = Selection::single(0, 2);

785− let expected_sel = Selection::single(0, 3);

786−

787− for (outer_open, outer_close) in differing_pairs() {

788− let doc = Rope::from(format!("{}{}", outer_open, outer_close,));

789−

790− for (inner_open, inner_close) in matching_pairs() {

791− let expected_doc = Rope::from(format!(

792− "{}{}{}{}",

793− outer_open, inner_open, inner_close, outer_close

794− ));

795−

796− test_hooks(

797− &doc,

798− &sel,

799− *inner_open,

800− DEFAULT_PAIRS,

801− &expected_doc,

802− &expected_sel,

803− );

804− }

805− }

806− }

807−

808− /// []word -> insert ( -> ([]word

809− #[test]

810− fn test_insert_open_before_non_pair() {

811− test_hooks_with_pairs(

812− &Rope::from("word"),

813− &Selection::single(1, 0),

814− DEFAULT_PAIRS,

815− DEFAULT_PAIRS,

816− |open, _| format!("{}word", open),

817− &Selection::single(2, 1),

818− )

819− }

820−

821− /// [wor]d -> insert ( -> ([wor]d

822− #[test]

823− fn test_insert_open_with_selection() {

824− test_hooks_with_pairs(

825− &Rope::from("word"),

826− &Selection::single(3, 0),

827− DEFAULT_PAIRS,

828− DEFAULT_PAIRS,

829− |open, _| format!("{}word", open),

830− &Selection::single(4, 1),

831− )

832− }

833−

834− /// [wor]d -> append ) -> [wor)]d

835− #[test]

836− fn test_append_close_inside_non_pair_with_selection() {

837− let sel = Selection::single(0, 4);

838− let expected_sel = Selection::single(0, 5);

839−

840− for (_, close) in DEFAULT_PAIRS {

841− let doc = Rope::from("word");

842− let expected_doc = Rope::from(format!("wor{}d", close));

843− test_hooks(

844− &doc,

845− &sel,

846− *close,

847− DEFAULT_PAIRS,

848− &expected_doc,

849− &expected_sel,

850− );

851− }

852− }

853−

854− /// foo[ wor]d -> insert ( -> foo([) wor]d

855− #[test]

856− fn test_insert_open_trailing_word_with_selection() {

857− test_hooks_with_pairs(

858− &Rope::from("foo word"),

859− &Selection::single(7, 3),

860− differing_pairs(),

861− DEFAULT_PAIRS,

862− |open, close| format!("foo{}{} word", open, close),

863− &Selection::single(9, 4),

864− )

865− }

866−

867− /// foo([) wor]d -> insert ) -> foo()[ wor]d

868− #[test]

869− fn test_insert_close_inside_pair_trailing_word_with_selection() {

870− for (open, close) in differing_pairs() {

871− test_hooks(

872− &Rope::from(format!("foo{}{} word{}", open, close, LINE_END)),

873− &Selection::single(9, 4),

874− *close,

875− DEFAULT_PAIRS,

876− &Rope::from(format!("foo{}{} word{}", open, close, LINE_END)),

877− &Selection::single(9, 5),

878− )

879− }

880− }

881−

882− /// we want pairs that are *not* the same char to be inserted after

883− /// a non-pair char, for cases like functions, but for pairs that are

884− /// the same char, we want to *not* insert a pair to handle cases like "I'm"

885− ///

886− /// word[] -> insert ( -> word([])

887− /// word[] -> insert ' -> word'[]

888− #[test]

889− fn test_insert_open_after_non_pair() {

890− let doc = Rope::from(format!("word{}", LINE_END));

891− let sel = Selection::single(5, 4);

892− let expected_sel = Selection::single(6, 5);

893−

894− test_hooks_with_pairs(

895− &doc,

896− &sel,

897− differing_pairs(),

898− DEFAULT_PAIRS,

899− |open, close| format!("word{}{}{}", open, close, LINE_END),

900− &expected_sel,

901− );

902−

903− test_hooks_with_pairs(

904− &doc,

905− &sel,

906− matching_pairs(),

907− DEFAULT_PAIRS,

908− |open, _| format!("word{}{}", open, LINE_END),

909− &expected_sel,

910− );

911− }

912−

913− #[test]

914− fn test_configured_pairs() {

915− let test_pairs = &[('`', ':'), ('+', '-')];

916−

917− test_hooks_with_pairs(

918− &Rope::from(LINE_END),

919− &Selection::single(1, 0),

920− test_pairs,

921− test_pairs,

922− |open, close| format!("{}{}{}", open, close, LINE_END),

923− &Selection::single(2, 1),

924− );

925−

926− let doc = Rope::from(format!("foo`: word{}", LINE_END));

927−

928− test_hooks(

929− &doc,

930− &Selection::single(9, 4),

931− ':',

932− test_pairs,

933− &doc,

934− &Selection::single(9, 5),

935− )

936− }

937−}

helix-core/src/comment.rs+34−25

@@ -45,7 +45,7 @@ fn find_line_comment(

4545

4646 // determine margin of 0 or 1 for uncommenting; if any comment token is not followed by a space,

4747 // a margin of 0 is used for all lines.

48− if matches!(line_slice.get_char(pos + token_len), Some(c) if c != ' ') {

48+ if !matches!(line_slice.get_char(pos + token_len), Some(c) if c == ' ') {

4949 margin = 0;

5050 }

5151

@@ -68,7 +68,7 @@ pub fn toggle_line_comments(doc: &Rope, selection: &Selection, token: Option<&st

6868 let mut min_next_line = 0;

6969 for selection in selection {

7070 let (start, end) = selection.line_range(text);

71− let start = start.max(min_next_line).min(text.len_lines());

71+ let start = start.clamp(min_next_line, text.len_lines());

7272 let end = (end + 1).min(text.len_lines());

7373

7474 lines.extend(start..end);

@@ -100,43 +100,52 @@ mod test {

100100

101101 #[test]

102102 fn test_find_line_comment() {

103− use crate::State;

104−

105103 // four lines, two space indented, except for line 1 which is blank.

106− let doc = Rope::from(" 1\n\n 2\n 3");

107−

108− let mut state = State::new(doc);

104+ let mut doc = Rope::from(" 1\n\n 2\n 3");

109105 // select whole document

110− state.selection = Selection::single(0, state.doc.len_chars() - 1);

106+ let mut selection = Selection::single(0, doc.len_chars() - 1);

111107

112− let text = state.doc.slice(..);

108+ let text = doc.slice(..);

113109

114110 let res = find_line_comment("//", text, 0..3);

115− // (commented = true, to_change = [line 0, line 2], min = col 2, margin = 1)

116− assert_eq!(res, (false, vec![0, 2], 2, 1));

111+ // (commented = true, to_change = [line 0, line 2], min = col 2, margin = 0)

112+ assert_eq!(res, (false, vec![0, 2], 2, 0));

117113

118114 // comment

119− let transaction = toggle_line_comments(&state.doc, &state.selection, None);

120− transaction.apply(&mut state.doc);

121− state.selection = state.selection.map(transaction.changes());

115+ let transaction = toggle_line_comments(&doc, &selection, None);

116+ transaction.apply(&mut doc);

117+ selection = selection.map(transaction.changes());

122118

123− assert_eq!(state.doc, " // 1\n\n // 2\n // 3");

119+ assert_eq!(doc, " // 1\n\n // 2\n // 3");

124120

125121 // uncomment

126− let transaction = toggle_line_comments(&state.doc, &state.selection, None);

127− transaction.apply(&mut state.doc);

128− state.selection = state.selection.map(transaction.changes());

129− assert_eq!(state.doc, " 1\n\n 2\n 3");

122+ let transaction = toggle_line_comments(&doc, &selection, None);

123+ transaction.apply(&mut doc);

124+ selection = selection.map(transaction.changes());

125+ assert_eq!(doc, " 1\n\n 2\n 3");

126+ assert!(selection.len() == 1); // to ignore the selection unused warning

130127

131128 // 0 margin comments

132− state.doc = Rope::from(" //1\n\n //2\n //3");

129+ doc = Rope::from(" //1\n\n //2\n //3");

130+ // reset the selection.

131+ selection = Selection::single(0, doc.len_chars() - 1);

132+

133+ let transaction = toggle_line_comments(&doc, &selection, None);

134+ transaction.apply(&mut doc);

135+ selection = selection.map(transaction.changes());

136+ assert_eq!(doc, " 1\n\n 2\n 3");

137+ assert!(selection.len() == 1); // to ignore the selection unused warning

138+

139+ // 0 margin comments, with no space

140+ doc = Rope::from("//");

133141 // reset the selection.

134− state.selection = Selection::single(0, state.doc.len_chars() - 1);

142+ selection = Selection::single(0, doc.len_chars() - 1);

135143

136− let transaction = toggle_line_comments(&state.doc, &state.selection, None);

137− transaction.apply(&mut state.doc);

138− state.selection = state.selection.map(transaction.changes());

139− assert_eq!(state.doc, " 1\n\n 2\n 3");

144+ let transaction = toggle_line_comments(&doc, &selection, None);

145+ transaction.apply(&mut doc);

146+ selection = selection.map(transaction.changes());

147+ assert_eq!(doc, "");

148+ assert!(selection.len() == 1); // to ignore the selection unused warning

140149

141150 // TODO: account for uncommenting with uneven comment indentation

142151 }

helix-core/src/config.rs+2−2

@@ -1,10 +1,10 @@

11/// Syntax configuration loader based on built-in languages.toml.

22pub fn default_syntax_loader() -> crate::syntax::Configuration {

3− helix_loader::default_lang_config()

3+ helix_loader::config::default_lang_config()

44 .try_into()

55 .expect("Could not serialize built-in languages.toml")

66}

77/// Syntax configuration loader based on user configured languages.toml.

88pub fn user_syntax_loader() -> Result<crate::syntax::Configuration, toml::de::Error> {

9− helix_loader::user_lang_config()?.try_into()

9+ helix_loader::config::user_lang_config()?.try_into()

1010}

helix-core/src/diagnostic.rs+22−1

@@ -23,11 +23,32 @@ pub struct Range {

2323 pub end: usize,

2424}

2525

26−/// Corresponds to [`lsp_types::Diagnostic`](https://docs.rs/lsp-types/0.91.0/lsp_types/struct.Diagnostic.html)

26+#[derive(Debug, Eq, Hash, PartialEq, Clone, Deserialize, Serialize)]

27+pub enum NumberOrString {

28+ Number(i32),

29+ String(String),

30+}

31+

32+#[derive(Debug, Clone)]

33+pub enum DiagnosticTag {

34+ Unnecessary,

35+ Deprecated,

36+}

37+

38+/// Corresponds to [`lsp_types::Diagnostic`](https://docs.rs/lsp-types/0.94.0/lsp_types/struct.Diagnostic.html)

2739#[derive(Debug, Clone)]

2840pub struct Diagnostic {

2941 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,

3046 pub line: usize,

3147 pub message: String,

3248 pub severity: Option<Severity>,

49+ pub code: Option<NumberOrString>,

50+ pub language_server_id: usize,

51+ pub tags: Vec<DiagnosticTag>,

52+ pub source: Option<String>,

53+ pub data: Option<serde_json::Value>,

3354}

helix-core/src/diff.rs+202−45

@@ -1,58 +1,194 @@

1−use crate::{Rope, Transaction};

1+use std::ops::Range;

2+use std::time::Instant;

3−/// Compares `old` and `new` to generate a [`Transaction`] describing

4−/// the steps required to get from `old` to `new`.

5−pub fn compare_ropes(old: &Rope, new: &Rope) -> Transaction {

6− // `similar` only works on contiguous data, so a `Rope` has

7− // to be temporarily converted into a `String`.

8− let old_converted = old.to_string();

9− let new_converted = new.to_string();

10−

11− // A timeout is set so after 1 seconds, the algorithm will start

12− // approximating. This is especially important for big `Rope`s or

13− // `Rope`s that are extremely dissimilar to each other.

14− let mut config = similar::TextDiff::configure();

15− config.timeout(std::time::Duration::from_secs(1));

16−

17− let diff = config.diff_chars(&old_converted, &new_converted);

18−

19− // The current position of the change needs to be tracked to

20− // construct the `Change`s.

21− let mut pos = 0;

22− Transaction::change(

23− old,

24− diff.ops()

4+use imara_diff::intern::InternedInput;

5+use imara_diff::Algorithm;

6+use ropey::RopeSlice;

8+use crate::{ChangeSet, Rope, Tendril, Transaction};

10+/// A `imara_diff::Sink` that builds a `ChangeSet` for a character diff of a hunk

11+struct CharChangeSetBuilder<'a> {

12+ res: &'a mut ChangeSet,

13+ hunk: &'a InternedInput<char>,

14+ pos: u32,

15+}

16+

17+impl imara_diff::Sink for CharChangeSetBuilder<'_> {

18+ type Out = ();

19+ fn process_change(&mut self, before: Range<u32>, after: Range<u32>) {

20+ self.res.retain((before.start - self.pos) as usize);

21+ self.res.delete(before.len());

22+ self.pos = before.end;

23+

24+ let res = self.hunk.after[after.start as usize..after.end as usize]

25+ .iter()

26+ .map(|&token| self.hunk.interner[token])

27+ .collect();

28+

29+ self.res.insert(res);

30+ }

31+

32+ fn finish(self) -> Self::Out {

33+ self.res.retain(self.hunk.before.len() - self.pos as usize);

34+ }

35+}

36+

37+struct LineChangeSetBuilder<'a> {

38+ res: ChangeSet,

39+ after: RopeSlice<'a>,

40+ file: &'a InternedInput<RopeSlice<'a>>,

41+ current_hunk: InternedInput<char>,

42+ pos: u32,

43+}

44+

45+impl imara_diff::Sink for LineChangeSetBuilder<'_> {

46+ type Out = ChangeSet;

47+

48+ fn process_change(&mut self, before: Range<u32>, after: Range<u32>) {

49+ let len = self.file.before[self.pos as usize..before.start as usize]

2550 .iter()

26− .map(|op| op.as_tag_tuple())

27− .filter_map(|(tag, old_range, new_range)| {

28− // `old_pos..pos` is equivalent to `start..end` for where

29− // the change should be applied.

30− let old_pos = pos;

31− pos += old_range.end - old_range.start;

32−

33− match tag {

34− // Semantically, inserts and replacements are the same thing.

35− similar::DiffTag::Insert | similar::DiffTag::Replace => {

36− // This is the text from the `new` rope that should be

37− // inserted into `old`.

38− let text: &str = {

39− let start = new.char_to_byte(new_range.start);

40− let end = new.char_to_byte(new_range.end);

41− &new_converted[start..end]

42− };

43− Some((old_pos, pos, Some(text.into())))

51+ .map(|&it| self.file.interner[it].len_chars())

52+ .sum();

53+ self.res.retain(len);

54+ self.pos = before.end;

55+

56+ // do not perform diffs on large hunks

57+ let len_before = before.end - before.start;

58+ let len_after = after.end - after.start;

59+

60+ // Pure insertions/removals do not require a character diff.

61+ // Very large changes are ignored because their character diff is expensive to compute

62+ // TODO adjust heuristic to detect large changes?

63+ if len_before == 0

64+ || len_after == 0

65+ || len_after > 5 * len_before

66+ || 5 * len_after < len_before && len_before > 10

67+ || len_before + len_after > 200

68+ {

69+ let remove = self.file.before[before.start as usize..before.end as usize]

70+ .iter()

71+ .map(|&it| self.file.interner[it].len_chars())

72+ .sum();

73+ self.res.delete(remove);

74+ let mut fragment = Tendril::new();

75+ if len_after > 500 {

76+ // copying a rope line by line is slower then copying the entire

77+ // rope. Use to_string for very large changes instead..

78+ if self.file.after.len() == after.end as usize {

79+ if after.start == 0 {

80+ fragment = self.after.to_string().into();

81+ } else {

82+ let start = self.after.line_to_char(after.start as usize);

83+ fragment = self.after.slice(start..).to_string().into();

4484 }

45− similar::DiffTag::Delete => Some((old_pos, pos, None)),

46− similar::DiffTag::Equal => None,

85+ } else if after.start == 0 {

86+ let end = self.after.line_to_char(after.end as usize);

87+ fragment = self.after.slice(..end).to_string().into();

88+ } else {

89+ let start = self.after.line_to_char(after.start as usize);

90+ let end = self.after.line_to_char(after.end as usize);

91+ fragment = self.after.slice(start..end).to_string().into();

4792 }

48− }),

49− )

93+ } else {

94+ for &line in &self.file.after[after.start as usize..after.end as usize] {

95+ for chunk in self.file.interner[line].chunks() {

96+ fragment.push_str(chunk)

97+ }

98+ }

99+ };

100+ self.res.insert(fragment);

101+ } else {

102+ // for reasonably small hunks, generating a ChangeSet from char diff can save memory

103+ // TODO use a tokenizer (word diff?) for improved performance

104+ let hunk_before = self.file.before[before.start as usize..before.end as usize]

105+ .iter()

106+ .flat_map(|&it| self.file.interner[it].chars());

107+ let hunk_after = self.file.after[after.start as usize..after.end as usize]

108+ .iter()

109+ .flat_map(|&it| self.file.interner[it].chars());

110+ self.current_hunk.update_before(hunk_before);

111+ self.current_hunk.update_after(hunk_after);

112+

113+ // the histogram heuristic does not work as well

114+ // for characters because the same characters often reoccur

115+ // use myer diff instead

116+ imara_diff::diff(

117+ Algorithm::Myers,

118+ &self.current_hunk,

119+ CharChangeSetBuilder {

120+ res: &mut self.res,

121+ hunk: &self.current_hunk,

122+ pos: 0,

123+ },

124+ );

125+

126+ self.current_hunk.clear();

127+ }

128+ }

129+

130+ fn finish(mut self) -> Self::Out {

131+ let len = self.file.before[self.pos as usize..]

132+ .iter()

133+ .map(|&it| self.file.interner[it].len_chars())

134+ .sum();

135+

136+ self.res.retain(len);

137+ self.res

138+ }

139+}

140+

141+struct RopeLines<'a>(RopeSlice<'a>);

142+

143+impl<'a> imara_diff::intern::TokenSource for RopeLines<'a> {

144+ type Token = RopeSlice<'a>;

145+ type Tokenizer = ropey::iter::Lines<'a>;

146+

147+ fn tokenize(&self) -> Self::Tokenizer {

148+ self.0.lines()

149+ }

150+

151+ fn estimate_tokens(&self) -> u32 {

152+ // we can provide a perfect estimate which is very nice for performance

153+ self.0.len_lines() as u32

154+ }

155+}

156+

157+/// Compares `old` and `new` to generate a [`Transaction`] describing

158+/// the steps required to get from `old` to `new`.

159+pub fn compare_ropes(before: &Rope, after: &Rope) -> Transaction {

160+ let start = Instant::now();

161+ let res = ChangeSet::with_capacity(32);

162+ let after = after.slice(..);

163+ let file = InternedInput::new(RopeLines(before.slice(..)), RopeLines(after));

164+ let builder = LineChangeSetBuilder {

165+ res,

166+ file: &file,

167+ after,

168+ pos: 0,

169+ current_hunk: InternedInput::default(),

170+ };

171+

172+ let res = imara_diff::diff(Algorithm::Histogram, &file, builder).into();

173+

174+ log::debug!(

175+ "rope diff took {}s",

176+ Instant::now().duration_since(start).as_secs_f64()

177+ );

178+ res

50179}

51180

52181#[cfg(test)]

53182mod tests {

54183 use super::*;

55184

185+ fn test_identity(a: &str, b: &str) {

186+ let mut old = Rope::from(a);

187+ let new = Rope::from(b);

188+ compare_ropes(&old, &new).apply(&mut old);

189+ assert_eq!(old, new);

190+ }

191+

56192 quickcheck::quickcheck! {

57193 fn test_compare_ropes(a: String, b: String) -> bool {

58194 let mut old = Rope::from(a);

@@ -61,4 +197,25 @@ mod tests {

61197 old == new

62198 }

63199 }

200+

201+ #[test]

202+ fn equal_files() {

203+ test_identity("foo", "foo");

204+ }

205+

206+ #[test]

207+ fn trailing_newline() {

208+ test_identity("foo\n", "foo");

209+ test_identity("foo", "foo\n");

210+ }

211+

212+ #[test]

213+ fn new_file() {

214+ test_identity("", "foo");

215+ }

216+

217+ #[test]

218+ fn deleted_file() {

219+ test_identity("foo", "");

220+ }

64221}

helix-core/src/doc_formatter.rsnew file+384

@@ -0,0 +1,384 @@

1+//! The `DocumentFormatter` forms the bridge between the raw document text

2+//! and onscreen positioning. It yields the text graphemes as an iterator

3+//! and traverses (part) of the document text. During that traversal it

4+//! handles grapheme detection, softwrapping and annotations.

5+//! It yields `FormattedGrapheme`s and their corresponding visual coordinates.

6+//!

7+//! As both virtual text and softwrapping can insert additional lines into the document

8+//! it is generally not possible to find the start of the previous visual line.

9+//! Instead the `DocumentFormatter` starts at the last "checkpoint" (usually a linebreak)

10+//! called a "block" and the caller must advance it as needed.

11+

12+use std::borrow::Cow;

13+use std::fmt::Debug;

14+use std::mem::{replace, take};

15+

16+#[cfg(test)]

17+mod test;

18+

19+use unicode_segmentation::{Graphemes, UnicodeSegmentation};

20+

21+use crate::graphemes::{Grapheme, GraphemeStr};

22+use crate::syntax::Highlight;

23+use crate::text_annotations::TextAnnotations;

24+use crate::{Position, RopeGraphemes, RopeSlice};

25+

26+/// TODO make Highlight a u32 to reduce the size of this enum to a single word.

27+#[derive(Debug, Clone, Copy)]

28+pub enum GraphemeSource {

29+ Document {

30+ codepoints: u32,

31+ },

32+ /// Inline virtual text can not be highlighted with a `Highlight` iterator

33+ /// because it's not part of the document. Instead the `Highlight`

34+ /// is emitted right by the document formatter

35+ VirtualText {

36+ highlight: Option<Highlight>,

37+ },

38+}

39+

40+#[derive(Debug, Clone)]

41+pub struct FormattedGrapheme<'a> {

42+ pub grapheme: Grapheme<'a>,

43+ pub source: GraphemeSource,

44+}

45+

46+impl<'a> FormattedGrapheme<'a> {

47+ pub fn new(

48+ g: GraphemeStr<'a>,

49+ visual_x: usize,

50+ tab_width: u16,

51+ source: GraphemeSource,

52+ ) -> FormattedGrapheme<'a> {

53+ FormattedGrapheme {

54+ grapheme: Grapheme::new(g, visual_x, tab_width),

55+ source,

56+ }

57+ }

58+ /// Returns whether this grapheme is virtual inline text

59+ pub fn is_virtual(&self) -> bool {

60+ matches!(self.source, GraphemeSource::VirtualText { .. })

61+ }

62+

63+ pub fn placeholder() -> Self {

64+ FormattedGrapheme {

65+ grapheme: Grapheme::Other { g: " ".into() },

66+ source: GraphemeSource::Document { codepoints: 0 },

67+ }

68+ }

69+

70+ pub fn doc_chars(&self) -> usize {

71+ match self.source {

72+ GraphemeSource::Document { codepoints } => codepoints as usize,

73+ GraphemeSource::VirtualText { .. } => 0,

74+ }

75+ }

76+

77+ pub fn is_whitespace(&self) -> bool {

78+ self.grapheme.is_whitespace()

79+ }

80+

81+ pub fn width(&self) -> usize {

82+ self.grapheme.width()

83+ }

84+

85+ pub fn is_word_boundary(&self) -> bool {

86+ self.grapheme.is_word_boundary()

87+ }

88+}

89+

90+#[derive(Debug, Clone)]

91+pub struct TextFormat {

92+ pub soft_wrap: bool,

93+ pub tab_width: u16,

94+ pub max_wrap: u16,

95+ pub max_indent_retain: u16,

96+ pub wrap_indicator: Box<str>,

97+ pub wrap_indicator_highlight: Option<Highlight>,

98+ pub viewport_width: u16,

99+}

100+

101+// test implementation is basically only used for testing or when softwrap is always disabled

102+impl Default for TextFormat {

103+ fn default() -> Self {

104+ TextFormat {

105+ soft_wrap: false,

106+ tab_width: 4,

107+ max_wrap: 3,

108+ max_indent_retain: 4,

109+ wrap_indicator: Box::from(" "),

110+ viewport_width: 17,

111+ wrap_indicator_highlight: None,

112+ }

113+ }

114+}

115+

116+#[derive(Debug)]

117+pub struct DocumentFormatter<'t> {

118+ text_fmt: &'t TextFormat,

119+ annotations: &'t TextAnnotations,

120+

121+ /// The visual position at the end of the last yielded word boundary

122+ visual_pos: Position,

123+ graphemes: RopeGraphemes<'t>,

124+ /// The character pos of the `graphemes` iter used for inserting annotations

125+ char_pos: usize,

126+ /// The line pos of the `graphemes` iter used for inserting annotations

127+ line_pos: usize,

128+ exhausted: bool,

129+

130+ /// Line breaks to be reserved for virtual text

131+ /// at the next line break

132+ virtual_lines: usize,

133+ inline_anntoation_graphemes: Option<(Graphemes<'t>, Option<Highlight>)>,

134+

135+ // softwrap specific

136+ /// The indentation of the current line

137+ /// Is set to `None` if the indentation level is not yet known

138+ /// because no non-whitespace graphemes have been encountered yet

139+ indent_level: Option<usize>,

140+ /// In case a long word needs to be split a single grapheme might need to be wrapped

141+ /// while the rest of the word stays on the same line

142+ peeked_grapheme: Option<(FormattedGrapheme<'t>, usize)>,

143+ /// A first-in first-out (fifo) buffer for the Graphemes of any given word

144+ word_buf: Vec<FormattedGrapheme<'t>>,

145+ /// The index of the next grapheme that will be yielded from the `word_buf`

146+ word_i: usize,

147+}

148+

149+impl<'t> DocumentFormatter<'t> {

150+ /// Creates a new formatter at the last block before `char_idx`.

151+ /// A block is a chunk which always ends with a linebreak.

152+ /// This is usually just a normal line break.

153+ /// However very long lines are always wrapped at constant intervals that can be cheaply calculated

154+ /// to avoid pathological behaviour.

155+ pub fn new_at_prev_checkpoint(

156+ text: RopeSlice<'t>,

157+ text_fmt: &'t TextFormat,

158+ annotations: &'t TextAnnotations,

159+ char_idx: usize,

160+ ) -> (Self, usize) {

161+ // TODO divide long lines into blocks to avoid bad performance for long lines

162+ let block_line_idx = text.char_to_line(char_idx.min(text.len_chars()));

163+ let block_char_idx = text.line_to_char(block_line_idx);

164+ annotations.reset_pos(block_char_idx);

165+ (

166+ DocumentFormatter {

167+ text_fmt,

168+ annotations,

169+ visual_pos: Position { row: 0, col: 0 },

170+ graphemes: RopeGraphemes::new(text.slice(block_char_idx..)),

171+ char_pos: block_char_idx,

172+ exhausted: false,

173+ virtual_lines: 0,

174+ indent_level: None,

175+ peeked_grapheme: None,

176+ word_buf: Vec::with_capacity(64),

177+ word_i: 0,

178+ line_pos: block_line_idx,

179+ inline_anntoation_graphemes: None,

180+ },

181+ block_char_idx,

182+ )

183+ }

184+

185+ fn next_inline_annotation_grapheme(&mut self) -> Option<(&'t str, Option<Highlight>)> {

186+ loop {

187+ if let Some(&mut (ref mut annotation, highlight)) =

188+ self.inline_anntoation_graphemes.as_mut()

189+ {

190+ if let Some(grapheme) = annotation.next() {

191+ return Some((grapheme, highlight));

192+ }

193+ }

194+

195+ if let Some((annotation, highlight)) =

196+ self.annotations.next_inline_annotation_at(self.char_pos)

197+ {

198+ self.inline_anntoation_graphemes = Some((

199+ UnicodeSegmentation::graphemes(&*annotation.text, true),

200+ highlight,

201+ ))

202+ } else {

203+ return None;

204+ }

205+ }

206+ }

207+

208+ fn advance_grapheme(&mut self, col: usize) -> Option<FormattedGrapheme<'t>> {

209+ let (grapheme, source) =

210+ if let Some((grapheme, highlight)) = self.next_inline_annotation_grapheme() {

211+ (grapheme.into(), GraphemeSource::VirtualText { highlight })

212+ } else if let Some(grapheme) = self.graphemes.next() {

213+ self.virtual_lines += self.annotations.annotation_lines_at(self.char_pos);

214+ let codepoints = grapheme.len_chars() as u32;

215+

216+ let overlay = self.annotations.overlay_at(self.char_pos);

217+ let grapheme = match overlay {

218+ Some((overlay, _)) => overlay.grapheme.as_str().into(),

219+ None => Cow::from(grapheme).into(),

220+ };

221+

222+ self.char_pos += codepoints as usize;

223+ (grapheme, GraphemeSource::Document { codepoints })

224+ } else {

225+ if self.exhausted {

226+ return None;

227+ }

228+ self.exhausted = true;

229+ // EOF grapheme is required for rendering

230+ // and correct position computations

231+ return Some(FormattedGrapheme {

232+ grapheme: Grapheme::Other { g: " ".into() },

233+ source: GraphemeSource::Document { codepoints: 0 },

234+ });

235+ };

236+

237+ let grapheme = FormattedGrapheme::new(grapheme, col, self.text_fmt.tab_width, source);

238+

239+ Some(grapheme)

240+ }

241+

242+ /// Move a word to the next visual line

243+ fn wrap_word(&mut self, virtual_lines_before_word: usize) -> usize {

244+ // softwrap this word to the next line

245+ let indent_carry_over = if let Some(indent) = self.indent_level {

246+ if indent as u16 <= self.text_fmt.max_indent_retain {

247+ indent as u16

248+ } else {

249+ 0

250+ }

251+ } else {

252+ // ensure the indent stays 0

253+ self.indent_level = Some(0);

254+ 0

255+ };

256+

257+ self.visual_pos.col = indent_carry_over as usize;

258+ self.virtual_lines -= virtual_lines_before_word;

259+ self.visual_pos.row += 1 + virtual_lines_before_word;

260+ let mut i = 0;

261+ let mut word_width = 0;

262+ let wrap_indicator = UnicodeSegmentation::graphemes(&*self.text_fmt.wrap_indicator, true)

263+ .map(|g| {

264+ i += 1;

265+ let grapheme = FormattedGrapheme::new(

266+ g.into(),

267+ self.visual_pos.col + word_width,

268+ self.text_fmt.tab_width,

269+ GraphemeSource::VirtualText {

270+ highlight: self.text_fmt.wrap_indicator_highlight,

271+ },

272+ );

273+ word_width += grapheme.width();

274+ grapheme

275+ });

276+ self.word_buf.splice(0..0, wrap_indicator);

277+

278+ for grapheme in &mut self.word_buf[i..] {

279+ let visual_x = self.visual_pos.col + word_width;

280+ grapheme

281+ .grapheme

282+ .change_position(visual_x, self.text_fmt.tab_width);

283+ word_width += grapheme.width();

284+ }

285+ word_width

286+ }

287+

288+ fn advance_to_next_word(&mut self) {

289+ self.word_buf.clear();

290+ let mut word_width = 0;

291+ let virtual_lines_before_word = self.virtual_lines;

292+ let mut virtual_lines_before_grapheme = self.virtual_lines;

293+

294+ loop {

295+ // softwrap word if necessary

296+ if word_width + self.visual_pos.col >= self.text_fmt.viewport_width as usize {

297+ // wrapping this word would move too much text to the next line

298+ // split the word at the line end instead

299+ if word_width > self.text_fmt.max_wrap as usize {

300+ // Usually we stop accomulating graphemes as soon as softwrapping becomes necessary.

301+ // However if the last grapheme is multiple columns wide it might extend beyond the EOL.

302+ // The condition below ensures that this grapheme is not cutoff and instead wrapped to the next line

303+ if word_width + self.visual_pos.col > self.text_fmt.viewport_width as usize {

304+ self.peeked_grapheme = self.word_buf.pop().map(|grapheme| {

305+ (grapheme, self.virtual_lines - virtual_lines_before_grapheme)

306+ });

307+ self.virtual_lines = virtual_lines_before_grapheme;

308+ }

309+ return;

310+ }

311+

312+ word_width = self.wrap_word(virtual_lines_before_word);

313+ }

314+

315+ virtual_lines_before_grapheme = self.virtual_lines;

316+

317+ let grapheme = if let Some((grapheme, virtual_lines)) = self.peeked_grapheme.take() {

318+ self.virtual_lines += virtual_lines;

319+ grapheme

320+ } else if let Some(grapheme) = self.advance_grapheme(self.visual_pos.col + word_width) {

321+ grapheme

322+ } else {

323+ return;

324+ };

325+

326+ // Track indentation

327+ if !grapheme.is_whitespace() && self.indent_level.is_none() {

328+ self.indent_level = Some(self.visual_pos.col);

329+ } else if grapheme.grapheme == Grapheme::Newline {

330+ self.indent_level = None;

331+ }

332+

333+ let is_word_boundary = grapheme.is_word_boundary();

334+ word_width += grapheme.width();

335+ self.word_buf.push(grapheme);

336+

337+ if is_word_boundary {

338+ return;

339+ }

340+ }

341+ }

342+

343+ /// returns the document line pos of the **next** grapheme that will be yielded

344+ pub fn line_pos(&self) -> usize {

345+ self.line_pos

346+ }

347+

348+ /// returns the visual pos of the **next** grapheme that will be yielded

349+ pub fn visual_pos(&self) -> Position {

350+ self.visual_pos

351+ }

352+}

353+

354+impl<'t> Iterator for DocumentFormatter<'t> {

355+ type Item = (FormattedGrapheme<'t>, Position);

356+

357+ fn next(&mut self) -> Option<Self::Item> {

358+ let grapheme = if self.text_fmt.soft_wrap {

359+ if self.word_i >= self.word_buf.len() {

360+ self.advance_to_next_word();

361+ self.word_i = 0;

362+ }

363+ let grapheme = replace(

364+ self.word_buf.get_mut(self.word_i)?,

365+ FormattedGrapheme::placeholder(),

366+ );

367+ self.word_i += 1;

368+ grapheme

369+ } else {

370+ self.advance_grapheme(self.visual_pos.col)?

371+ };

372+

373+ let pos = self.visual_pos;

374+ if grapheme.grapheme == Grapheme::Newline {

375+ self.visual_pos.row += 1;

376+ self.visual_pos.row += take(&mut self.virtual_lines);

377+ self.visual_pos.col = 0;

378+ self.line_pos += 1;

379+ } else {

380+ self.visual_pos.col += grapheme.width();

381+ }

382+ Some((grapheme, pos))

383+ }

384+}

helix-core/src/doc_formatter/test.rsnew file+182

@@ -0,0 +1,182 @@

1+use std::rc::Rc;

3+use crate::doc_formatter::{DocumentFormatter, TextFormat};

4+use crate::text_annotations::{InlineAnnotation, Overlay, TextAnnotations};

6+impl TextFormat {

7+ fn new_test(softwrap: bool) -> Self {

8+ TextFormat {

9+ soft_wrap: softwrap,

10+ tab_width: 2,

11+ max_wrap: 3,

12+ max_indent_retain: 4,

13+ wrap_indicator: ".".into(),

14+ wrap_indicator_highlight: None,

15+ // use a prime number to allow lining up too often with repeat

16+ viewport_width: 17,

17+ }

18+ }

19+}

20+

21+impl<'t> DocumentFormatter<'t> {

22+ fn collect_to_str(&mut self) -> String {

23+ use std::fmt::Write;

24+ let mut res = String::new();

25+ let viewport_width = self.text_fmt.viewport_width;

26+ let mut line = 0;

27+

28+ for (grapheme, pos) in self {

29+ if pos.row != line {

30+ line += 1;

31+ assert_eq!(pos.row, line);

32+ write!(res, "\n{}", ".".repeat(pos.col)).unwrap();

33+ assert!(

34+ pos.col <= viewport_width as usize,

35+ "softwrapped failed {}<={viewport_width}",

36+ pos.col

37+ );

38+ }

39+ write!(res, "{}", grapheme.grapheme).unwrap();

40+ }

41+

42+ res

43+ }

44+}

45+

46+fn softwrap_text(text: &str) -> String {

47+ DocumentFormatter::new_at_prev_checkpoint(

48+ text.into(),

49+ &TextFormat::new_test(true),

50+ &TextAnnotations::default(),

51+ 0,

52+ )

53+ .0

54+ .collect_to_str()

55+}

56+

57+#[test]

58+fn basic_softwrap() {

59+ assert_eq!(

60+ softwrap_text(&"foo ".repeat(10)),

61+ "foo foo foo foo \n.foo foo foo foo \n.foo foo "

62+ );

63+ assert_eq!(

64+ softwrap_text(&"fooo ".repeat(10)),

65+ "fooo fooo fooo \n.fooo fooo fooo \n.fooo fooo fooo \n.fooo "

66+ );

67+

68+ // check that we don't wrap unnecessarily

69+ assert_eq!(softwrap_text("\t\txxxx1xxxx2xx\n"), " xxxx1xxxx2xx \n ");

70+}

71+

72+#[test]

73+fn softwrap_indentation() {

74+ assert_eq!(

75+ softwrap_text("\t\tfoo1 foo2 foo3 foo4 foo5 foo6\n"),

76+ " foo1 foo2 \n.....foo3 foo4 \n.....foo5 foo6 \n "

77+ );

78+ assert_eq!(

79+ softwrap_text("\t\t\tfoo1 foo2 foo3 foo4 foo5 foo6\n"),

80+ " foo1 foo2 \n.foo3 foo4 foo5 \n.foo6 \n "

81+ );

82+}

83+

84+#[test]

85+fn long_word_softwrap() {

86+ assert_eq!(

87+ softwrap_text("\t\txxxx1xxxx2xxxx3xxxx4xxxx5xxxx6xxxx7xxxx8xxxx9xxx\n"),

88+ " xxxx1xxxx2xxx\n.....x3xxxx4xxxx5\n.....xxxx6xxxx7xx\n.....xx8xxxx9xxx \n "

89+ );

90+ assert_eq!(

91+ softwrap_text("xxxxxxxx1xxxx2xxx\n"),

92+ "xxxxxxxx1xxxx2xxx\n. \n "

93+ );

94+ assert_eq!(

95+ softwrap_text("\t\txxxx1xxxx 2xxxx3xxxx4xxxx5xxxx6xxxx7xxxx8xxxx9xxx\n"),

96+ " xxxx1xxxx \n.....2xxxx3xxxx4x\n.....xxx5xxxx6xxx\n.....x7xxxx8xxxx9\n.....xxx \n "

97+ );

98+ assert_eq!(

99+ softwrap_text("\t\txxxx1xxx 2xxxx3xxxx4xxxx5xxxx6xxxx7xxxx8xxxx9xxx\n"),

100+ " xxxx1xxx 2xxx\n.....x3xxxx4xxxx5\n.....xxxx6xxxx7xx\n.....xx8xxxx9xxx \n "

101+ );

102+}

103+

104+fn overlay_text(text: &str, char_pos: usize, softwrap: bool, overlays: &[Overlay]) -> String {

105+ DocumentFormatter::new_at_prev_checkpoint(

106+ text.into(),

107+ &TextFormat::new_test(softwrap),

108+ TextAnnotations::default().add_overlay(overlays.into(), None),

109+ char_pos,

110+ )

111+ .0

112+ .collect_to_str()

113+}

114+

115+#[test]

116+fn overlay() {

117+ assert_eq!(

118+ overlay_text(

119+ "foobar",

120+ 0,

121+ false,

122+ &[Overlay::new(0, "X"), Overlay::new(2, "\t")],

123+ ),

124+ "Xo bar "

125+ );

126+ assert_eq!(

127+ overlay_text(

128+ &"foo ".repeat(10),

129+ 0,

130+ true,

131+ &[

132+ Overlay::new(2, "\t"),

133+ Overlay::new(5, "\t"),

134+ Overlay::new(16, "X"),

135+ ]

136+ ),

137+ "fo f o foo \n.foo Xoo foo foo \n.foo foo foo "

138+ );

139+}

140+

141+fn annotate_text(text: &str, softwrap: bool, annotations: &[InlineAnnotation]) -> String {

142+ DocumentFormatter::new_at_prev_checkpoint(

143+ text.into(),

144+ &TextFormat::new_test(softwrap),

145+ TextAnnotations::default().add_inline_annotations(annotations.into(), None),

146+ 0,

147+ )

148+ .0

149+ .collect_to_str()

150+}

151+

152+#[test]

153+fn annotation() {

154+ assert_eq!(

155+ annotate_text("bar", false, &[InlineAnnotation::new(0, "foo")]),

156+ "foobar "

157+ );

158+ assert_eq!(

159+ annotate_text(

160+ &"foo ".repeat(10),

161+ true,

162+ &[InlineAnnotation::new(0, "foo ")]

163+ ),

164+ "foo foo foo foo \n.foo foo foo foo \n.foo foo foo "

165+ );

166+}

167+#[test]

168+fn annotation_and_overlay() {

169+ assert_eq!(

170+ DocumentFormatter::new_at_prev_checkpoint(

171+ "bbar".into(),

172+ &TextFormat::new_test(false),

173+ TextAnnotations::default()

174+ .add_inline_annotations(Rc::new([InlineAnnotation::new(0, "fooo")]), None)

175+ .add_overlay(Rc::new([Overlay::new(0, "\t")]), None),

176+ 0,

177+ )

178+ .0

179+ .collect_to_str(),

180+ "fooo bar "

181+ );

182+}

helix-core/src/fuzzy.rsnew file+43

@@ -0,0 +1,43 @@

1+use std::ops::DerefMut;

3+use nucleo::pattern::{Atom, AtomKind, CaseMatching};

4+use nucleo::Config;

5+use parking_lot::Mutex;

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

@@ -5,7 +5,88 @@ use ropey::{iter::Chunks, str_utils::byte_to_char_idx, RopeSlice};

55use unicode_segmentation::{GraphemeCursor, GraphemeIncomplete};

66use unicode_width::UnicodeWidthStr;

8−use std::fmt;

8+use std::borrow::Cow;

9+use std::fmt::{self, Debug, Display};

10+use std::marker::PhantomData;

11+use std::ops::Deref;

12+use std::ptr::NonNull;

13+use std::{slice, str};

14+

15+use crate::chars::{char_is_whitespace, char_is_word};

16+use crate::LineEnding;

17+

18+#[inline]

19+pub fn tab_width_at(visual_x: usize, tab_width: u16) -> usize {

20+ tab_width as usize - (visual_x % tab_width as usize)

21+}

22+

23+#[derive(Debug, Clone, PartialEq, Eq)]

24+pub enum Grapheme<'a> {

25+ Newline,

26+ Tab { width: usize },

27+ Other { g: GraphemeStr<'a> },

28+}

29+

30+impl<'a> Grapheme<'a> {

31+ pub fn new(g: GraphemeStr<'a>, visual_x: usize, tab_width: u16) -> Grapheme<'a> {

32+ match g {

33+ g if g == "\t" => Grapheme::Tab {

34+ width: tab_width_at(visual_x, tab_width),

35+ },

36+ _ if LineEnding::from_str(&g).is_some() => Grapheme::Newline,

37+ _ => Grapheme::Other { g },

38+ }

39+ }

40+

41+ pub fn change_position(&mut self, visual_x: usize, tab_width: u16) {

42+ if let Grapheme::Tab { width } = self {

43+ *width = tab_width_at(visual_x, tab_width)

44+ }

45+ }

46+

47+ /// Returns the a visual width of this grapheme,

48+ #[inline]

49+ pub fn width(&self) -> usize {

50+ match *self {

51+ // width is not cached because we are dealing with

52+ // ASCII almost all the time which already has a fastpath

53+ // it's okay to convert to u16 here because no codepoint has a width larger

54+ // than 2 and graphemes are usually atmost two visible codepoints wide

55+ Grapheme::Other { ref g } => grapheme_width(g),

56+ Grapheme::Tab { width } => width,

57+ Grapheme::Newline => 1,

58+ }

59+ }

60+

61+ pub fn is_whitespace(&self) -> bool {

62+ !matches!(&self, Grapheme::Other { g } if !g.chars().all(char_is_whitespace))

63+ }

64+

65+ // TODO currently word boundaries are used for softwrapping.

66+ // This works best for programming languages and well for prose.

67+ // This could however be improved in the future by considering unicode

68+ // character classes but

69+ pub fn is_word_boundary(&self) -> bool {

70+ !matches!(&self, Grapheme::Other { g,.. } if g.chars().all(char_is_word))

71+ }

72+}

73+

74+impl Display for Grapheme<'_> {

75+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

76+ match *self {

77+ Grapheme::Newline => write!(f, " "),

78+ Grapheme::Tab { width } => {

79+ for _ in 0..width {

80+ write!(f, " ")?;

81+ }

82+ Ok(())

83+ }

84+ Grapheme::Other { ref g } => {

85+ write!(f, "{g}")

86+ }

87+ }

88+ }

89+}

990

1091#[must_use]

1192pub fn grapheme_width(g: &str) -> usize {

@@ -14,7 +95,7 @@ pub fn grapheme_width(g: &str) -> usize {

1495 // Point 1: theoretically, ascii control characters should have zero

1596 // width, but in our case we actually want them to have width: if they

1697 // show up in text, we want to treat them as textual elements that can

17− // be editied. So we can get away with making all ascii single width

98+ // be edited. So we can get away with making all ascii single width

1899 // here.

19100 // Point 2: we're only examining the first codepoint here, which means

20101 // we're ignoring graphemes formed with combining characters. However,

@@ -27,6 +108,8 @@ pub fn grapheme_width(g: &str) -> usize {

27108 // We use max(1) here because all grapeheme clusters--even illformed

28109 // ones--should have at least some width so they can be edited

29110 // properly.

111+ // TODO properly handle unicode width for all codepoints

112+ // example of where unicode width is currently wrong: 🤦🏼‍♂️ (taken from https://hsivonen.fi/string-length/)

30113 UnicodeWidthStr::width(g).max(1)

31114 }

32115}

@@ -341,3 +424,101 @@ impl<'a> Iterator for RopeGraphemes<'a> {

341424 }

342425 }

343426}

427+

428+/// A highly compressed Cow<'a, str> that holds

429+/// atmost u31::MAX bytes and is readonly

430+pub struct GraphemeStr<'a> {

431+ ptr: NonNull<u8>,

432+ len: u32,

433+ phantom: PhantomData<&'a str>,

434+}

435+

436+impl GraphemeStr<'_> {

437+ const MASK_OWNED: u32 = 1 << 31;

438+

439+ fn compute_len(&self) -> usize {

440+ (self.len & !Self::MASK_OWNED) as usize

441+ }

442+}

443+

444+impl Deref for GraphemeStr<'_> {

445+ type Target = str;

446+ fn deref(&self) -> &Self::Target {

447+ unsafe {

448+ let bytes = slice::from_raw_parts(self.ptr.as_ptr(), self.compute_len());

449+ str::from_utf8_unchecked(bytes)

450+ }

451+ }

452+}

453+

454+impl Drop for GraphemeStr<'_> {

455+ fn drop(&mut self) {

456+ if self.len & Self::MASK_OWNED != 0 {

457+ // free allocation

458+ unsafe {

459+ drop(Box::from_raw(slice::from_raw_parts_mut(

460+ self.ptr.as_ptr(),

461+ self.compute_len(),

462+ )));

463+ }

464+ }

465+ }

466+}

467+

468+impl<'a> From<&'a str> for GraphemeStr<'a> {

469+ fn from(g: &'a str) -> Self {

470+ GraphemeStr {

471+ ptr: unsafe { NonNull::new_unchecked(g.as_bytes().as_ptr() as *mut u8) },

472+ len: i32::try_from(g.len()).unwrap() as u32,

473+ phantom: PhantomData,

474+ }

475+ }

476+}

477+

478+impl<'a> From<String> for GraphemeStr<'a> {

479+ fn from(g: String) -> Self {

480+ let len = g.len();

481+ let ptr = Box::into_raw(g.into_bytes().into_boxed_slice()) as *mut u8;

482+ GraphemeStr {

483+ ptr: unsafe { NonNull::new_unchecked(ptr) },

484+ len: (i32::try_from(len).unwrap() as u32) | Self::MASK_OWNED,

485+ phantom: PhantomData,

486+ }

487+ }

488+}

489+

490+impl<'a> From<Cow<'a, str>> for GraphemeStr<'a> {

491+ fn from(g: Cow<'a, str>) -> Self {

492+ match g {

493+ Cow::Borrowed(g) => g.into(),

494+ Cow::Owned(g) => g.into(),

495+ }

496+ }

497+}

498+

499+impl<T: Deref<Target = str>> PartialEq<T> for GraphemeStr<'_> {

500+ fn eq(&self, other: &T) -> bool {

501+ self.deref() == other.deref()

502+ }

503+}

504+impl PartialEq<str> for GraphemeStr<'_> {

505+ fn eq(&self, other: &str) -> bool {

506+ self.deref() == other

507+ }

508+}

509+impl Eq for GraphemeStr<'_> {}

510+impl Debug for GraphemeStr<'_> {

511+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

512+ Debug::fmt(self.deref(), f)

513+ }

514+}

515+impl Display for GraphemeStr<'_> {

516+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

517+ Display::fmt(self.deref(), f)

518+ }

519+}

520+impl Clone for GraphemeStr<'_> {

521+ fn clone(&self) -> Self {

522+ self.deref().to_owned().into()

523+ }

524+}

helix-core/src/history.rs+42−14

@@ -1,9 +1,15 @@

1−use crate::{Assoc, ChangeSet, Range, Rope, State, Transaction};

1+use crate::{Assoc, ChangeSet, Range, Rope, Selection, Transaction};

22use once_cell::sync::Lazy;

33use regex::Regex;

44use std::num::NonZeroUsize;

55use std::time::{Duration, Instant};

7+#[derive(Debug, Clone)]

8+pub struct State {

9+ pub doc: Rope,

10+ pub selection: Selection,

11+}

12+

713/// Stores the history of changes to a buffer.

814///

915/// Currently the history is represented as a vector of revisions. The vector

@@ -22,10 +28,10 @@ use std::time::{Duration, Instant};

2228///

2329/// The current revision is the one currently displayed in the buffer.

2430///

25−/// Commiting a new revision to the history will update the last child of the

31+/// Committing a new revision to the history will update the last child of the

2632/// current revision, and push a new revision to the end of the vector.

2733///

28−/// Revisions are commited with a timestamp. :earlier and :later can be used

34+/// Revisions are committed with a timestamp. :earlier and :later can be used

2935/// to jump to the closest revision to a moment in time relative to the timestamp

3036/// of the current revision plus (:later) or minus (:earlier) the duration

3137/// given to the command. If a single integer is given, the editor will instead

@@ -33,7 +39,7 @@ use std::time::{Duration, Instant};

3339///

3440/// Limitations:

3541/// * Changes in selections currently don't commit history changes. The selection

36−/// will only be updated to the state after a commited buffer change.

42+/// will only be updated to the state after a committed buffer change.

3743/// * The vector of history revisions is currently unbounded. This might

3844/// cause the memory consumption to grow significantly large during long

3945/// editing sessions.

@@ -48,7 +54,7 @@ pub struct History {

4854}

4955

5056/// A single point in history. See [History] for more information.

51−#[derive(Debug)]

57+#[derive(Debug, Clone)]

5258struct Revision {

5359 parent: usize,

5460 last_child: Option<NonZeroUsize>,

@@ -66,8 +72,8 @@ impl Default for History {

6672 revisions: vec![Revision {

6773 parent: 0,

6874 last_child: None,

69− transaction: Transaction::from(ChangeSet::new(&Rope::new())),

70− inversion: Transaction::from(ChangeSet::new(&Rope::new())),

75+ transaction: Transaction::from(ChangeSet::new("".into())),

76+ inversion: Transaction::from(ChangeSet::new("".into())),

7177 timestamp: Instant::now(),

7278 }],

7379 current: 0,

@@ -113,6 +119,21 @@ impl History {

113119 self.current == 0

114120 }

115121

122+ /// Returns the changes since the given revision composed into a transaction.

123+ /// Returns None if there are no changes between the current and given revisions.

124+ pub fn changes_since(&self, revision: usize) -> Option<Transaction> {

125+ let lca = self.lowest_common_ancestor(revision, self.current);

126+ let up = self.path_up(revision, lca);

127+ let down = self.path_up(self.current, lca);

128+ let up_txns = up

129+ .iter()

130+ .rev()

131+ .map(|&n| self.revisions[n].inversion.clone());

132+ let down_txns = down.iter().map(|&n| self.revisions[n].transaction.clone());

133+

134+ down_txns.chain(up_txns).reduce(|acc, tx| tx.compose(acc))

135+ }

136+

116137 /// Undo the last edit.

117138 pub fn undo(&mut self) -> Option<&Transaction> {

118139 if self.at_root() {

@@ -177,7 +198,7 @@ impl History {

177198 }

178199 }

179200

180− /// List of nodes on the way from `n` to 'a`. Doesn`t include `a`.

201+ /// List of nodes on the way from `n` to 'a`. Doesn't include `a`.

181202 /// Includes `n` unless `a == n`. `a` must be an ancestor of `n`.

182203 fn path_up(&self, mut n: usize, a: usize) -> Vec<usize> {

183204 let mut path = Vec::new();

@@ -282,13 +303,13 @@ impl History {

282303}

283304

284305/// Whether to undo by a number of edits or a duration of time.

285−#[derive(Debug, PartialEq, Clone, Copy)]

306+#[derive(Debug, PartialEq, Eq, Clone, Copy)]

286307pub enum UndoKind {

287308 Steps(usize),

288309 TimePeriod(std::time::Duration),

289310}

290311

291−/// A subset of sytemd.time time span syntax units.

312+/// A subset of systemd.time time span syntax units.

292313const TIME_UNITS: &[(&[&str], &str, u64)] = &[

293314 (&["seconds", "second", "sec", "s"], "seconds", 1),

294315 (&["minutes", "minute", "min", "m"], "minutes", 60),

@@ -366,12 +387,16 @@ impl std::str::FromStr for UndoKind {

366387#[cfg(test)]

367388mod test {

368389 use super::*;

390+ use crate::Selection;

369391

370392 #[test]

371393 fn test_undo_redo() {

372394 let mut history = History::default();

373395 let doc = Rope::from("hello");

374− let mut state = State::new(doc);

396+ let mut state = State {

397+ doc,

398+ selection: Selection::point(0),

399+ };

375400

376401 let transaction1 =

377402 Transaction::change(&state.doc, vec![(5, 5, Some(" world!".into()))].into_iter());

@@ -420,7 +445,10 @@ mod test {

420445 fn test_earlier_later() {

421446 let mut history = History::default();

422447 let doc = Rope::from("a\n");

423− let mut state = State::new(doc);

448+ let mut state = State {

449+ doc,

450+ selection: Selection::point(0),

451+ };

424452

425453 fn undo(history: &mut History, state: &mut State) {

426454 if let Some(transaction) = history.undo() {

@@ -546,8 +574,8 @@ mod test {

546574

547575 // Units are validated.

548576 assert_eq!(

549− "1 millenium".parse::<UndoKind>(),

550− Err("incorrect time unit: millenium".to_string())

577+ "1 millennium".parse::<UndoKind>(),

578+ Err("incorrect time unit: millennium".to_string())

551579 );

552580

553581 // Units can't be specified twice.

helix-core/src/increment/date_time.rs+78−248

@@ -1,113 +1,53 @@

1−use chrono::{Datelike, Duration, NaiveDate, NaiveDateTime, NaiveTime, Timelike};

1+use chrono::{Duration, NaiveDate, NaiveDateTime, NaiveTime};

22use once_cell::sync::Lazy;

33use regex::Regex;

4−use ropey::RopeSlice;

5−

6−use std::borrow::Cow;

7−use std::cmp;

8−

9−use super::Increment;

10−use crate::{Range, Tendril};

4+use std::fmt::Write;

6+/// Increment a Date or DateTime

7+///

8+/// If just a Date is selected the day will be incremented.

9+/// If a DateTime is selected the second will be incremented.

10+pub fn increment(selected_text: &str, amount: i64) -> Option<String> {

11+ if selected_text.is_empty() {

12+ return None;

13+ }

1114

12−#[derive(Debug, PartialEq, Eq)]

13−pub struct DateTimeIncrementor {

14− date_time: NaiveDateTime,

15− range: Range,

16− fmt: &'static str,

17− field: DateField,

18−}

15+ FORMATS.iter().find_map(|format| {

16+ let captures = format.regex.captures(selected_text)?;

17+ if captures.len() - 1 != format.fields.len() {

18+ return None;

19+ }

1920

20−impl DateTimeIncrementor {

21− pub fn from_range(text: RopeSlice, range: Range) -> Option<DateTimeIncrementor> {

22− let range = if range.is_empty() {

23− if range.anchor < text.len_chars() {

24− // Treat empty range as a cursor range.

25− range.put_cursor(text, range.anchor + 1, true)

26− } else {

27− // The range is empty and at the end of the text.

28− return None;

21+ let date_time = captures.get(0)?;

22+ let has_date = format.fields.iter().any(|f| f.unit.is_date());

23+ let has_time = format.fields.iter().any(|f| f.unit.is_time());

24+ let date_time = &selected_text[date_time.start()..date_time.end()];

25+ match (has_date, has_time) {

26+ (true, true) => {

27+ let date_time = NaiveDateTime::parse_from_str(date_time, format.fmt).ok()?;

28+ Some(

29+ date_time

30+ .checked_add_signed(Duration::minutes(amount))?

31+ .format(format.fmt)

32+ .to_string(),

33+ )

2934 }

30− } else {

31− range

32− };

33−

34− FORMATS.iter().find_map(|format| {

35− let from = range.from().saturating_sub(format.max_len);

36− let to = (range.from() + format.max_len).min(text.len_chars());

37−

38− let (from_in_text, to_in_text) = (range.from() - from, range.to() - from);

39− let text: Cow<str> = text.slice(from..to).into();

40−

41− let captures = format.regex.captures(&text)?;

42− if captures.len() - 1 != format.fields.len() {

43− return None;

35+ (true, false) => {

36+ let date = NaiveDate::parse_from_str(date_time, format.fmt).ok()?;

37+ Some(

38+ date.checked_add_signed(Duration::days(amount))?

39+ .format(format.fmt)

40+ .to_string(),

41+ )

4442 }

45−

46− let date_time = captures.get(0)?;

47− let offset = range.from() - from_in_text;

48− let range = Range::new(date_time.start() + offset, date_time.end() + offset);

49−

50− let field = captures

51− .iter()

52− .skip(1)

53− .enumerate()

54− .find_map(|(i, capture)| {

55− let capture = capture?;

56− let capture_range = capture.range();

57−

58− if capture_range.contains(&from_in_text)

59− && capture_range.contains(&(to_in_text - 1))

60− {

61− Some(format.fields[i])

62− } else {

63− None

64− }

65− })?;

66−

67− let has_date = format.fields.iter().any(|f| f.unit.is_date());

68− let has_time = format.fields.iter().any(|f| f.unit.is_time());

69−

70− let date_time = &text[date_time.start()..date_time.end()];

71− let date_time = match (has_date, has_time) {

72− (true, true) => NaiveDateTime::parse_from_str(date_time, format.fmt).ok()?,

73− (true, false) => {

74− let date = NaiveDate::parse_from_str(date_time, format.fmt).ok()?;

75−

76− date.and_hms(0, 0, 0)

77− }

78− (false, true) => {

79− let time = NaiveTime::parse_from_str(date_time, format.fmt).ok()?;

80−

81− NaiveDate::from_ymd(0, 1, 1).and_time(time)

82− }

83− (false, false) => return None,

84− };

85−

86− Some(DateTimeIncrementor {

87− date_time,

88− range,

89− fmt: format.fmt,

90− field,

91− })

92− })

93− }

94−}

95−

96−impl Increment for DateTimeIncrementor {

97− fn increment(&self, amount: i64) -> (Range, Tendril) {

98− let date_time = match self.field.unit {

99− DateUnit::Years => add_years(self.date_time, amount),

100− DateUnit::Months => add_months(self.date_time, amount),

101− DateUnit::Days => add_duration(self.date_time, Duration::days(amount)),

102− DateUnit::Hours => add_duration(self.date_time, Duration::hours(amount)),

103− DateUnit::Minutes => add_duration(self.date_time, Duration::minutes(amount)),

104− DateUnit::Seconds => add_duration(self.date_time, Duration::seconds(amount)),

105− DateUnit::AmPm => toggle_am_pm(self.date_time),

43+ (false, true) => {

44+ let time = NaiveTime::parse_from_str(date_time, format.fmt).ok()?;

45+ let (adjusted_time, _) = time.overflowing_add_signed(Duration::minutes(amount));

46+ Some(adjusted_time.format(format.fmt).to_string())

47+ }

48+ (false, false) => None,

10649 }

107− .unwrap_or(self.date_time);

108−

109− (self.range, date_time.format(self.fmt).to_string().into())

110− }

50+ })

11151}

11252

11353static FORMATS: Lazy<Vec<Format>> = Lazy::new(|| {

@@ -143,7 +83,7 @@ impl Format {

14383 fn new(fmt: &'static str) -> Self {

14484 let mut remaining = fmt;

14585 let mut fields = Vec::new();

146− let mut regex = String::new();

86+ let mut regex = "^".to_string();

14787 let mut max_len = 0;

14888

14989 while let Some(i) = remaining.find('%') {

@@ -162,9 +102,10 @@ impl Format {

162102 fields.push(field);

163103 max_len += field.max_len + remaining[..i].len();

164104 regex += &remaining[..i];

165− regex += &format!("({})", field.regex);

105+ write!(regex, "({})", field.regex).unwrap();

166106 remaining = &after[spec_len..];

167107 }

108+ regex += "$";

168109

169110 let regex = Regex::new(&regex).unwrap();

170111

@@ -304,155 +245,47 @@ impl DateUnit {

304245 }

305246}

306247

307−fn ndays_in_month(year: i32, month: u32) -> u32 {

308− // The first day of the next month...

309− let (y, m) = if month == 12 {

310− (year + 1, 1)

311− } else {

312− (year, month + 1)

313− };

314− let d = NaiveDate::from_ymd(y, m, 1);

315−

316− // ...is preceded by the last day of the original month.

317− d.pred().day()

318−}

319−

320−fn add_months(date_time: NaiveDateTime, amount: i64) -> Option<NaiveDateTime> {

321− let month = (date_time.month0() as i64).checked_add(amount)?;

322− let year = date_time.year() + i32::try_from(month / 12).ok()?;

323− let year = if month.is_negative() { year - 1 } else { year };

324−

325− // Normalize month

326− let month = month % 12;

327− let month = if month.is_negative() {

328− month + 12

329− } else {

330− month

331− } as u32

332− + 1;

333−

334− let day = cmp::min(date_time.day(), ndays_in_month(year, month));

335−

336− Some(NaiveDate::from_ymd(year, month, day).and_time(date_time.time()))

337−}

338−

339−fn add_years(date_time: NaiveDateTime, amount: i64) -> Option<NaiveDateTime> {

340− let year = i32::try_from((date_time.year() as i64).checked_add(amount)?).ok()?;

341− let ndays = ndays_in_month(year, date_time.month());

342−

343− if date_time.day() > ndays {

344− let d = NaiveDate::from_ymd(year, date_time.month(), ndays);

345− Some(d.succ().and_time(date_time.time()))

346− } else {

347− date_time.with_year(year)

348− }

349−}

350−

351−fn add_duration(date_time: NaiveDateTime, duration: Duration) -> Option<NaiveDateTime> {

352− date_time.checked_add_signed(duration)

353−}

354−

355−fn toggle_am_pm(date_time: NaiveDateTime) -> Option<NaiveDateTime> {

356− if date_time.hour() < 12 {

357− add_duration(date_time, Duration::hours(12))

358− } else {

359− add_duration(date_time, Duration::hours(-12))

360− }

361−}

362−

363248#[cfg(test)]

364249mod test {

365250 use super::*;

366− use crate::Rope;

367251

368252 #[test]

369253 fn test_increment_date_times() {

370254 let tests = [

371255 // (original, cursor, amount, expected)

372− ("2020-02-28", 0, 1, "2021-02-28"),

373− ("2020-02-29", 0, 1, "2021-03-01"),

374− ("2020-01-31", 5, 1, "2020-02-29"),

375− ("2020-01-20", 5, 1, "2020-02-20"),

376− ("2021-01-01", 5, -1, "2020-12-01"),

377− ("2021-01-31", 5, -2, "2020-11-30"),

378− ("2020-02-28", 8, 1, "2020-02-29"),

379− ("2021-02-28", 8, 1, "2021-03-01"),

380− ("2021-02-28", 0, -1, "2020-02-28"),

381− ("2021-03-01", 0, -1, "2020-03-01"),

382− ("2020-02-29", 5, -1, "2020-01-29"),

383− ("2020-02-20", 5, -1, "2020-01-20"),

384− ("2020-02-29", 8, -1, "2020-02-28"),

385− ("2021-03-01", 8, -1, "2021-02-28"),

386− ("1980/12/21", 8, 100, "1981/03/31"),

387− ("1980/12/21", 8, -100, "1980/09/12"),

388− ("1980/12/21", 8, 1000, "1983/09/17"),

389− ("1980/12/21", 8, -1000, "1978/03/27"),

390− ("2021-11-24 07:12:23", 0, 1, "2022-11-24 07:12:23"),

391− ("2021-11-24 07:12:23", 5, 1, "2021-12-24 07:12:23"),

392− ("2021-11-24 07:12:23", 8, 1, "2021-11-25 07:12:23"),

393− ("2021-11-24 07:12:23", 11, 1, "2021-11-24 08:12:23"),

394− ("2021-11-24 07:12:23", 14, 1, "2021-11-24 07:13:23"),

395− ("2021-11-24 07:12:23", 17, 1, "2021-11-24 07:12:24"),

396− ("2021/11/24 07:12:23", 0, 1, "2022/11/24 07:12:23"),

397− ("2021/11/24 07:12:23", 5, 1, "2021/12/24 07:12:23"),

398− ("2021/11/24 07:12:23", 8, 1, "2021/11/25 07:12:23"),

399− ("2021/11/24 07:12:23", 11, 1, "2021/11/24 08:12:23"),

400− ("2021/11/24 07:12:23", 14, 1, "2021/11/24 07:13:23"),

401− ("2021/11/24 07:12:23", 17, 1, "2021/11/24 07:12:24"),

402− ("2021-11-24 07:12", 0, 1, "2022-11-24 07:12"),

403− ("2021-11-24 07:12", 5, 1, "2021-12-24 07:12"),

404− ("2021-11-24 07:12", 8, 1, "2021-11-25 07:12"),

405− ("2021-11-24 07:12", 11, 1, "2021-11-24 08:12"),

406− ("2021-11-24 07:12", 14, 1, "2021-11-24 07:13"),

407− ("2021/11/24 07:12", 0, 1, "2022/11/24 07:12"),

408− ("2021/11/24 07:12", 5, 1, "2021/12/24 07:12"),

409− ("2021/11/24 07:12", 8, 1, "2021/11/25 07:12"),

410− ("2021/11/24 07:12", 11, 1, "2021/11/24 08:12"),

411− ("2021/11/24 07:12", 14, 1, "2021/11/24 07:13"),

412− ("Wed Nov 24 2021", 0, 1, "Thu Nov 25 2021"),

413− ("Wed Nov 24 2021", 4, 1, "Fri Dec 24 2021"),

414− ("Wed Nov 24 2021", 8, 1, "Thu Nov 25 2021"),

415− ("Wed Nov 24 2021", 11, 1, "Thu Nov 24 2022"),

416− ("24-Nov-2021", 0, 1, "25-Nov-2021"),

417− ("24-Nov-2021", 3, 1, "24-Dec-2021"),

418− ("24-Nov-2021", 7, 1, "24-Nov-2022"),

419− ("2021 Nov 24", 0, 1, "2022 Nov 24"),

420− ("2021 Nov 24", 5, 1, "2021 Dec 24"),

421− ("2021 Nov 24", 9, 1, "2021 Nov 25"),

422− ("Nov 24, 2021", 0, 1, "Dec 24, 2021"),

423− ("Nov 24, 2021", 4, 1, "Nov 25, 2021"),

424− ("Nov 24, 2021", 8, 1, "Nov 24, 2022"),

425− ("7:21:53 am", 0, 1, "8:21:53 am"),

426− ("7:21:53 am", 3, 1, "7:22:53 am"),

427− ("7:21:53 am", 5, 1, "7:21:54 am"),

428− ("7:21:53 am", 8, 1, "7:21:53 pm"),

429− ("7:21:53 AM", 0, 1, "8:21:53 AM"),

430− ("7:21:53 AM", 3, 1, "7:22:53 AM"),

431− ("7:21:53 AM", 5, 1, "7:21:54 AM"),

432− ("7:21:53 AM", 8, 1, "7:21:53 PM"),

433− ("7:21 am", 0, 1, "8:21 am"),

434− ("7:21 am", 3, 1, "7:22 am"),

435− ("7:21 am", 5, 1, "7:21 pm"),

436− ("7:21 AM", 0, 1, "8:21 AM"),

437− ("7:21 AM", 3, 1, "7:22 AM"),

438− ("7:21 AM", 5, 1, "7:21 PM"),

439− ("23:24:23", 1, 1, "00:24:23"),

440− ("23:24:23", 3, 1, "23:25:23"),

441− ("23:24:23", 6, 1, "23:24:24"),

442− ("23:24", 1, 1, "00:24"),

443− ("23:24", 3, 1, "23:25"),

256+ ("2020-02-28", 1, "2020-02-29"),

257+ ("2020-02-29", 1, "2020-03-01"),

258+ ("2020-01-31", 1, "2020-02-01"),

259+ ("2020-01-20", 1, "2020-01-21"),

260+ ("2021-01-01", -1, "2020-12-31"),

261+ ("2021-01-31", -2, "2021-01-29"),

262+ ("2020-02-28", 1, "2020-02-29"),

263+ ("2021-02-28", 1, "2021-03-01"),

264+ ("2021-03-01", -1, "2021-02-28"),

265+ ("2020-02-29", -1, "2020-02-28"),

266+ ("2020-02-20", -1, "2020-02-19"),

267+ ("2021-03-01", -1, "2021-02-28"),

268+ ("1980/12/21", 100, "1981/03/31"),

269+ ("1980/12/21", -100, "1980/09/12"),

270+ ("1980/12/21", 1000, "1983/09/17"),

271+ ("1980/12/21", -1000, "1978/03/27"),

272+ ("2021-11-24 07:12:23", 1, "2021-11-24 07:13:23"),

273+ ("2021-11-24 07:12", 1, "2021-11-24 07:13"),

274+ ("Wed Nov 24 2021", 1, "Thu Nov 25 2021"),

275+ ("24-Nov-2021", 1, "25-Nov-2021"),

276+ ("2021 Nov 24", 1, "2021 Nov 25"),

277+ ("Nov 24, 2021", 1, "Nov 25, 2021"),

278+ ("7:21:53 am", 1, "7:22:53 am"),

279+ ("7:21:53 AM", 1, "7:22:53 AM"),

280+ ("7:21 am", 1, "7:22 am"),

281+ ("23:24:23", 1, "23:25:23"),

282+ ("23:24", 1, "23:25"),

283+ ("23:59", 1, "00:00"),

284+ ("23:59:59", 1, "00:00:59"),

444285 ];

445286

446− for (original, cursor, amount, expected) in tests {

447− let rope = Rope::from_str(original);

448− let range = Range::new(cursor, cursor + 1);

449− assert_eq!(

450− DateTimeIncrementor::from_range(rope.slice(..), range)

451− .unwrap()

452− .increment(amount)

453− .1,

454− Tendril::from(expected)

455− );

287+ for (original, amount, expected) in tests {

288+ assert_eq!(increment(original, amount).unwrap(), expected);

456289 }

457290 }

458291

@@ -481,10 +314,7 @@ mod test {

481314 ];

482315

483316 for invalid in tests {

484− let rope = Rope::from_str(invalid);

485− let range = Range::new(0, 1);

486−

487− assert_eq!(DateTimeIncrementor::from_range(rope.slice(..), range), None)

317+ assert_eq!(increment(invalid, 1), None)

488318 }

489319 }

490320}

helix-core/src/increment/integer.rsnew file+235

@@ -0,0 +1,235 @@

1+const SEPARATOR: char = '_';

3+/// Increment an integer.

4+///

5+/// Supported bases:

6+/// 2 with prefix 0b

7+/// 8 with prefix 0o

8+/// 10 with no prefix

9+/// 16 with prefix 0x

10+///

11+/// An integer can contain `_` as a separator but may not start or end with a separator.

12+/// Base 10 integers can go negative, but bases 2, 8, and 16 cannot.

13+/// All addition and subtraction is saturating.

14+pub fn increment(selected_text: &str, amount: i64) -> Option<String> {

15+ if selected_text.is_empty()

16+ || selected_text.ends_with(SEPARATOR)

17+ || selected_text.starts_with(SEPARATOR)

18+ {

19+ return None;

20+ }

21+

22+ let radix = if selected_text.starts_with("0x") {

23+ 16

24+ } else if selected_text.starts_with("0o") {

25+ 8

26+ } else if selected_text.starts_with("0b") {

27+ 2

28+ } else {

29+ 10

30+ };

31+

32+ // Get separator indexes from right to left.

33+ let separator_rtl_indexes: Vec<usize> = selected_text

34+ .chars()

35+ .rev()

36+ .enumerate()

37+ .filter_map(|(i, c)| if c == SEPARATOR { Some(i) } else { None })

38+ .collect();

39+

40+ let word: String = selected_text.chars().filter(|&c| c != SEPARATOR).collect();

41+

42+ let mut new_text = if radix == 10 {

43+ let number = &word;

44+ let value = i128::from_str_radix(number, radix).ok()?;

45+ let new_value = value.saturating_add(amount as i128);

46+

47+ let format_length = match (value.is_negative(), new_value.is_negative()) {

48+ (true, false) => number.len() - 1,

49+ (false, true) => number.len() + 1,

50+ _ => number.len(),

51+ } - separator_rtl_indexes.len();

52+

53+ if number.starts_with('0') || number.starts_with("-0") {

54+ format!("{:01$}", new_value, format_length)

55+ } else {

56+ format!("{}", new_value)

57+ }

58+ } else {

59+ let number = &word[2..];

60+ let value = u128::from_str_radix(number, radix).ok()?;

61+ let new_value = (value as i128).saturating_add(amount as i128);

62+ let new_value = if new_value < 0 { 0 } else { new_value };

63+ let format_length = selected_text.len() - 2 - separator_rtl_indexes.len();

64+

65+ match radix {

66+ 2 => format!("0b{:01$b}", new_value, format_length),

67+ 8 => format!("0o{:01$o}", new_value, format_length),

68+ 16 => {

69+ let (lower_count, upper_count): (usize, usize) =

70+ number.chars().fold((0, 0), |(lower, upper), c| {

71+ (

72+ lower + c.is_ascii_lowercase() as usize,

73+ upper + c.is_ascii_uppercase() as usize,

74+ )

75+ });

76+ if upper_count > lower_count {

77+ format!("0x{:01$X}", new_value, format_length)

78+ } else {

79+ format!("0x{:01$x}", new_value, format_length)

80+ }

81+ }

82+ _ => unimplemented!("radix not supported: {}", radix),

83+ }

84+ };

85+

86+ // Add separators from original number.

87+ for &rtl_index in &separator_rtl_indexes {

88+ if rtl_index < new_text.len() {

89+ let new_index = new_text.len().saturating_sub(rtl_index);

90+ if new_index > 0 {

91+ new_text.insert(new_index, SEPARATOR);

92+ }

93+ }

94+ }

95+

96+ // Add in additional separators if necessary.

97+ if new_text.len() > selected_text.len() && !separator_rtl_indexes.is_empty() {

98+ let spacing = match separator_rtl_indexes.as_slice() {

99+ [.., b, a] => a - b - 1,

100+ _ => separator_rtl_indexes[0],

101+ };

102+

103+ let prefix_length = if radix == 10 { 0 } else { 2 };

104+ if let Some(mut index) = new_text.find(SEPARATOR) {

105+ while index - prefix_length > spacing {

106+ index -= spacing;

107+ new_text.insert(index, SEPARATOR);

108+ }

109+ }

110+ }

111+

112+ Some(new_text)

113+}

114+

115+#[cfg(test)]

116+mod test {

117+ use super::*;

118+

119+ #[test]

120+ fn test_increment_basic_decimal_numbers() {

121+ let tests = [

122+ ("100", 1, "101"),

123+ ("100", -1, "99"),

124+ ("99", 1, "100"),

125+ ("100", 1000, "1100"),

126+ ("100", -1000, "-900"),

127+ ("-1", 1, "0"),

128+ ("-1", 2, "1"),

129+ ("1", -1, "0"),

130+ ("1", -2, "-1"),

131+ ];

132+

133+ for (original, amount, expected) in tests {

134+ assert_eq!(increment(original, amount).unwrap(), expected);

135+ }

136+ }

137+

138+ #[test]

139+ fn test_increment_basic_hexadecimal_numbers() {

140+ let tests = [

141+ ("0x0100", 1, "0x0101"),

142+ ("0x0100", -1, "0x00ff"),

143+ ("0x0001", -1, "0x0000"),

144+ ("0x0000", -1, "0x0000"),

145+ ("0xffffffffffffffff", 1, "0x10000000000000000"),

146+ ("0xffffffffffffffff", 2, "0x10000000000000001"),

147+ ("0xffffffffffffffff", -1, "0xfffffffffffffffe"),

148+ ("0xABCDEF1234567890", 1, "0xABCDEF1234567891"),

149+ ("0xabcdef1234567890", 1, "0xabcdef1234567891"),

150+ ];

151+

152+ for (original, amount, expected) in tests {

153+ assert_eq!(increment(original, amount).unwrap(), expected);

154+ }

155+ }

156+

157+ #[test]

158+ fn test_increment_basic_octal_numbers() {

159+ let tests = [

160+ ("0o0107", 1, "0o0110"),

161+ ("0o0110", -1, "0o0107"),

162+ ("0o0001", -1, "0o0000"),

163+ ("0o7777", 1, "0o10000"),

164+ ("0o1000", -1, "0o0777"),

165+ ("0o0107", 10, "0o0121"),

166+ ("0o0000", -1, "0o0000"),

167+ ("0o1777777777777777777777", 1, "0o2000000000000000000000"),

168+ ("0o1777777777777777777777", 2, "0o2000000000000000000001"),

169+ ("0o1777777777777777777777", -1, "0o1777777777777777777776"),

170+ ];

171+

172+ for (original, amount, expected) in tests {

173+ assert_eq!(increment(original, amount).unwrap(), expected);

174+ }

175+ }

176+

177+ #[test]

178+ fn test_increment_basic_binary_numbers() {

179+ let tests = [

180+ ("0b00000100", 1, "0b00000101"),

181+ ("0b00000100", -1, "0b00000011"),

182+ ("0b00000100", 2, "0b00000110"),

183+ ("0b00000100", -2, "0b00000010"),

184+ ("0b00000001", -1, "0b00000000"),

185+ ("0b00111111", 10, "0b01001001"),

186+ ("0b11111111", 1, "0b100000000"),

187+ ("0b10000000", -1, "0b01111111"),

188+ ("0b0000", -1, "0b0000"),

189+ (

190+ "0b1111111111111111111111111111111111111111111111111111111111111111",

191+ 1,

192+ "0b10000000000000000000000000000000000000000000000000000000000000000",

193+ ),

194+ (

195+ "0b1111111111111111111111111111111111111111111111111111111111111111",

196+ 2,

197+ "0b10000000000000000000000000000000000000000000000000000000000000001",

198+ ),

199+ (

200+ "0b1111111111111111111111111111111111111111111111111111111111111111",

201+ -1,

202+ "0b1111111111111111111111111111111111111111111111111111111111111110",

203+ ),

204+ ];

205+

206+ for (original, amount, expected) in tests {

207+ assert_eq!(increment(original, amount).unwrap(), expected);

208+ }

209+ }

210+

211+ #[test]

212+ fn test_increment_with_separators() {

213+ let tests = [

214+ ("999_999", 1, "1_000_000"),

215+ ("1_000_000", -1, "999_999"),

216+ ("-999_999", -1, "-1_000_000"),

217+ ("0x0000_0000_0001", 0x1_ffff_0000, "0x0001_ffff_0001"),

218+ ("0x0000_0000", -1, "0x0000_0000"),

219+ ("0x0000_0000_0000", -1, "0x0000_0000_0000"),

220+ ("0b01111111_11111111", 1, "0b10000000_00000000"),

221+ ("0b11111111_11111111", 1, "0b1_00000000_00000000"),

222+ ];

223+

224+ for (original, amount, expected) in tests {

225+ assert_eq!(increment(original, amount).unwrap(), expected);

226+ }

227+ }

228+

229+ #[test]

230+ fn test_leading_and_trailing_separators_arent_a_match() {

231+ assert_eq!(increment("9_", 1), None);

232+ assert_eq!(increment("_9", 1), None);

233+ assert_eq!(increment("_9_", 1), None);

234+ }

235+}

helix-core/src/increment/mod.rs+7−5

@@ -1,8 +1,10 @@

1−pub mod date_time;

2−pub mod number;

1+mod date_time;

2+mod integer;

4−use crate::{Range, Tendril};

4+pub fn integer(selected_text: &str, amount: i64) -> Option<String> {

5+ integer::increment(selected_text, amount)

6+}

6−pub trait Increment {

7− fn increment(&self, amount: i64) -> (Range, Tendril);

8+pub fn date_time(selected_text: &str, amount: i64) -> Option<String> {

9+ date_time::increment(selected_text, amount)

810}

helix-core/src/increment/number.rsdeleted−507

@@ -1,507 +0,0 @@

1−use std::borrow::Cow;

2−

3−use ropey::RopeSlice;

4−

5−use super::Increment;

6−

7−use crate::{

8− textobject::{textobject_word, TextObject},

9− Range, Tendril,

10−};

11−

12−#[derive(Debug, PartialEq, Eq)]

13−pub struct NumberIncrementor<'a> {

14− value: i64,

15− radix: u32,

16− range: Range,

17−

18− text: RopeSlice<'a>,

19−}

20−

21−impl<'a> NumberIncrementor<'a> {

22− /// Return information about number under rang if there is one.

23− pub fn from_range(text: RopeSlice, range: Range) -> Option<NumberIncrementor> {

24− // If the cursor is on the minus sign of a number we want to get the word textobject to the

25− // right of it.

26− let range = if range.to() < text.len_chars()

27− && range.to() - range.from() <= 1

28− && text.char(range.from()) == '-'

29− {

30− Range::new(range.from() + 1, range.to() + 1)

31− } else {

32− range

33− };

34−

35− let range = textobject_word(text, range, TextObject::Inside, 1, false);

36−

37− // If there is a minus sign to the left of the word object, we want to include it in the range.

38− let range = if range.from() > 0 && text.char(range.from() - 1) == '-' {

39− range.extend(range.from() - 1, range.from())

40− } else {

41− range

42− };

43−

44− let word: String = text

45− .slice(range.from()..range.to())

46− .chars()

47− .filter(|&c| c != '_')

48− .collect();

49− let (radix, prefixed) = if word.starts_with("0x") {

50− (16, true)

51− } else if word.starts_with("0o") {

52− (8, true)

53− } else if word.starts_with("0b") {

54− (2, true)

55− } else {

56− (10, false)

57− };

58−

59− let number = if prefixed { &word[2..] } else { &word };

60−

61− let value = i128::from_str_radix(number, radix).ok()?;

62− if (value.is_positive() && value.leading_zeros() < 64)

63− || (value.is_negative() && value.leading_ones() < 64)

64− {

65− return None;

66− }

67−

68− let value = value as i64;

69− Some(NumberIncrementor {

70− range,

71− value,

72− radix,

73− text,

74− })

75− }

76−}

77−

78−impl<'a> Increment for NumberIncrementor<'a> {

79− fn increment(&self, amount: i64) -> (Range, Tendril) {

80− let old_text: Cow<str> = self.text.slice(self.range.from()..self.range.to()).into();

81− let old_length = old_text.len();

82− let new_value = self.value.wrapping_add(amount);

83−

84− // Get separator indexes from right to left.

85− let separator_rtl_indexes: Vec<usize> = old_text

86− .chars()

87− .rev()

88− .enumerate()

89− .filter_map(|(i, c)| if c == '_' { Some(i) } else { None })

90− .collect();

91−

92− let format_length = if self.radix == 10 {

93− match (self.value.is_negative(), new_value.is_negative()) {

94− (true, false) => old_length - 1,

95− (false, true) => old_length + 1,

96− _ => old_text.len(),

97− }

98− } else {

99− old_text.len() - 2

100− } - separator_rtl_indexes.len();

101−

102− let mut new_text = match self.radix {

103− 2 => format!("0b{:01$b}", new_value, format_length),

104− 8 => format!("0o{:01$o}", new_value, format_length),

105− 10 if old_text.starts_with('0') || old_text.starts_with("-0") => {

106− format!("{:01$}", new_value, format_length)

107− }

108− 10 => format!("{}", new_value),

109− 16 => {

110− let (lower_count, upper_count): (usize, usize) =

111− old_text.chars().skip(2).fold((0, 0), |(lower, upper), c| {

112− (

113− lower + c.is_ascii_lowercase().then(|| 1).unwrap_or(0),

114− upper + c.is_ascii_uppercase().then(|| 1).unwrap_or(0),

115− )

116− });

117− if upper_count > lower_count {

118− format!("0x{:01$X}", new_value, format_length)

119− } else {

120− format!("0x{:01$x}", new_value, format_length)

121− }

122− }

123− _ => unimplemented!("radix not supported: {}", self.radix),

124− };

125−

126− // Add separators from original number.

127− for &rtl_index in &separator_rtl_indexes {

128− if rtl_index < new_text.len() {

129− let new_index = new_text.len() - rtl_index;

130− new_text.insert(new_index, '_');

131− }

132− }

133−

134− // Add in additional separators if necessary.

135− if new_text.len() > old_length && !separator_rtl_indexes.is_empty() {

136− let spacing = match separator_rtl_indexes.as_slice() {

137− [.., b, a] => a - b - 1,

138− _ => separator_rtl_indexes[0],

139− };

140−

141− let prefix_length = if self.radix == 10 { 0 } else { 2 };

142− if let Some(mut index) = new_text.find('_') {

143− while index - prefix_length > spacing {

144− index -= spacing;

145− new_text.insert(index, '_');

146− }

147− }

148− }

149−

150− (self.range, new_text.into())

151− }

152−}

153−

154−#[cfg(test)]

155−mod test {

156− use super::*;

157− use crate::Rope;

158−

159− #[test]

160− fn test_decimal_at_point() {

161− let rope = Rope::from_str("Test text 12345 more text.");

162− let range = Range::point(12);

163− assert_eq!(

164− NumberIncrementor::from_range(rope.slice(..), range),

165− Some(NumberIncrementor {

166− range: Range::new(10, 15),

167− value: 12345,

168− radix: 10,

169− text: rope.slice(..),

170− })

171− );

172− }

173−

174− #[test]

175− fn test_uppercase_hexadecimal_at_point() {

176− let rope = Rope::from_str("Test text 0x123ABCDEF more text.");

177− let range = Range::point(12);

178− assert_eq!(

179− NumberIncrementor::from_range(rope.slice(..), range),

180− Some(NumberIncrementor {

181− range: Range::new(10, 21),

182− value: 0x123ABCDEF,

183− radix: 16,

184− text: rope.slice(..),

185− })

186− );

187− }

188−

189− #[test]

190− fn test_lowercase_hexadecimal_at_point() {

191− let rope = Rope::from_str("Test text 0xfa3b4e more text.");

192− let range = Range::point(12);

193− assert_eq!(

194− NumberIncrementor::from_range(rope.slice(..), range),

195− Some(NumberIncrementor {

196− range: Range::new(10, 18),

197− value: 0xfa3b4e,

198− radix: 16,

199− text: rope.slice(..),

200− })

201− );

202− }

203−

204− #[test]

205− fn test_octal_at_point() {

206− let rope = Rope::from_str("Test text 0o1074312 more text.");

207− let range = Range::point(12);

208− assert_eq!(

209− NumberIncrementor::from_range(rope.slice(..), range),

210− Some(NumberIncrementor {

211− range: Range::new(10, 19),

212− value: 0o1074312,

213− radix: 8,

214− text: rope.slice(..),

215− })

216− );

217− }

218−

219− #[test]

220− fn test_binary_at_point() {

221− let rope = Rope::from_str("Test text 0b10111010010101 more text.");

222− let range = Range::point(12);

223− assert_eq!(

224− NumberIncrementor::from_range(rope.slice(..), range),

225− Some(NumberIncrementor {

226− range: Range::new(10, 26),

227− value: 0b10111010010101,

228− radix: 2,

229− text: rope.slice(..),

230− })

231− );

232− }

233−

234− #[test]

235− fn test_negative_decimal_at_point() {

236− let rope = Rope::from_str("Test text -54321 more text.");

237− let range = Range::point(12);

238− assert_eq!(

239− NumberIncrementor::from_range(rope.slice(..), range),

240− Some(NumberIncrementor {

241− range: Range::new(10, 16),

242− value: -54321,

243− radix: 10,

244− text: rope.slice(..),

245− })

246− );

247− }

248−

249− #[test]

250− fn test_decimal_with_leading_zeroes_at_point() {

251− let rope = Rope::from_str("Test text 000045326 more text.");

252− let range = Range::point(12);

253− assert_eq!(

254− NumberIncrementor::from_range(rope.slice(..), range),

255− Some(NumberIncrementor {

256− range: Range::new(10, 19),

257− value: 45326,

258− radix: 10,

259− text: rope.slice(..),

260− })

261− );

262− }

263−

264− #[test]

265− fn test_negative_decimal_cursor_on_minus_sign() {

266− let rope = Rope::from_str("Test text -54321 more text.");

267− let range = Range::point(10);

268− assert_eq!(

269− NumberIncrementor::from_range(rope.slice(..), range),

270− Some(NumberIncrementor {

271− range: Range::new(10, 16),

272− value: -54321,

273− radix: 10,

274− text: rope.slice(..),

275− })

276− );

277− }

278−

279− #[test]

280− fn test_number_under_range_start_of_rope() {

281− let rope = Rope::from_str("100");

282− let range = Range::point(0);

283− assert_eq!(

284− NumberIncrementor::from_range(rope.slice(..), range),

285− Some(NumberIncrementor {

286− range: Range::new(0, 3),

287− value: 100,

288− radix: 10,

289− text: rope.slice(..),

290− })

291− );

292− }

293−

294− #[test]

295− fn test_number_under_range_end_of_rope() {

296− let rope = Rope::from_str("100");

297− let range = Range::point(2);

298− assert_eq!(

299− NumberIncrementor::from_range(rope.slice(..), range),

300− Some(NumberIncrementor {

301− range: Range::new(0, 3),

302− value: 100,

303− radix: 10,

304− text: rope.slice(..),

305− })

306− );

307− }

308−

309− #[test]

310− fn test_number_surrounded_by_punctuation() {

311− let rope = Rope::from_str(",100;");

312− let range = Range::point(1);

313− assert_eq!(

314− NumberIncrementor::from_range(rope.slice(..), range),

315− Some(NumberIncrementor {

316− range: Range::new(1, 4),

317− value: 100,

318− radix: 10,

319− text: rope.slice(..),

320− })

321− );

322− }

323−

324− #[test]

325− fn test_not_a_number_point() {

326− let rope = Rope::from_str("Test text 45326 more text.");

327− let range = Range::point(6);

328− assert_eq!(NumberIncrementor::from_range(rope.slice(..), range), None);

329− }

330−

331− #[test]

332− fn test_number_too_large_at_point() {

333− let rope = Rope::from_str("Test text 0xFFFFFFFFFFFFFFFFF more text.");

334− let range = Range::point(12);

335− assert_eq!(NumberIncrementor::from_range(rope.slice(..), range), None);

336− }

337−

338− #[test]

339− fn test_number_cursor_one_right_of_number() {

340− let rope = Rope::from_str("100 ");

341− let range = Range::point(3);

342− assert_eq!(NumberIncrementor::from_range(rope.slice(..), range), None);

343− }

344−

345− #[test]

346− fn test_number_cursor_one_left_of_number() {

347− let rope = Rope::from_str(" 100");

348− let range = Range::point(0);

349− assert_eq!(NumberIncrementor::from_range(rope.slice(..), range), None);

350− }

351−

352− #[test]

353− fn test_increment_basic_decimal_numbers() {

354− let tests = [

355− ("100", 1, "101"),

356− ("100", -1, "99"),

357− ("99", 1, "100"),

358− ("100", 1000, "1100"),

359− ("100", -1000, "-900"),

360− ("-1", 1, "0"),

361− ("-1", 2, "1"),

362− ("1", -1, "0"),

363− ("1", -2, "-1"),

364− ];

365−

366− for (original, amount, expected) in tests {

367− let rope = Rope::from_str(original);

368− let range = Range::point(0);

369− assert_eq!(

370− NumberIncrementor::from_range(rope.slice(..), range)

371− .unwrap()

372− .increment(amount)

373− .1,

374− Tendril::from(expected)

375− );

376− }

377− }

378−

379− #[test]

380− fn test_increment_basic_hexadedimal_numbers() {

381− let tests = [

382− ("0x0100", 1, "0x0101"),

383− ("0x0100", -1, "0x00ff"),

384− ("0x0001", -1, "0x0000"),

385− ("0x0000", -1, "0xffffffffffffffff"),

386− ("0xffffffffffffffff", 1, "0x0000000000000000"),

387− ("0xffffffffffffffff", 2, "0x0000000000000001"),

388− ("0xffffffffffffffff", -1, "0xfffffffffffffffe"),

389− ("0xABCDEF1234567890", 1, "0xABCDEF1234567891"),

390− ("0xabcdef1234567890", 1, "0xabcdef1234567891"),

391− ];

392−

393− for (original, amount, expected) in tests {

394− let rope = Rope::from_str(original);

395− let range = Range::point(0);

396− assert_eq!(

397− NumberIncrementor::from_range(rope.slice(..), range)

398− .unwrap()

399− .increment(amount)

400− .1,

401− Tendril::from(expected)

402− );

403− }

404− }

405−

406− #[test]

407− fn test_increment_basic_octal_numbers() {

408− let tests = [

409− ("0o0107", 1, "0o0110"),

410− ("0o0110", -1, "0o0107"),

411− ("0o0001", -1, "0o0000"),

412− ("0o7777", 1, "0o10000"),

413− ("0o1000", -1, "0o0777"),

414− ("0o0107", 10, "0o0121"),

415− ("0o0000", -1, "0o1777777777777777777777"),

416− ("0o1777777777777777777777", 1, "0o0000000000000000000000"),

417− ("0o1777777777777777777777", 2, "0o0000000000000000000001"),

418− ("0o1777777777777777777777", -1, "0o1777777777777777777776"),

419− ];

420−

421− for (original, amount, expected) in tests {

422− let rope = Rope::from_str(original);

423− let range = Range::point(0);

424− assert_eq!(

425− NumberIncrementor::from_range(rope.slice(..), range)

426− .unwrap()

427− .increment(amount)

428− .1,

429− Tendril::from(expected)

430− );

431− }

432− }

433−

434− #[test]

435− fn test_increment_basic_binary_numbers() {

436− let tests = [

437− ("0b00000100", 1, "0b00000101"),

438− ("0b00000100", -1, "0b00000011"),

439− ("0b00000100", 2, "0b00000110"),

440− ("0b00000100", -2, "0b00000010"),

441− ("0b00000001", -1, "0b00000000"),

442− ("0b00111111", 10, "0b01001001"),

443− ("0b11111111", 1, "0b100000000"),

444− ("0b10000000", -1, "0b01111111"),

445− (

446− "0b0000",

447− -1,

448− "0b1111111111111111111111111111111111111111111111111111111111111111",

449− ),

450− (

451− "0b1111111111111111111111111111111111111111111111111111111111111111",

452− 1,

453− "0b0000000000000000000000000000000000000000000000000000000000000000",

454− ),

455− (

456− "0b1111111111111111111111111111111111111111111111111111111111111111",

457− 2,

458− "0b0000000000000000000000000000000000000000000000000000000000000001",

459− ),

460− (

461− "0b1111111111111111111111111111111111111111111111111111111111111111",

462− -1,

463− "0b1111111111111111111111111111111111111111111111111111111111111110",

464− ),

465− ];

466−

467− for (original, amount, expected) in tests {

468− let rope = Rope::from_str(original);

469− let range = Range::point(0);

470− assert_eq!(

471− NumberIncrementor::from_range(rope.slice(..), range)

472− .unwrap()

473− .increment(amount)

474− .1,

475− Tendril::from(expected)

476− );

477− }

478− }

479−

480− #[test]

481− fn test_increment_with_separators() {

482− let tests = [

483− ("999_999", 1, "1_000_000"),

484− ("1_000_000", -1, "999_999"),

485− ("-999_999", -1, "-1_000_000"),

486− ("0x0000_0000_0001", 0x1_ffff_0000, "0x0001_ffff_0001"),

487− ("0x0000_0000_0001", 0x1_ffff_0000, "0x0001_ffff_0001"),

488− ("0x0000_0000_0001", 0x1_ffff_0000, "0x0001_ffff_0001"),

489− ("0x0000_0000", -1, "0xffff_ffff_ffff_ffff"),

490− ("0x0000_0000_0000", -1, "0xffff_ffff_ffff_ffff"),

491− ("0b01111111_11111111", 1, "0b10000000_00000000"),

492− ("0b11111111_11111111", 1, "0b1_00000000_00000000"),

493− ];

494−

495− for (original, amount, expected) in tests {

496− let rope = Rope::from_str(original);

497− let range = Range::point(0);

498− assert_eq!(

499− NumberIncrementor::from_range(rope.slice(..), range)

500− .unwrap()

501− .increment(amount)

502− .1,

503− Tendril::from(expected)

504− );

505− }

506− }

507−}

helix-core/src/indent.rs+778−141

@@ -1,12 +1,14 @@

1−use std::collections::HashMap;

1+use std::{borrow::Cow, collections::HashMap};

33use tree_sitter::{Query, QueryCursor, QueryPredicateArg};

55use crate::{

66 chars::{char_is_line_ending, char_is_whitespace},

7− syntax::{LanguageConfiguration, RopeProvider, Syntax},

7+ find_first_non_whitespace_char,

8+ graphemes::{grapheme_width, tab_width_at},

9+ syntax::{IndentationHeuristic, LanguageConfiguration, RopeProvider, Syntax},

810 tree_sitter::Node,

9− Rope, RopeSlice,

11+ Position, Rope, RopeGraphemes, RopeSlice,

1012};

1113

1214/// Enum representing indentation style.

@@ -18,6 +20,10 @@ pub enum IndentStyle {

1820 Spaces(u8),

1921}

2022

23+// 16 spaces

24+const INDENTS: &str = " ";

25+pub const MAX_INDENT: u8 = 16;

26+

2127impl IndentStyle {

2228 /// Creates an `IndentStyle` from an indentation string.

2329 ///

@@ -26,10 +32,10 @@ impl IndentStyle {

2632 #[inline]

2733 pub fn from_str(indent: &str) -> Self {

2834 // XXX: do we care about validating the input more than this? Probably not...?

29− debug_assert!(!indent.is_empty() && indent.len() <= 8);

35+ debug_assert!(!indent.is_empty() && indent.len() <= MAX_INDENT as usize);

3036

3137 if indent.starts_with(' ') {

32− IndentStyle::Spaces(indent.len() as u8)

38+ IndentStyle::Spaces(indent.len().clamp(1, MAX_INDENT as usize) as u8)

3339 } else {

3440 IndentStyle::Tabs

3541 }

@@ -39,23 +45,24 @@ impl IndentStyle {

3945 pub fn as_str(&self) -> &'static str {

4046 match *self {

4147 IndentStyle::Tabs => "\t",

42− IndentStyle::Spaces(1) => " ",

43− IndentStyle::Spaces(2) => " ",

44− IndentStyle::Spaces(3) => " ",

45− IndentStyle::Spaces(4) => " ",

46− IndentStyle::Spaces(5) => " ",

47− IndentStyle::Spaces(6) => " ",

48− IndentStyle::Spaces(7) => " ",

49− IndentStyle::Spaces(8) => " ",

50−

51− // Unsupported indentation style. This should never happen,

52− // but just in case fall back to two spaces.

5348 IndentStyle::Spaces(n) => {

54− debug_assert!(n > 0 && n <= 8); // Always triggers. `debug_panic!()` wanted.

55− " "

49+ // Unsupported indentation style. This should never happen,

50+ debug_assert!(n > 0 && n <= MAX_INDENT);

51+

52+ // Either way, clamp to the nearest supported value

53+ let closest_n = n.clamp(1, MAX_INDENT) as usize;

54+ &INDENTS[0..closest_n]

5655 }

5756 }

5857 }

58+

59+ #[inline]

60+ pub fn indent_width(&self, tab_width: usize) -> usize {

61+ match *self {

62+ IndentStyle::Tabs => tab_width,

63+ IndentStyle::Spaces(width) => width as usize,

64+ }

65+ }

5966}

6067

6168/// Attempts to detect the indentation style used in a document.

@@ -66,9 +73,9 @@ pub fn auto_detect_indent_style(document_text: &Rope) -> Option<IndentStyle> {

6673 // Build a histogram of the indentation *increases* between

6774 // subsequent lines, ignoring lines that are all whitespace.

6875 //

69− // Index 0 is for tabs, the rest are 1-8 spaces.

70− let histogram: [usize; 9] = {

71− let mut histogram = [0; 9];

76+ // Index 0 is for tabs, the rest are 1-MAX_INDENT spaces.

77+ let histogram: [usize; MAX_INDENT as usize + 1] = {

78+ let mut histogram = [0; MAX_INDENT as usize + 1];

7279 let mut prev_line_is_tabs = false;

7380 let mut prev_line_leading_count = 0usize;

7481

@@ -127,7 +134,7 @@ pub fn auto_detect_indent_style(document_text: &Rope) -> Option<IndentStyle> {

127134 histogram[0] += 1;

128135 } else {

129136 let amount = leading_count - prev_line_leading_count;

130− if amount <= 8 {

137+ if amount <= MAX_INDENT as usize {

131138 histogram[amount] += 1;

132139 }

133140 }

@@ -177,28 +184,80 @@ pub fn auto_detect_indent_style(document_text: &Rope) -> Option<IndentStyle> {

177184

178185/// To determine indentation of a newly inserted line, figure out the indentation at the last col

179186/// of the previous line.

180−pub fn indent_level_for_line(line: RopeSlice, tab_width: usize) -> usize {

187+pub fn indent_level_for_line(line: RopeSlice, tab_width: usize, indent_width: usize) -> usize {

181188 let mut len = 0;

182189 for ch in line.chars() {

183190 match ch {

184− '\t' => len += tab_width,

191+ '\t' => len += tab_width_at(len, tab_width as u16),

185192 ' ' => len += 1,

186193 _ => break,

187194 }

188195 }

189196

190− len / tab_width

197+ len / indent_width

198+}

199+

200+/// Create a string of tabs & spaces that has the same visual width as the given RopeSlice (independent of the tab width).

201+fn whitespace_with_same_width(text: RopeSlice) -> String {

202+ let mut s = String::new();

203+ for grapheme in RopeGraphemes::new(text) {

204+ if grapheme == "\t" {

205+ s.push('\t');

206+ } else {

207+ s.extend(std::iter::repeat(' ').take(grapheme_width(&Cow::from(grapheme))));

208+ }

209+ }

210+ s

211+}

212+

213+fn add_indent_level(

214+ mut base_indent: String,

215+ added_indent_level: isize,

216+ indent_style: &IndentStyle,

217+ tab_width: usize,

218+) -> String {

219+ if added_indent_level >= 0 {

220+ // Adding a non-negative indent is easy, we can simply append the indent string

221+ base_indent.push_str(&indent_style.as_str().repeat(added_indent_level as usize));

222+ base_indent

223+ } else {

224+ // In this case, we want to return a prefix of `base_indent`.

225+ // Since the width of a tab depends on its offset, we cannot simply iterate over

226+ // the chars of `base_indent` in reverse until we have the desired indent reduction,

227+ // instead we iterate over them twice in forward direction.

228+ let base_indent_rope = RopeSlice::from(base_indent.as_str());

229+ #[allow(deprecated)]

230+ let base_indent_width =

231+ crate::visual_coords_at_pos(base_indent_rope, base_indent_rope.len_chars(), tab_width)

232+ .col;

233+ let target_indent_width = base_indent_width

234+ .saturating_sub((-added_indent_level) as usize * indent_style.indent_width(tab_width));

235+ #[allow(deprecated)]

236+ let char_end_idx = crate::pos_at_visual_coords(

237+ base_indent_rope,

238+ Position {

239+ row: 0,

240+ col: target_indent_width,

241+ },

242+ tab_width,

243+ );

244+ let byte_end_idx = base_indent_rope.char_to_byte(char_end_idx);

245+ base_indent.truncate(byte_end_idx);

246+ base_indent

247+ }

191248}

192249

193250/// Computes for node and all ancestors whether they are the first node on their line.

194251/// The first entry in the return value represents the root node, the last one the node itself

195−fn get_first_in_line(mut node: Node, byte_pos: usize, new_line: bool) -> Vec<bool> {

252+fn get_first_in_line(mut node: Node, new_line_byte_pos: Option<usize>) -> Vec<bool> {

196253 let mut first_in_line = Vec::new();

197254 loop {

198255 if let Some(prev) = node.prev_sibling() {

199256 // If we insert a new line, the first node at/after the cursor is considered to be the first in its line

200257 let first = prev.end_position().row != node.start_position().row

201− || (new_line && node.start_byte() >= byte_pos && prev.start_byte() < byte_pos);

258+ || new_line_byte_pos.map_or(false, |byte_pos| {

259+ node.start_byte() >= byte_pos && prev.start_byte() < byte_pos

260+ });

202261 first_in_line.push(Some(first));

203262 } else {

204263 // Nodes that have no previous siblings are first in their line if and only if their parent is

@@ -229,68 +288,140 @@ fn get_first_in_line(mut node: Node, byte_pos: usize, new_line: bool) -> Vec<boo

229288/// This is usually constructed in one of 2 ways:

230289/// - Successively add indent captures to get the (added) indent from a single line

231290/// - Successively add the indent results for each line

232−#[derive(Default)]

233−struct Indentation {

234− /// The total indent (the number of indent levels) is defined as max(0, indent-outdent).

235− /// The string that this results in depends on the indent style (spaces or tabs, etc.)

291+/// The string that this indentation defines starts with the string contained in the align field (unless it is None), followed by:

292+/// - max(0, indent - outdent) tabs, if tabs are used for indentation

293+/// - max(0, indent - outdent)*indent_width spaces, if spaces are used for indentation

294+#[derive(Default, Debug, PartialEq, Eq, Clone)]

295+pub struct Indentation<'a> {

236296 indent: usize,

297+ indent_always: usize,

237298 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>>,

238303}

239−impl Indentation {

240− /// Add some other [IndentResult] to this.

241− /// The added indent should be the total added indent from one line

242− fn add_line(&mut self, added: &Indentation) {

243− if added.indent > 0 && added.outdent == 0 {

244− self.indent += 1;

245− } else if added.outdent > 0 && added.indent == 0 {

246− self.outdent += 1;

304+

305+impl<'a> Indentation<'a> {

306+ /// Add some other [Indentation] to this.

307+ /// The added indent should be the total added indent from one line.

308+ /// Indent should always be added starting from the bottom (or equivalently, the innermost tree-sitter node).

309+ fn add_line(&mut self, added: Indentation<'a>) {

310+ // Align overrides the indent from outer scopes.

311+ if self.align.is_some() {

312+ return;

247313 }

314+ if added.align.is_some() {

315+ self.align = added.align;

316+ return;

317+ }

318+ self.indent += added.indent;

319+ self.indent_always += added.indent_always;

320+ self.outdent += added.outdent;

321+ self.outdent_always += added.outdent_always;

248322 }

323+

249324 /// Add an indent capture to this indent.

250− /// All the captures that are added in this way should be on the same line.

251− fn add_capture(&mut self, added: IndentCaptureType) {

325+ /// Only captures that apply to the same line should be added together in this way (otherwise use `add_line`)

326+ /// and the captures should be added starting from the innermost tree-sitter node (currently this only matters

327+ /// if multiple `@align` patterns occur on the same line).

328+ fn add_capture(&mut self, added: IndentCaptureType<'a>) {

252329 match added {

253330 IndentCaptureType::Indent => {

254− self.indent = 1;

331+ if self.indent_always == 0 {

332+ self.indent = 1;

333+ }

334+ }

335+ IndentCaptureType::IndentAlways => {

336+ // any time we encounter an `indent.always` on the same line, we

337+ // want to cancel out all regular indents

338+ self.indent_always += 1;

339+ self.indent = 0;

255340 }

256341 IndentCaptureType::Outdent => {

257− self.outdent = 1;

342+ if self.outdent_always == 0 {

343+ self.outdent = 1;

344+ }

345+ }

346+ IndentCaptureType::OutdentAlways => {

347+ self.outdent_always += 1;

348+ self.outdent = 0;

349+ }

350+ IndentCaptureType::Align(align) => {

351+ if self.align.is_none() {

352+ self.align = Some(align);

353+ }

258354 }

259355 }

260356 }

261− fn as_string(&self, indent_style: &IndentStyle) -> String {

262− let indent_level = if self.indent >= self.outdent {

263− self.indent - self.outdent

357+ fn net_indent(&self) -> isize {

358+ (self.indent + self.indent_always) as isize

359+ - ((self.outdent + self.outdent_always) as isize)

360+ }

361+ /// Convert `self` into a string, taking into account the computed and actual indentation of some other line.

362+ fn relative_indent(

363+ &self,

364+ other_computed_indent: &Self,

365+ other_leading_whitespace: RopeSlice,

366+ indent_style: &IndentStyle,

367+ tab_width: usize,

368+ ) -> Option<String> {

369+ if self.align == other_computed_indent.align {

370+ // If self and baseline are either not aligned to anything or both aligned the same way,

371+ // we can simply take `other_leading_whitespace` and add some indent / outdent to it (in the second

372+ // case, the alignment should already be accounted for in `other_leading_whitespace`).

373+ let indent_diff = self.net_indent() - other_computed_indent.net_indent();

374+ Some(add_indent_level(

375+ String::from(other_leading_whitespace),

376+ indent_diff,

377+ indent_style,

378+ tab_width,

379+ ))

264380 } else {

265− log::warn!("Encountered more outdent than indent nodes while calculating indentation: {} outdent, {} indent", self.outdent, self.indent);

266− 0

267− };

268− indent_style.as_str().repeat(indent_level)

381+ // If the alignment of both lines is different, we cannot compare their indentation in any meaningful way

382+ None

383+ }

384+ }

385+ pub fn to_string(&self, indent_style: &IndentStyle, tab_width: usize) -> String {

386+ add_indent_level(

387+ self.align

388+ .map_or_else(String::new, whitespace_with_same_width),

389+ self.net_indent(),

390+ indent_style,

391+ tab_width,

392+ )

269393 }

270394}

271395

272396/// An indent definition which corresponds to a capture from the indent query

273−struct IndentCapture {

274− capture_type: IndentCaptureType,

397+#[derive(Debug)]

398+struct IndentCapture<'a> {

399+ capture_type: IndentCaptureType<'a>,

275400 scope: IndentScope,

276401}

277−#[derive(Clone, Copy)]

278−enum IndentCaptureType {

402+#[derive(Debug, Clone, PartialEq)]

403+enum IndentCaptureType<'a> {

279404 Indent,

405+ IndentAlways,

280406 Outdent,

407+ OutdentAlways,

408+ /// Alignment given as a string of whitespace

409+ Align(RopeSlice<'a>),

281410}

282−impl IndentCaptureType {

411+

412+impl<'a> IndentCaptureType<'a> {

283413 fn default_scope(&self) -> IndentScope {

284414 match self {

285− IndentCaptureType::Indent => IndentScope::Tail,

286− IndentCaptureType::Outdent => IndentScope::All,

415+ IndentCaptureType::Indent | IndentCaptureType::IndentAlways => IndentScope::Tail,

416+ IndentCaptureType::Outdent | IndentCaptureType::OutdentAlways => IndentScope::All,

417+ IndentCaptureType::Align(_) => IndentScope::All,

287418 }

288419 }

289420}

290421/// This defines which part of a node an [IndentCapture] applies to.

291422/// Each [IndentCaptureType] has a default scope, but the scope can be changed

292423/// with `#set!` property declarations.

293−#[derive(Clone, Copy)]

424+#[derive(Debug, Clone, Copy)]

294425enum IndentScope {

295426 /// The indent applies to the whole node

296427 All,

@@ -298,20 +429,52 @@ enum IndentScope {

298429 Tail,

299430}

300431

301−/// Execute the indent query.

302−/// Returns for each node (identified by its id) a list of indent captures for that node.

303−fn query_indents(

432+/// 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.

434+#[derive(Debug)]

435+enum ExtendCapture {

436+ Extend,

437+ PreventOnce,

438+}

439+

440+/// The result of running a tree-sitter indent query. This stores for

441+/// each node (identified by its ID) the relevant captures (already filtered

442+/// by predicates).

443+#[derive(Debug)]

444+struct IndentQueryResult<'a> {

445+ indent_captures: HashMap<usize, Vec<IndentCapture<'a>>>,

446+ extend_captures: HashMap<usize, Vec<ExtendCapture>>,

447+}

448+

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>(

304467 query: &Query,

305468 syntax: &Syntax,

306469 cursor: &mut QueryCursor,

307− text: RopeSlice,

470+ text: RopeSlice<'a>,

308471 range: std::ops::Range<usize>,

309− // Position of the (optional) newly inserted line break.

310− // Given as (line, byte_pos)

311− new_line_break: Option<(usize, usize)>,

312−) -> HashMap<usize, Vec<IndentCapture>> {

472+ new_line_byte_pos: Option<usize>,

473+) -> IndentQueryResult<'a> {

313474 let mut indent_captures: HashMap<usize, Vec<IndentCapture>> = HashMap::new();

475+ let mut extend_captures: HashMap<usize, Vec<ExtendCapture>> = HashMap::new();

314476 cursor.set_byte_range(range);

477+

315478 // Iterate over all captures from the query

316479 for m in cursor.matches(query, syntax.tree().root_node(), RopeProvider(text)) {

317480 // Skip matches where not all custom predicates are fulfilled

@@ -338,21 +501,13 @@ fn query_indents(

338501 Some(QueryPredicateArg::Capture(capt1)),

339502 Some(QueryPredicateArg::Capture(capt2))

340503 ) => {

341− let get_line_num = |node: Node| {

342− let mut node_line = node.start_position().row;

343− // Adjust for the new line that will be inserted

344− if let Some((line, byte)) = new_line_break {

345− if node_line==line && node.start_byte()>=byte {

346− node_line += 1;

347− }

348− }

349− node_line

350− };

351504 let n1 = m.nodes_for_capture_index(*capt1).next();

352505 let n2 = m.nodes_for_capture_index(*capt2).next();

353506 match (n1, n2) {

354507 (Some(n1), Some(n2)) => {

355− let same_line = get_line_num(n1)==get_line_num(n2);

508+ let n1_line = get_node_start_line(n1, new_line_byte_pos);

509+ let n2_line = get_node_start_line(n2, new_line_byte_pos);

510+ let same_line = n1_line == n2_line;

356511 same_line==(pred.operator.as_ref()=="same-line?")

357512 }

358513 _ => true,

@@ -363,6 +518,23 @@ fn query_indents(

363518 }

364519 }

365520 }

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+ },

366538 _ => {

367539 panic!(

368540 "Invalid indent query: Unknown predicate (\"{}\")",

@@ -373,11 +545,42 @@ fn query_indents(

373545 }) {

374546 continue;

375547 }

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;

376553 for capture in m.captures {

377− let capture_type = query.capture_names()[capture.index as usize].as_str();

378− let capture_type = match capture_type {

554+ let capture_name = query.capture_names()[capture.index as usize].as_str();

555+ let capture_type = match capture_name {

379556 "indent" => IndentCaptureType::Indent,

557+ "indent.always" => IndentCaptureType::IndentAlways,

380558 "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" => {

571+ extend_captures

572+ .entry(capture.node.id())

573+ .or_insert_with(|| Vec::with_capacity(1))

574+ .push(ExtendCapture::Extend);

575+ continue;

576+ }

577+ "extend.prevent-once" => {

578+ extend_captures

579+ .entry(capture.node.id())

580+ .or_insert_with(|| Vec::with_capacity(1))

581+ .push(ExtendCapture::PreventOnce);

582+ continue;

583+ }

381584 _ => {

382585 // Ignore any unknown captures (these may be needed for predicates such as #match?)

383586 continue;

@@ -413,14 +616,181 @@ fn query_indents(

413616 }

414617 }

415618 }

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

416638 indent_captures

417− .entry(capture.node.id())

418− // Most entries only need to contain a single IndentCapture

639+ .entry(node_id)

419640 .or_insert_with(|| Vec::with_capacity(1))

420− .push(indent_capture);

641+ .push(capture);

642+ }

643+ }

644+

645+ let result = IndentQueryResult {

646+ indent_captures,

647+ extend_captures,

648+ };

649+

650+ log::trace!("indent result = {:?}", result);

651+

652+ result

653+}

654+

655+/// Handle extend queries. deepest_preceding is the deepest descendant of node that directly precedes the cursor position.

656+/// Any ancestor of deepest_preceding which is also a descendant of node may be "extended". In that case, node will be updated,

657+/// so that the indent computation starts with the correct syntax node.

658+fn extend_nodes<'a>(

659+ node: &mut Node<'a>,

660+ mut deepest_preceding: Node<'a>,

661+ extend_captures: &HashMap<usize, Vec<ExtendCapture>>,

662+ text: RopeSlice,

663+ line: usize,

664+ tab_width: usize,

665+ indent_width: usize,

666+) {

667+ let mut stop_extend = false;

668+

669+ while deepest_preceding != *node {

670+ let mut extend_node = false;

671+ // This will be set to true if this node is captured, regardless of whether

672+ // it actually will be extended (e.g. because the cursor isn't indented

673+ // more than the node).

674+ let mut node_captured = false;

675+ if let Some(captures) = extend_captures.get(&deepest_preceding.id()) {

676+ for capture in captures {

677+ match capture {

678+ ExtendCapture::PreventOnce => {

679+ stop_extend = true;

680+ }

681+ ExtendCapture::Extend => {

682+ node_captured = true;

683+ // We extend the node if

684+ // - the cursor is on the same line as the end of the node OR

685+ // - the line that the cursor is on is more indented than the

686+ // first line of the node

687+ if deepest_preceding.end_position().row == line {

688+ extend_node = true;

689+ } else {

690+ let cursor_indent =

691+ indent_level_for_line(text.line(line), tab_width, indent_width);

692+ let node_indent = indent_level_for_line(

693+ text.line(deepest_preceding.start_position().row),

694+ tab_width,

695+ indent_width,

696+ );

697+ if cursor_indent > node_indent {

698+ extend_node = true;

699+ }

700+ }

701+ }

702+ }

703+ }

704+ }

705+ // If we encountered some `StopExtend` capture before, we don't

706+ // extend the node even if we otherwise would

707+ if node_captured && stop_extend {

708+ stop_extend = false;

709+ } else if extend_node && !stop_extend {

710+ *node = deepest_preceding;

711+ break;

712+ }

713+ // If the tree contains a syntax error, `deepest_preceding` may not

714+ // have a parent despite being a descendant of `node`.

715+ deepest_preceding = match deepest_preceding.parent() {

716+ Some(parent) => parent,

717+ None => return,

718+ }

719+ }

720+}

721+

722+/// Prepare an indent query by computing:

723+/// - The node from which to start the query (this is non-trivial due to `@extend` captures)

724+/// - The indent captures for all relevant nodes.

725+#[allow(clippy::too_many_arguments)]

726+fn init_indent_query<'a, 'b>(

727+ query: &Query,

728+ syntax: &'a Syntax,

729+ text: RopeSlice<'b>,

730+ tab_width: usize,

731+ indent_width: usize,

732+ line: usize,

733+ byte_pos: usize,

734+ new_line_byte_pos: Option<usize>,

735+) -> Option<(Node<'a>, HashMap<usize, Vec<IndentCapture<'b>>>)> {

736+ // The innermost tree-sitter node which is considered for the indent

737+ // computation. It may change if some predeceding node is extended

738+ let mut node = syntax

739+ .tree()

740+ .root_node()

741+ .descendant_for_byte_range(byte_pos, byte_pos)?;

742+

743+ let (query_result, deepest_preceding) = {

744+ // The query range should intersect with all nodes directly preceding

745+ // the position of the indent query in case one of them is extended.

746+ let mut deepest_preceding = None; // The deepest node preceding the indent query position

747+ let mut tree_cursor = node.walk();

748+ for child in node.children(&mut tree_cursor) {

749+ if child.byte_range().end <= byte_pos {

750+ deepest_preceding = Some(child);

751+ }

421752 }

753+ deepest_preceding = deepest_preceding.map(|mut prec| {

754+ // Get the deepest directly preceding node

755+ while prec.child_count() > 0 {

756+ prec = prec.child(prec.child_count() - 1).unwrap();

757+ }

758+ prec

759+ });

760+ let query_range = deepest_preceding

761+ .map(|prec| prec.byte_range().end - 1..byte_pos + 1)

762+ .unwrap_or(byte_pos..byte_pos + 1);

763+

764+ crate::syntax::PARSER.with(|ts_parser| {

765+ let mut ts_parser = ts_parser.borrow_mut();

766+ let mut cursor = ts_parser.cursors.pop().unwrap_or_else(QueryCursor::new);

767+ let query_result = query_indents(

768+ query,

769+ syntax,

770+ &mut cursor,

771+ text,

772+ query_range,

773+ new_line_byte_pos,

774+ );

775+ ts_parser.cursors.push(cursor);

776+ (query_result, deepest_preceding)

777+ })

778+ };

779+ let extend_captures = query_result.extend_captures;

780+

781+ // Check for extend captures, potentially changing the node that the indent calculation starts with

782+ if let Some(deepest_preceding) = deepest_preceding {

783+ extend_nodes(

784+ &mut node,

785+ deepest_preceding,

786+ &extend_captures,

787+ text,

788+ line,

789+ tab_width,

790+ indent_width,

791+ );

422792 }

423− indent_captures

793+ Some((node, query_result.indent_captures))

424794}

425795

426796/// Use the syntax tree to determine the indentation for a given position.

@@ -433,7 +803,7 @@ fn query_indents(

433803/// after pos were moved to a new line.

434804///

435805/// The indentation is determined by traversing all the tree-sitter nodes containing the position.

436−/// Each of these nodes produces some [AddedIndent] for:

806+/// Each of these nodes produces some [Indentation] for:

437807///

438808/// - The line of the (beginning of the) node. This is defined by the scope `all` if this is the first node on its line.

439809/// - The line after the node. This is defined by:

@@ -441,9 +811,9 @@ fn query_indents(

441811/// - The scope `all` if this node is not the first node on its line.

442812/// Intuitively, `all` applies to everything contained in this node while `tail` applies to everything except for the first line of the node.

443813/// The indents from different nodes for the same line are then combined.

444−/// The [IndentResult] is simply the sum of the [AddedIndent] for all lines.

814+/// The result [Indentation] is simply the sum of the [Indentation] for all lines.

445815///

446−/// Specifying which line exactly an [AddedIndent] applies to is important because indents on the same line combine differently than indents on different lines:

816+/// Specifying which line exactly an [Indentation] applies to is important because indents on the same line combine differently than indents on different lines:

447817/// ```ignore

448818/// some_function(|| {

449819/// // Both the function parameters as well as the contained block should be indented.

@@ -453,58 +823,52 @@ fn query_indents(

453823///

454824/// ```ignore

455825/// some_function(

456−/// parm1,

826+/// param1,

457827/// || {

458828/// // Here we get 2 indent levels because the 'parameters' and the 'block' node begin on different lines

459829/// },

460830/// );

461831/// ```

462−pub fn treesitter_indent_for_pos(

832+#[allow(clippy::too_many_arguments)]

833+pub fn treesitter_indent_for_pos<'a>(

463834 query: &Query,

464835 syntax: &Syntax,

465− indent_style: &IndentStyle,

466− text: RopeSlice,

836+ tab_width: usize,

837+ indent_width: usize,

838+ text: RopeSlice<'a>,

467839 line: usize,

468840 pos: usize,

469841 new_line: bool,

470−) -> Option<String> {

842+) -> Option<Indentation<'a>> {

471843 let byte_pos = text.char_to_byte(pos);

472− let mut node = syntax

473− .tree()

474− .root_node()

475− .descendant_for_byte_range(byte_pos, byte_pos)?;

476− let mut first_in_line = get_first_in_line(node, byte_pos, new_line);

477− let new_line_break = if new_line {

478− Some((line, byte_pos))

479− } else {

480− None

481− };

482− let query_result = crate::syntax::PARSER.with(|ts_parser| {

483− let mut ts_parser = ts_parser.borrow_mut();

484− let mut cursor = ts_parser.cursors.pop().unwrap_or_else(QueryCursor::new);

485− let query_result = query_indents(

486− query,

487− syntax,

488− &mut cursor,

489− text,

490− byte_pos..byte_pos + 1,

491− new_line_break,

492− );

493− ts_parser.cursors.push(cursor);

494− query_result

495− });

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));

496856

497857 let mut result = Indentation::default();

498858 // We always keep track of all the indent changes on one line, in order to only indent once

499859 // even if there are multiple "indent" nodes on the same line

500860 let mut indent_for_line = Indentation::default();

501861 let mut indent_for_line_below = Indentation::default();

862+

502863 loop {

503864 // This can safely be unwrapped because `first_in_line` contains

504865 // one entry for each ancestor of the node (which is what we iterate over)

505866 let is_first = *first_in_line.last().unwrap();

506− // Apply all indent definitions for this node

507− if let Some(definitions) = query_result.get(&node.id()) {

867+

868+ // Apply all indent definitions for this node.

869+ // Since we only iterate over each node once, we can remove the

870+ // corresponding captures from the HashMap to avoid cloning them.

871+ if let Some(definitions) = indent_captures.remove(&node.id()) {

508872 for definition in definitions {

509873 match definition.scope {

510874 IndentScope::All => {

@@ -522,40 +886,40 @@ pub fn treesitter_indent_for_pos(

522886 }

523887

524888 if let Some(parent) = node.parent() {

525− let mut node_line = node.start_position().row;

526− let mut parent_line = parent.start_position().row;

527− if node_line == line && new_line {

528− // Also consider the line that will be inserted

529− if node.start_byte() >= byte_pos {

530− node_line += 1;

531− }

532− if parent.start_byte() >= byte_pos {

533− parent_line += 1;

534− }

535− };

889+ let node_line = get_node_start_line(node, new_line_byte_pos);

890+ let parent_line = get_node_start_line(parent, new_line_byte_pos);

891+

536892 if node_line != parent_line {

893+ // Don't add indent for the line below the line of the query

537894 if node_line < line + (new_line as usize) {

538− // Don't add indent for the line below the line of the query

539− result.add_line(&indent_for_line_below);

895+ result.add_line(indent_for_line_below);

540896 }

897+

541898 if node_line == parent_line + 1 {

542899 indent_for_line_below = indent_for_line;

543900 } else {

544− result.add_line(&indent_for_line);

901+ result.add_line(indent_for_line);

545902 indent_for_line_below = Indentation::default();

546903 }

904+

547905 indent_for_line = Indentation::default();

548906 }

549907

550908 node = parent;

551909 first_in_line.pop();

552910 } else {

553− result.add_line(&indent_for_line_below);

554− result.add_line(&indent_for_line);

911+ // Only add the indentation for the line below if that line

912+ // is not after the line that the indentation is calculated for.

913+ if (node.start_position().row < line)

914+ || (new_line && node.start_position().row == line && node.start_byte() < byte_pos)

915+ {

916+ result.add_line(indent_for_line_below);

917+ }

918+ result.add_line(indent_for_line);

555919 break;

556920 }

557921 }

558− Some(result.as_string(indent_style))

922+ Some(result)

559923}

560924

561925/// Returns the indentation for a new line.

@@ -564,6 +928,7 @@ pub fn treesitter_indent_for_pos(

564928pub fn indent_for_newline(

565929 language_config: Option<&LanguageConfiguration>,

566930 syntax: Option<&Syntax>,

931+ indent_heuristic: &IndentationHeuristic,

567932 indent_style: &IndentStyle,

568933 tab_width: usize,

569934 text: RopeSlice,

@@ -571,23 +936,78 @@ pub fn indent_for_newline(

571936 line_before_end_pos: usize,

572937 current_line: usize,

573938) -> String {

574− if let (Some(query), Some(syntax)) = (

939+ let indent_width = indent_style.indent_width(tab_width);

940+ if let (

941+ IndentationHeuristic::TreeSitter | IndentationHeuristic::Hybrid,

942+ Some(query),

943+ Some(syntax),

944+ ) = (

945+ indent_heuristic,

575946 language_config.and_then(|config| config.indent_query()),

576947 syntax,

577948 ) {

578949 if let Some(indent) = treesitter_indent_for_pos(

579950 query,

580951 syntax,

581− indent_style,

952+ tab_width,

953+ indent_width,

582954 text,

583955 line_before,

584956 line_before_end_pos,

585957 true,

586958 ) {

587− return indent;

959+ if *indent_heuristic == IndentationHeuristic::Hybrid {

960+ // We want to compute the indentation not only based on the

961+ // syntax tree but also on the actual indentation of a previous

962+ // line. This makes indentation computation more resilient to

963+ // incomplete queries, incomplete source code & differing indentation

964+ // styles for the same language.

965+ // However, using the indent of a previous line as a baseline may not

966+ // make sense, e.g. if it has a different alignment than the new line.

967+ // In order to prevent edge cases with long running times, we only try

968+ // a constant number of (non-empty) lines.

969+ const MAX_ATTEMPTS: usize = 4;

970+ let mut num_attempts = 0;

971+ for line_idx in (0..=line_before).rev() {

972+ let line = text.line(line_idx);

973+ let first_non_whitespace_char = match find_first_non_whitespace_char(line) {

974+ Some(i) => i,

975+ None => {

976+ continue;

977+ }

978+ };

979+ if let Some(indent) = (|| {

980+ let computed_indent = treesitter_indent_for_pos(

981+ query,

982+ syntax,

983+ tab_width,

984+ indent_width,

985+ text,

986+ line_idx,

987+ text.line_to_char(line_idx) + first_non_whitespace_char,

988+ false,

989+ )?;

990+ let leading_whitespace = line.slice(0..first_non_whitespace_char);

991+ indent.relative_indent(

992+ &computed_indent,

993+ leading_whitespace,

994+ indent_style,

995+ tab_width,

996+ )

997+ })() {

998+ return indent;

999+ }

1000+ num_attempts += 1;

1001+ if num_attempts == MAX_ATTEMPTS {

1002+ break;

1003+ }

1004+ }

1005+ }

1006+ return indent.to_string(indent_style, tab_width);

5881007 };

5891008 }

590− let indent_level = indent_level_for_line(text.line(current_line), tab_width);

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);

5911011 indent_style.as_str().repeat(indent_level)

5921012}

5931013

@@ -624,12 +1044,229 @@ mod test {

6241044 #[test]

6251045 fn test_indent_level() {

6261046 let tab_width = 4;

1047+ let indent_width = 4;

6271048 let line = Rope::from(" fn new"); // 8 spaces

628− assert_eq!(indent_level_for_line(line.slice(..), tab_width), 2);

1049+ assert_eq!(

1050+ indent_level_for_line(line.slice(..), tab_width, indent_width),

1051+ 2

1052+ );

6291053 let line = Rope::from("\t\t\tfn new"); // 3 tabs

630− assert_eq!(indent_level_for_line(line.slice(..), tab_width), 3);

1054+ assert_eq!(

1055+ indent_level_for_line(line.slice(..), tab_width, indent_width),

1056+ 3

1057+ );

6311058 // mixed indentation

6321059 let line = Rope::from("\t \tfn new"); // 1 tab, 4 spaces, tab

633− assert_eq!(indent_level_for_line(line.slice(..), tab_width), 3);

1060+ assert_eq!(

1061+ indent_level_for_line(line.slice(..), tab_width, indent_width),

1062+ 3

1063+ );

1064+ }

1065+

1066+ #[test]

1067+ fn test_large_indent_level() {

1068+ let tab_width = 16;

1069+ let indent_width = 16;

1070+ let line = Rope::from(" fn new"); // 16 spaces

1071+ assert_eq!(

1072+ indent_level_for_line(line.slice(..), tab_width, indent_width),

1073+ 1

1074+ );

1075+ let line = Rope::from(" fn new"); // 32 spaces

1076+ assert_eq!(

1077+ indent_level_for_line(line.slice(..), tab_width, indent_width),

1078+ 2

1079+ );

1080+ }

1081+

1082+ #[test]

1083+ fn add_capture() {

1084+ let indent = || Indentation {

1085+ indent: 1,

1086+ ..Default::default()

1087+ };

1088+ let indent_always = || Indentation {

1089+ indent_always: 1,

1090+ ..Default::default()

1091+ };

1092+ let outdent = || Indentation {

1093+ outdent: 1,

1094+ ..Default::default()

1095+ };

1096+ let outdent_always = || Indentation {

1097+ outdent_always: 1,

1098+ ..Default::default()

1099+ };

1100+

1101+ fn add_capture<'a>(

1102+ mut indent: Indentation<'a>,

1103+ capture: IndentCaptureType<'a>,

1104+ ) -> Indentation<'a> {

1105+ indent.add_capture(capture);

1106+ indent

1107+ }

1108+

1109+ // adding an indent to no indent makes an indent

1110+ assert_eq!(

1111+ indent(),

1112+ add_capture(Indentation::default(), IndentCaptureType::Indent)

1113+ );

1114+ assert_eq!(

1115+ indent_always(),

1116+ add_capture(Indentation::default(), IndentCaptureType::IndentAlways)

1117+ );

1118+ assert_eq!(

1119+ outdent(),

1120+ add_capture(Indentation::default(), IndentCaptureType::Outdent)

1121+ );

1122+ assert_eq!(

1123+ outdent_always(),

1124+ add_capture(Indentation::default(), IndentCaptureType::OutdentAlways)

1125+ );

1126+

1127+ // adding an indent to an already indented has no effect

1128+ assert_eq!(indent(), add_capture(indent(), IndentCaptureType::Indent));

1129+ assert_eq!(

1130+ outdent(),

1131+ add_capture(outdent(), IndentCaptureType::Outdent)

1132+ );

1133+

1134+ // adding an always to a regular makes it always

1135+ assert_eq!(

1136+ indent_always(),

1137+ add_capture(indent(), IndentCaptureType::IndentAlways)

1138+ );

1139+ assert_eq!(

1140+ outdent_always(),

1141+ add_capture(outdent(), IndentCaptureType::OutdentAlways)

1142+ );

1143+

1144+ // adding an always to an always is additive

1145+ assert_eq!(

1146+ Indentation {

1147+ indent_always: 2,

1148+ ..Default::default()

1149+ },

1150+ add_capture(indent_always(), IndentCaptureType::IndentAlways)

1151+ );

1152+ assert_eq!(

1153+ Indentation {

1154+ outdent_always: 2,

1155+ ..Default::default()

1156+ },

1157+ add_capture(outdent_always(), IndentCaptureType::OutdentAlways)

1158+ );

1159+

1160+ // adding regular to always should be associative

1161+ assert_eq!(

1162+ Indentation {

1163+ indent_always: 1,

1164+ ..Default::default()

1165+ },

1166+ add_capture(

1167+ add_capture(indent(), IndentCaptureType::Indent),

1168+ IndentCaptureType::IndentAlways

1169+ )

1170+ );

1171+ assert_eq!(

1172+ Indentation {

1173+ indent_always: 1,

1174+ ..Default::default()

1175+ },

1176+ add_capture(

1177+ add_capture(indent(), IndentCaptureType::IndentAlways),

1178+ IndentCaptureType::Indent

1179+ )

1180+ );

1181+ assert_eq!(

1182+ Indentation {

1183+ outdent_always: 1,

1184+ ..Default::default()

1185+ },

1186+ add_capture(

1187+ add_capture(outdent(), IndentCaptureType::Outdent),

1188+ IndentCaptureType::OutdentAlways

1189+ )

1190+ );

1191+ assert_eq!(

1192+ Indentation {

1193+ outdent_always: 1,

1194+ ..Default::default()

1195+ },

1196+ add_capture(

1197+ add_capture(outdent(), IndentCaptureType::OutdentAlways),

1198+ IndentCaptureType::Outdent

1199+ )

1200+ );

1201+ }

1202+

1203+ #[test]

1204+ fn test_relative_indent() {

1205+ let indent_style = IndentStyle::Spaces(4);

1206+ let tab_width: usize = 4;

1207+ let no_align = [

1208+ Indentation::default(),

1209+ Indentation {

1210+ indent: 1,

1211+ ..Default::default()

1212+ },

1213+ Indentation {

1214+ indent: 5,

1215+ outdent: 1,

1216+ ..Default::default()

1217+ },

1218+ ];

1219+ let align = no_align.clone().map(|indent| Indentation {

1220+ align: Some(RopeSlice::from("12345")),

1221+ ..indent

1222+ });

1223+ let different_align = Indentation {

1224+ align: Some(RopeSlice::from("123456")),

1225+ ..Default::default()

1226+ };

1227+

1228+ // Check that relative and absolute indentation computation are the same when the line we compare to is

1229+ // indented as we expect.

1230+ let check_consistency = |indent: &Indentation, other: &Indentation| {

1231+ assert_eq!(

1232+ indent.relative_indent(

1233+ other,

1234+ RopeSlice::from(other.to_string(&indent_style, tab_width).as_str()),

1235+ &indent_style,

1236+ tab_width

1237+ ),

1238+ Some(indent.to_string(&indent_style, tab_width))

1239+ );

1240+ };

1241+ for a in &no_align {

1242+ for b in &no_align {

1243+ check_consistency(a, b);

1244+ }

1245+ }

1246+ for a in &align {

1247+ for b in &align {

1248+ check_consistency(a, b);

1249+ }

1250+ }

1251+

1252+ // Relative indent computation makes no sense if the alignment differs

1253+ assert_eq!(

1254+ align[0].relative_indent(

1255+ &no_align[0],

1256+ RopeSlice::from(" "),

1257+ &indent_style,

1258+ tab_width

1259+ ),

1260+ None

1261+ );

1262+ assert_eq!(

1263+ align[0].relative_indent(

1264+ &different_align,

1265+ RopeSlice::from(" "),

1266+ &indent_style,

1267+ tab_width

1268+ ),

1269+ None

1270+ );

6341271 }

6351272}

helix-core/src/lib.rs+18−52

@@ -6,6 +6,8 @@ pub mod comment;

66pub mod config;

77pub mod diagnostic;

88pub mod diff;

9+pub mod doc_formatter;

10+pub mod fuzzy;

911pub mod graphemes;

1012pub mod history;

1113pub mod increment;

@@ -17,16 +19,16 @@ pub mod movement;

1719pub mod object;

1820pub mod path;

1921mod position;

20−pub mod register;

2122pub mod search;

2223pub mod selection;

2324pub mod shellwords;

24−mod state;

2525pub mod surround;

2626pub mod syntax;

2727pub mod test;

28+pub mod text_annotations;

2829pub mod textobject;

2930mod transaction;

31+pub mod wrap;

3032

3133pub mod unicode {

3234 pub use unicode_general_category as category;

@@ -34,56 +36,15 @@ pub mod unicode {

3436 pub use unicode_width as width;

3537}

3638

39+pub use helix_loader::find_workspace;

40+

3741pub fn find_first_non_whitespace_char(line: RopeSlice) -> Option<usize> {

3842 line.chars().position(|ch| !ch.is_whitespace())

3943}

44+mod rope_reader;

4045

41−/// Find project root.

42−///

43−/// Order of detection:

44−/// * Top-most folder containing a root marker in current git repository

45−/// * Git repostory root if no marker detected

46−/// * Top-most folder containing a root marker if not git repository detected

47−/// * Current working directory as fallback

48−pub fn find_root(root: Option<&str>, root_markers: &[String]) -> Option<std::path::PathBuf> {

49− let current_dir = std::env::current_dir().expect("unable to determine current directory");

50−

51− let root = match root {

52− Some(root) => {

53− let root = std::path::Path::new(root);

54− if root.is_absolute() {

55− root.to_path_buf()

56− } else {

57− current_dir.join(root)

58− }

59− }

60− None => current_dir.clone(),

61− };

62−

63− let mut top_marker = None;

64− for ancestor in root.ancestors() {

65− for marker in root_markers {

66− if ancestor.join(marker).exists() {

67− top_marker = Some(ancestor);

68− break;

69− }

70− }

71− // don't go higher than repo

72− if ancestor.join(".git").is_dir() {

73− // Use workspace if detected from marker

74− return Some(top_marker.unwrap_or(ancestor).to_path_buf());

75− }

76− }

77−

78− // In absence of git repo, use workspace if detected

79− if top_marker.is_some() {

80− top_marker.map(|a| a.to_path_buf())

81− } else {

82− Some(current_dir)

83− }

84−}

85−

86−pub use ropey::{Rope, RopeBuilder, RopeSlice};

46+pub use rope_reader::RopeReader;

47+pub use ropey::{self, str_utils, Rope, RopeBuilder, RopeSlice};

8748

8849// pub use tendril::StrTendril as Tendril;

8950pub use smartstring::SmartString;

@@ -94,13 +55,18 @@ pub type Tendril = SmartString<smartstring::LazyCompact>;

9455pub use {regex, tree_sitter};

9556

9657pub use graphemes::RopeGraphemes;

97−pub use position::{coords_at_pos, pos_at_coords, visual_coords_at_pos, Position};

58+pub use position::{

59+ char_idx_at_visual_offset, coords_at_pos, pos_at_coords, visual_offset_from_anchor,

60+ visual_offset_from_block, Position, VisualOffsetError,

61+};

62+#[allow(deprecated)]

63+pub use position::{pos_at_visual_coords, visual_coords_at_pos};

64+

9865pub use selection::{Range, Selection};

9966pub use smallvec::{smallvec, SmallVec};

10067pub use syntax::Syntax;

10168

10269pub use diagnostic::Diagnostic;

103−pub use state::State;

10470

105−pub use line_ending::{LineEnding, DEFAULT_LINE_ENDING};

106−pub use transaction::{Assoc, Change, ChangeSet, Operation, Transaction};

71+pub use line_ending::{LineEnding, NATIVE_LINE_ENDING};

72+pub use transaction::{Assoc, Change, ChangeSet, Deletion, Operation, Transaction};

helix-core/src/line_ending.rs+22−6

@@ -1,12 +1,12 @@

11use crate::{Rope, RopeSlice};

33#[cfg(target_os = "windows")]

4−pub const DEFAULT_LINE_ENDING: LineEnding = LineEnding::Crlf;

4+pub const NATIVE_LINE_ENDING: LineEnding = LineEnding::Crlf;

55#[cfg(not(target_os = "windows"))]

6−pub const DEFAULT_LINE_ENDING: LineEnding = LineEnding::LF;

6+pub const NATIVE_LINE_ENDING: LineEnding = LineEnding::LF;

88/// Represents one of the valid Unicode line endings.

9−#[derive(PartialEq, Copy, Clone, Debug)]

9+#[derive(PartialEq, Eq, Copy, Clone, Debug)]

1010pub enum LineEnding {

1111 Crlf, // CarriageReturn followed by LineFeed

1212 LF, // U+000A -- LineFeed

@@ -203,6 +203,13 @@ pub fn line_end_char_index(slice: &RopeSlice, line: usize) -> usize {

203203 .unwrap_or(0)

204204}

205205

206+pub fn line_end_byte_index(slice: &RopeSlice, line: usize) -> usize {

207+ slice.line_to_byte(line + 1)

208+ - get_line_ending(&slice.line(line))

209+ .map(|le| le.as_str().len())

210+ .unwrap_or(0)

211+}

212+

206213/// Fetches line `line_idx` from the passed rope slice, sans any line ending.

207214pub fn line_without_line_ending<'a>(slice: &'a RopeSlice, line_idx: usize) -> RopeSlice<'a> {

208215 let start = slice.line_to_char(line_idx);

@@ -305,8 +312,17 @@ mod line_ending_tests {

305312 fn line_end_char_index_rope_slice() {

306313 let r = Rope::from_str("Hello\rworld\nhow\r\nare you?");

307314 let s = &r.slice(..);

308− assert_eq!(line_end_char_index(s, 0), 11);

309− assert_eq!(line_end_char_index(s, 1), 15);

310− assert_eq!(line_end_char_index(s, 2), 25);

315+ #[cfg(not(feature = "unicode-lines"))]

316+ {

317+ assert_eq!(line_end_char_index(s, 0), 11);

318+ assert_eq!(line_end_char_index(s, 1), 15);

319+ assert_eq!(line_end_char_index(s, 2), 25);

320+ }

321+ #[cfg(feature = "unicode-lines")]

322+ {

323+ assert_eq!(line_end_char_index(s, 0), 5);

324+ assert_eq!(line_end_char_index(s, 1), 11);

325+ assert_eq!(line_end_char_index(s, 2), 15);

326+ }

311327 }

312328}

helix-core/src/match_brackets.rs+232−29

@@ -1,7 +1,15 @@

1+use std::iter;

3+use ropey::RopeSlice;

14use tree_sitter::Node;

3−use crate::{Rope, Syntax};

6+use crate::movement::Direction::{self, Backward, Forward};

7+use crate::Syntax;

9+const MAX_PLAINTEXT_SCAN: usize = 10000;

10+const MATCH_LIMIT: usize = 16;

411

12+// Limit matching pairs to only ( ) { } [ ] < > ' ' " "

513const PAIRS: &[(char, char)] = &[

614 ('(', ')'),

715 ('{', '}'),

@@ -11,17 +19,17 @@ const PAIRS: &[(char, char)] = &[

1119 ('\"', '\"'),

1220];

1321

14−// limit matching pairs to only ( ) { } [ ] < > ' ' " "

15−

16−// Returns the position of the matching bracket under cursor.

17−//

18−// If the cursor is one the opening bracket, the position of

19−// the closing bracket is returned. If the cursor in the closing

20−// bracket, the position of the opening bracket is returned.

21−//

22−// If the cursor is not on a bracket, `None` is returned.

22+/// Returns the position of the matching bracket under cursor.

23+///

24+/// If the cursor is on the opening bracket, the position of

25+/// the closing bracket is returned. If the cursor on the closing

26+/// bracket, the position of the opening bracket is returned.

27+///

28+/// If the cursor is not on a bracket, `None` is returned.

29+///

30+/// If no matching bracket is found, `None` is returned.

2331#[must_use]

24−pub fn find_matching_bracket(syntax: &Syntax, doc: &Rope, pos: usize) -> Option<usize> {

32+pub fn find_matching_bracket(syntax: &Syntax, doc: RopeSlice, pos: usize) -> Option<usize> {

2533 if pos >= doc.len_chars() || !is_valid_bracket(doc.char(pos)) {

2634 return None;

2735 }

@@ -39,46 +47,159 @@ pub fn find_matching_bracket(syntax: &Syntax, doc: &Rope, pos: usize) -> Option<

3947//

4048// If no surrounding scope is found, the function returns `None`.

4149#[must_use]

42−pub fn find_matching_bracket_fuzzy(syntax: &Syntax, doc: &Rope, pos: usize) -> Option<usize> {

50+pub fn find_matching_bracket_fuzzy(syntax: &Syntax, doc: RopeSlice, pos: usize) -> Option<usize> {

4351 find_pair(syntax, doc, pos, true)

4452}

4553

46−fn find_pair(syntax: &Syntax, doc: &Rope, pos: usize, traverse_parents: bool) -> Option<usize> {

54+fn find_pair(

55+ syntax: &Syntax,

56+ doc: RopeSlice,

57+ pos_: usize,

58+ traverse_parents: bool,

59+) -> Option<usize> {

4760 let tree = syntax.tree();

48− let pos = doc.char_to_byte(pos);

61+ let pos = doc.char_to_byte(pos_);

4962

50− let mut node = tree.root_node().named_descendant_for_byte_range(pos, pos)?;

63+ let mut node = tree.root_node().descendant_for_byte_range(pos, pos)?;

5164

5265 loop {

53− let (start_byte, end_byte) = surrounding_bytes(doc, &node)?;

54− let (start_char, end_char) = (doc.byte_to_char(start_byte), doc.byte_to_char(end_byte));

66+ if node.is_named() {

67+ let (start_byte, end_byte) = surrounding_bytes(doc, &node)?;

68+ let (start_char, end_char) = (doc.byte_to_char(start_byte), doc.byte_to_char(end_byte));

69+

70+ if is_valid_pair(doc, start_char, end_char) {

71+ if end_byte == pos {

72+ return Some(start_char);

73+ }

5574

56− if is_valid_pair(doc, start_char, end_char) {

57− if end_byte == pos {

58− return Some(start_char);

75+ // We return the end char if the cursor is either on the start char

76+ // or at some arbitrary position between start and end char.

77+ if traverse_parents || start_byte == pos {

78+ return Some(end_char);

79+ }

5980 }

60− // We return the end char if the cursor is either on the start char

61− // or at some arbitrary position between start and end char.

62− return Some(end_char);

6381 }

82+ // this node itselt wasn't a pair but maybe its siblings are

6483

65− if traverse_parents {

66− node = node.parent()?;

67− } else {

68− return None;

84+ // check if we are *on* the pair (special cased so we don't look

85+ // at the current node twice and to jump to the start on that case)

86+ if let Some(open) = as_close_pair(doc, &node) {

87+ if let Some(pair_start) = find_pair_end(doc, node.prev_sibling(), open, Backward) {

88+ return Some(pair_start);

89+ }

6990 }

91+

92+ if !traverse_parents {

93+ // check if we are *on* the opening pair (special cased here as

94+ // an opptimization since we only care about bracket on the cursor

95+ // here)

96+ if let Some(close) = as_open_pair(doc, &node) {

97+ if let Some(pair_end) = find_pair_end(doc, node.next_sibling(), close, Forward) {

98+ return Some(pair_end);

99+ }

100+ }

101+ if node.is_named() {

102+ break;

103+ }

104+ }

105+

106+ for close in

107+ iter::successors(node.next_sibling(), |node| node.next_sibling()).take(MATCH_LIMIT)

108+ {

109+ let Some(open) = as_close_pair(doc, &close) else {

110+ continue;

111+ };

112+ if find_pair_end(doc, Some(node), open, Backward).is_some() {

113+ return doc.try_byte_to_char(close.start_byte()).ok();

114+ }

115+ }

116+ let Some(parent) = node.parent() else {

117+ break;

118+ };

119+ node = parent;

120+ }

121+ let node = tree.root_node().named_descendant_for_byte_range(pos, pos)?;

122+ if node.child_count() != 0 {

123+ return None;

70124 }

125+ let node_start = doc.byte_to_char(node.start_byte());

126+ find_matching_bracket_plaintext(doc.byte_slice(node.byte_range()), pos_ - node_start)

127+ .map(|pos| pos + node_start)

128+}

129+

130+/// Returns the position of the matching bracket under cursor.

131+/// This function works on plain text and ignores tree-sitter grammar.

132+/// The search is limited to `MAX_PLAINTEXT_SCAN` characters

133+///

134+/// If the cursor is on the opening bracket, the position of

135+/// the closing bracket is returned. If the cursor on the closing

136+/// bracket, the position of the opening bracket is returned.

137+///

138+/// If the cursor is not on a bracket, `None` is returned.

139+///

140+/// If no matching bracket is found, `None` is returned.

141+#[must_use]

142+pub fn find_matching_bracket_plaintext(doc: RopeSlice, cursor_pos: usize) -> Option<usize> {

143+ // Don't do anything when the cursor is not on top of a bracket.

144+ let bracket = doc.char(cursor_pos);

145+ if !is_valid_bracket(bracket) {

146+ return None;

147+ }

148+

149+ // Determine the direction of the matching.

150+ let is_fwd = is_forward_bracket(bracket);

151+ let chars_iter = if is_fwd {

152+ doc.chars_at(cursor_pos + 1)

153+ } else {

154+ doc.chars_at(cursor_pos).reversed()

155+ };

156+

157+ let mut open_cnt = 1;

158+

159+ for (i, candidate) in chars_iter.take(MAX_PLAINTEXT_SCAN).enumerate() {

160+ if candidate == bracket {

161+ open_cnt += 1;

162+ } else if is_valid_pair(

163+ doc,

164+ if is_fwd {

165+ cursor_pos

166+ } else {

167+ cursor_pos - i - 1

168+ },

169+ if is_fwd {

170+ cursor_pos + i + 1

171+ } else {

172+ cursor_pos

173+ },

174+ ) {

175+ // Return when all pending brackets have been closed.

176+ if open_cnt == 1 {

177+ return Some(if is_fwd {

178+ cursor_pos + i + 1

179+ } else {

180+ cursor_pos - i - 1

181+ });

182+ }

183+ open_cnt -= 1;

184+ }

185+ }

186+

187+ None

71188}

72189

73190fn is_valid_bracket(c: char) -> bool {

74191 PAIRS.iter().any(|(l, r)| *l == c || *r == c)

75192}

76193

77−fn is_valid_pair(doc: &Rope, start_char: usize, end_char: usize) -> bool {

194+fn is_forward_bracket(c: char) -> bool {

195+ PAIRS.iter().any(|(l, _)| *l == c)

196+}

197+

198+fn is_valid_pair(doc: RopeSlice, start_char: usize, end_char: usize) -> bool {

78199 PAIRS.contains(&(doc.char(start_char), doc.char(end_char)))

79200}

80201

81−fn surrounding_bytes(doc: &Rope, node: &Node) -> Option<(usize, usize)> {

202+fn surrounding_bytes(doc: RopeSlice, node: &Node) -> Option<(usize, usize)> {

82203 let len = doc.len_bytes();

83204

84205 let start_byte = node.start_byte();

@@ -90,3 +211,85 @@ fn surrounding_bytes(doc: &Rope, node: &Node) -> Option<(usize, usize)> {

90211

91212 Some((start_byte, end_byte))

92213}

214+

215+/// Tests if this node is a pair close char and returns the expected open char

216+fn as_close_pair(doc: RopeSlice, node: &Node) -> Option<char> {

217+ let close = as_char(doc, node)?.1;

218+ PAIRS

219+ .iter()

220+ .find_map(|&(open, close_)| (close_ == close).then_some(open))

221+}

222+

223+/// Checks if `node` or its siblings (at most MATCH_LIMIT nodes) is the specified closing char

224+///

225+/// # Returns

226+///

227+/// The position of the found node or `None` otherwise

228+fn find_pair_end(

229+ doc: RopeSlice,

230+ node: Option<Node>,

231+ end_char: char,

232+ direction: Direction,

233+) -> Option<usize> {

234+ let advance = match direction {

235+ Forward => Node::next_sibling,

236+ Backward => Node::prev_sibling,

237+ };

238+ iter::successors(node, advance)

239+ .take(MATCH_LIMIT)

240+ .find_map(|node| {

241+ let (pos, c) = as_char(doc, &node)?;

242+ (end_char == c).then_some(pos)

243+ })

244+}

245+

246+/// Tests if this node is a pair close char and returns the expected open char

247+fn as_open_pair(doc: RopeSlice, node: &Node) -> Option<char> {

248+ let open = as_char(doc, node)?.1;

249+ PAIRS

250+ .iter()

251+ .find_map(|&(open_, close)| (open_ == open).then_some(close))

252+}

253+

254+/// If node is a single char return it (and its char position)

255+fn as_char(doc: RopeSlice, node: &Node) -> Option<(usize, char)> {

256+ // TODO: multi char/non ASCII pairs

257+ if node.byte_range().len() != 1 {

258+ return None;

259+ }

260+ let pos = doc.try_byte_to_char(node.start_byte()).ok()?;

261+ Some((pos, doc.char(pos)))

262+}

263+

264+#[cfg(test)]

265+mod tests {

266+ use super::*;

267+

268+ #[test]

269+ fn test_find_matching_bracket_current_line_plaintext() {

270+ let assert = |input: &str, pos, expected| {

271+ let input = RopeSlice::from(input);

272+ let actual = find_matching_bracket_plaintext(input, pos);

273+ assert_eq!(expected, actual.unwrap());

274+

275+ let actual = find_matching_bracket_plaintext(input, expected);

276+ assert_eq!(pos, actual.unwrap(), "expected symmetrical behaviour");

277+ };

278+

279+ assert("(hello)", 0, 6);

280+ assert("((hello))", 0, 8);

281+ assert("((hello))", 1, 7);

282+ assert("(((hello)))", 2, 8);

283+

284+ assert("key: ${value}", 6, 12);

285+ assert("key: ${value} # (some comment)", 16, 29);

286+

287+ assert("(paren (paren {bracket}))", 0, 24);

288+ assert("(paren (paren {bracket}))", 7, 23);

289+ assert("(paren (paren {bracket}))", 14, 22);

290+

291+ assert("(prev line\n ) (middle) ( \n next line)", 0, 12);

292+ assert("(prev line\n ) (middle) ( \n next line)", 14, 21);

293+ assert("(prev line\n ) (middle) ( \n next line)", 23, 36);

294+ }

295+}

helix-core/src/movement.rs+413−51

@@ -1,20 +1,22 @@

1−use std::iter;

1+use std::{cmp::Reverse, iter};

33use ropey::iter::Chars;

44use tree_sitter::{Node, QueryCursor};

66use crate::{

7+ char_idx_at_visual_offset,

78 chars::{categorize_char, char_is_line_ending, CharCategory},

8− coords_at_pos,

9+ doc_formatter::TextFormat,

910 graphemes::{

1011 next_grapheme_boundary, nth_next_grapheme_boundary, nth_prev_grapheme_boundary,

1112 prev_grapheme_boundary,

1213 },

1314 line_ending::rope_is_line_ending,

14− pos_at_coords,

15+ position::char_idx_at_visual_block_offset,

1516 syntax::LanguageConfiguration,

17+ text_annotations::TextAnnotations,

1618 textobject::TextObject,

17− Position, Range, RopeSlice,

19+ visual_offset_from_block, Range, RopeSlice, Selection, Syntax,

1820};

1921

2022#[derive(Debug, Copy, Clone, PartialEq, Eq)]

@@ -35,6 +37,8 @@ pub fn move_horizontally(

3537 dir: Direction,

3638 count: usize,

3739 behaviour: Movement,

40+ _: &TextFormat,

41+ _: &mut TextAnnotations,

3842) -> Range {

3943 let pos = range.cursor(slice);

4044

@@ -48,38 +52,116 @@ pub fn move_horizontally(

4852 range.put_cursor(slice, new_pos, behaviour == Movement::Extend)

4953}

5054

55+pub fn move_vertically_visual(

56+ slice: RopeSlice,

57+ range: Range,

58+ dir: Direction,

59+ count: usize,

60+ behaviour: Movement,

61+ text_fmt: &TextFormat,

62+ annotations: &mut TextAnnotations,

63+) -> Range {

64+ if !text_fmt.soft_wrap {

65+ return move_vertically(slice, range, dir, count, behaviour, text_fmt, annotations);

66+ }

67+ annotations.clear_line_annotations();

68+ let pos = range.cursor(slice);

69+

70+ // Compute the current position's 2d coordinates.

71+ let (visual_pos, block_off) = visual_offset_from_block(slice, pos, pos, text_fmt, annotations);

72+ let new_col = range

73+ .old_visual_position

74+ .map_or(visual_pos.col as u32, |(_, col)| col);

75+

76+ // Compute the new position.

77+ let mut row_off = match dir {

78+ Direction::Forward => count as isize,

79+ Direction::Backward => -(count as isize),

80+ };

81+

82+ // TODO how to handle inline annotations that span an entire visual line (very unlikely).

83+

84+ // Compute visual offset relative to block start to avoid trasversing the block twice

85+ row_off += visual_pos.row as isize;

86+ let new_pos = char_idx_at_visual_offset(

87+ slice,

88+ block_off,

89+ row_off,

90+ new_col as usize,

91+ text_fmt,

92+ annotations,

93+ )

94+ .0;

95+

96+ // Special-case to avoid moving to the end of the last non-empty line.

97+ if behaviour == Movement::Extend && slice.line(slice.char_to_line(new_pos)).len_chars() == 0 {

98+ return range;

99+ }

100+

101+ let mut new_range = range.put_cursor(slice, new_pos, behaviour == Movement::Extend);

102+ new_range.old_visual_position = Some((0, new_col));

103+ new_range

104+}

105+

51106pub fn move_vertically(

52107 slice: RopeSlice,

53108 range: Range,

54109 dir: Direction,

55110 count: usize,

56111 behaviour: Movement,

112+ text_fmt: &TextFormat,

113+ annotations: &mut TextAnnotations,

57114) -> Range {

115+ annotations.clear_line_annotations();

58116 let pos = range.cursor(slice);

117+ let line_idx = slice.char_to_line(pos);

118+ let line_start = slice.line_to_char(line_idx);

59119

60120 // Compute the current position's 2d coordinates.

61− // TODO: switch this to use `visual_coords_at_pos` rather than

62− // `coords_at_pos` as this will cause a jerky movement when the visual

63− // position does not match, like moving from a line with tabs/CJK to

64− // a line without

65− let Position { row, col } = coords_at_pos(slice, pos);

66− let horiz = range.horiz.unwrap_or(col as u32);

121+ let visual_pos = visual_offset_from_block(slice, line_start, pos, text_fmt, annotations).0;

122+ let (mut new_row, new_col) = range

123+ .old_visual_position

124+ .map_or((visual_pos.row as u32, visual_pos.col as u32), |pos| pos);

125+ new_row = new_row.max(visual_pos.row as u32);

126+ let line_idx = slice.char_to_line(pos);

67127

68128 // Compute the new position.

69− let new_row = match dir {

70− Direction::Forward => (row + count).min(slice.len_lines().saturating_sub(1)),

71− Direction::Backward => row.saturating_sub(count),

129+ let mut new_line_idx = match dir {

130+ Direction::Forward => line_idx.saturating_add(count),

131+ Direction::Backward => line_idx.saturating_sub(count),

132+ };

133+

134+ let line = if new_line_idx >= slice.len_lines() - 1 {

135+ // there is no line terminator for the last line

136+ // so the logic below is not necessary here

137+ new_line_idx = slice.len_lines() - 1;

138+ slice

139+ } else {

140+ // char_idx_at_visual_block_offset returns a one-past-the-end index

141+ // in case it reaches the end of the slice

142+ // to avoid moving to the nextline in that case the line terminator is removed from the line

143+ let new_line_end = prev_grapheme_boundary(slice, slice.line_to_char(new_line_idx + 1));

144+ slice.slice(..new_line_end)

72145 };

73− let new_col = col.max(horiz as usize);

74− let new_pos = pos_at_coords(slice, Position::new(new_row, new_col), true);

146+

147+ let new_line_start = line.line_to_char(new_line_idx);

148+

149+ let (new_pos, _) = char_idx_at_visual_block_offset(

150+ line,

151+ new_line_start,

152+ new_row as usize,

153+ new_col as usize,

154+ text_fmt,

155+ annotations,

156+ );

75157

76158 // Special-case to avoid moving to the end of the last non-empty line.

77− if behaviour == Movement::Extend && slice.line(new_row).len_chars() == 0 {

159+ if behaviour == Movement::Extend && slice.line(new_line_idx).len_chars() == 0 {

78160 return range;

79161 }

80162

81163 let mut new_range = range.put_cursor(slice, new_pos, behaviour == Movement::Extend);

82− new_range.horiz = Some(horiz);

164+ new_range.old_visual_position = Some((new_row, new_col));

83165 new_range

84166}

85167

@@ -95,6 +177,10 @@ pub fn move_prev_word_start(slice: RopeSlice, range: Range, count: usize) -> Ran

95177 word_move(slice, range, count, WordMotionTarget::PrevWordStart)

96178}

97179

180+pub fn move_prev_word_end(slice: RopeSlice, range: Range, count: usize) -> Range {

181+ word_move(slice, range, count, WordMotionTarget::PrevWordEnd)

182+}

183+

98184pub fn move_next_long_word_start(slice: RopeSlice, range: Range, count: usize) -> Range {

99185 word_move(slice, range, count, WordMotionTarget::NextLongWordStart)

100186}

@@ -107,8 +193,8 @@ pub fn move_prev_long_word_start(slice: RopeSlice, range: Range, count: usize) -

107193 word_move(slice, range, count, WordMotionTarget::PrevLongWordStart)

108194}

109195

110−pub fn move_prev_word_end(slice: RopeSlice, range: Range, count: usize) -> Range {

111− word_move(slice, range, count, WordMotionTarget::PrevWordEnd)

196+pub fn move_prev_long_word_end(slice: RopeSlice, range: Range, count: usize) -> Range {

197+ word_move(slice, range, count, WordMotionTarget::PrevLongWordEnd)

112198}

113199

114200fn word_move(slice: RopeSlice, range: Range, count: usize, target: WordMotionTarget) -> Range {

@@ -117,6 +203,7 @@ fn word_move(slice: RopeSlice, range: Range, count: usize, target: WordMotionTar

117203 WordMotionTarget::PrevWordStart

118204 | WordMotionTarget::PrevLongWordStart

119205 | WordMotionTarget::PrevWordEnd

206+ | WordMotionTarget::PrevLongWordEnd

120207 );

121208

122209 // Special-case early-out.

@@ -145,9 +232,15 @@ fn word_move(slice: RopeSlice, range: Range, count: usize, target: WordMotionTar

145232 };

146233

147234 // Do the main work.

148− (0..count).fold(start_range, |r, _| {

149− slice.chars_at(r.head).range_to_target(target, r)

150− })

235+ let mut range = start_range;

236+ for _ in 0..count {

237+ let next_range = slice.chars_at(range.head).range_to_target(target, range);

238+ if range == next_range {

239+ break;

240+ }

241+ range = next_range;

242+ }

243+ range

151244}

152245

153246pub fn move_prev_paragraph(

@@ -169,6 +262,7 @@ pub fn move_prev_paragraph(

169262 let mut lines = slice.lines_at(line);

170263 lines.reverse();

171264 let mut lines = lines.map(rope_is_line_ending).peekable();

265+ let mut last_line = line;

172266 for _ in 0..count {

173267 while lines.next_if(|&e| e).is_some() {

174268 line -= 1;

@@ -176,6 +270,10 @@ pub fn move_prev_paragraph(

176270 while lines.next_if(|&e| !e).is_some() {

177271 line -= 1;

178272 }

273+ if line == last_line {

274+ break;

275+ }

276+ last_line = line;

179277 }

180278

181279 let head = slice.line_to_char(line);

@@ -211,6 +309,7 @@ pub fn move_next_paragraph(

211309 line += 1;

212310 }

213311 let mut lines = slice.lines_at(line).map(rope_is_line_ending).peekable();

312+ let mut last_line = line;

214313 for _ in 0..count {

215314 while lines.next_if(|&e| !e).is_some() {

216315 line += 1;

@@ -218,6 +317,10 @@ pub fn move_next_paragraph(

218317 while lines.next_if(|&e| e).is_some() {

219318 line += 1;

220319 }

320+ if line == last_line {

321+ break;

322+ }

323+ last_line = line;

221324 }

222325 let head = slice.line_to_char(line);

223326 let anchor = if behavior == Movement::Move {

@@ -273,12 +376,13 @@ pub enum WordMotionTarget {

273376 NextWordEnd,

274377 PrevWordStart,

275378 PrevWordEnd,

276− // A "Long word" (also known as a WORD in vim/kakoune) is strictly

379+ // A "Long word" (also known as a WORD in Vim/Kakoune) is strictly

277380 // delimited by whitespace, and can consist of punctuation as well

278381 // as alphanumerics.

279382 NextLongWordStart,

280383 NextLongWordEnd,

281384 PrevLongWordStart,

385+ PrevLongWordEnd,

282386}

283387

284388pub trait CharHelpers {

@@ -295,6 +399,7 @@ impl CharHelpers for Chars<'_> {

295399 WordMotionTarget::PrevWordStart

296400 | WordMotionTarget::PrevLongWordStart

297401 | WordMotionTarget::PrevWordEnd

402+ | WordMotionTarget::PrevLongWordEnd

298403 );

299404

300405 // Reverse the iterator if needed for the motion direction.

@@ -381,7 +486,7 @@ fn reached_target(target: WordMotionTarget, prev_ch: char, next_ch: char) -> boo

381486 is_word_boundary(prev_ch, next_ch)

382487 && (!prev_ch.is_whitespace() || char_is_line_ending(next_ch))

383488 }

384− WordMotionTarget::NextLongWordStart => {

489+ WordMotionTarget::NextLongWordStart | WordMotionTarget::PrevLongWordEnd => {

385490 is_long_word_boundary(prev_ch, next_ch)

386491 && (char_is_line_ending(next_ch) || !next_ch.is_whitespace())

387492 }

@@ -392,6 +497,8 @@ fn reached_target(target: WordMotionTarget, prev_ch: char, next_ch: char) -> boo

392497 }

393498}

394499

500+/// Finds the range of the next or previous textobject in the syntax sub-tree of `node`.

501+/// Returns the range in the forwards direction.

395502pub fn goto_treesitter_object(

396503 slice: RopeSlice,

397504 range: Range,

@@ -399,9 +506,9 @@ pub fn goto_treesitter_object(

399506 dir: Direction,

400507 slice_tree: Node,

401508 lang_config: &LanguageConfiguration,

402− _count: usize,

509+ count: usize,

403510) -> Range {

404− let get_range = move || -> Option<Range> {

511+ let get_range = move |range: Range| -> Option<Range> {

405512 let byte_pos = slice.char_to_byte(range.cursor(slice));

406513

407514 let cap_name = |t: TextObject| format!("{}.{}", object_name, t);

@@ -420,10 +527,10 @@ pub fn goto_treesitter_object(

420527 let node = match dir {

421528 Direction::Forward => nodes

422529 .filter(|n| n.start_byte() > byte_pos)

423− .min_by_key(|n| n.start_byte())?,

530+ .min_by_key(|n| (n.start_byte(), Reverse(n.end_byte())))?,

424531 Direction::Backward => nodes

425− .filter(|n| n.start_byte() < byte_pos)

426− .max_by_key(|n| n.start_byte())?,

532+ .filter(|n| n.end_byte() < byte_pos)

533+ .max_by_key(|n| (n.end_byte(), Reverse(n.start_byte())))?,

427534 };

428535

429536 let len = slice.len_bytes();

@@ -437,15 +544,103 @@ pub fn goto_treesitter_object(

437544 let end_char = slice.byte_to_char(end_byte);

438545

439546 // head of range should be at beginning

440− Some(Range::new(end_char, start_char))

547+ Some(Range::new(start_char, end_char))

441548 };

442− get_range().unwrap_or(range)

549+ let mut last_range = range;

550+ for _ in 0..count {

551+ match get_range(last_range) {

552+ Some(r) if r != last_range => last_range = r,

553+ _ => break,

554+ }

555+ }

556+ last_range

557+}

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+ })

443636}

444637

445638#[cfg(test)]

446639mod test {

447640 use ropey::Rope;

448641

642+ use crate::{coords_at_pos, pos_at_coords};

643+

449644 use super::*;

450645

451646 const SINGLE_LINE_SAMPLE: &str = "This is a simple alphabetic line";

@@ -472,7 +667,16 @@ mod test {

472667 assert_eq!(

473668 coords_at_pos(

474669 slice,

475− move_vertically(slice, range, Direction::Forward, 1, Movement::Move).head

670+ move_vertically_visual(

671+ slice,

672+ range,

673+ Direction::Forward,

674+ 1,

675+ Movement::Move,

676+ &TextFormat::default(),

677+ &mut TextAnnotations::default(),

678+ )

679+ .head

476680 ),

477681 (1, 3).into()

478682 );

@@ -496,7 +700,15 @@ mod test {

496700 ];

497701

498702 for ((direction, amount), coordinates) in moves_and_expected_coordinates {

499− range = move_horizontally(slice, range, direction, amount, Movement::Move);

703+ range = move_horizontally(

704+ slice,

705+ range,

706+ direction,

707+ amount,

708+ Movement::Move,

709+ &TextFormat::default(),

710+ &mut TextAnnotations::default(),

711+ );

500712 assert_eq!(coords_at_pos(slice, range.head), coordinates.into())

501713 }

502714 }

@@ -522,7 +734,15 @@ mod test {

522734 ];

523735

524736 for ((direction, amount), coordinates) in moves_and_expected_coordinates {

525− range = move_horizontally(slice, range, direction, amount, Movement::Move);

737+ range = move_horizontally(

738+ slice,

739+ range,

740+ direction,

741+ amount,

742+ Movement::Move,

743+ &TextFormat::default(),

744+ &mut TextAnnotations::default(),

745+ );

526746 assert_eq!(coords_at_pos(slice, range.head), coordinates.into());

527747 assert_eq!(range.head, range.anchor);

528748 }

@@ -544,7 +764,15 @@ mod test {

544764 ];

545765

546766 for (direction, amount) in moves {

547− range = move_horizontally(slice, range, direction, amount, Movement::Extend);

767+ range = move_horizontally(

768+ slice,

769+ range,

770+ direction,

771+ amount,

772+ Movement::Extend,

773+ &TextFormat::default(),

774+ &mut TextAnnotations::default(),

775+ );

548776 assert_eq!(range.anchor, original_anchor);

549777 }

550778 }

@@ -568,7 +796,15 @@ mod test {

568796 ];

569797

570798 for ((direction, amount), coordinates) in moves_and_expected_coordinates {

571− range = move_vertically(slice, range, direction, amount, Movement::Move);

799+ range = move_vertically_visual(

800+ slice,

801+ range,

802+ direction,

803+ amount,

804+ Movement::Move,

805+ &TextFormat::default(),

806+ &mut TextAnnotations::default(),

807+ );

572808 assert_eq!(coords_at_pos(slice, range.head), coordinates.into());

573809 assert_eq!(range.head, range.anchor);

574810 }

@@ -602,8 +838,24 @@ mod test {

602838

603839 for ((axis, direction, amount), coordinates) in moves_and_expected_coordinates {

604840 range = match axis {

605− Axis::H => move_horizontally(slice, range, direction, amount, Movement::Move),

606− Axis::V => move_vertically(slice, range, direction, amount, Movement::Move),

841+ Axis::H => move_horizontally(

842+ slice,

843+ range,

844+ direction,

845+ amount,

846+ Movement::Move,

847+ &TextFormat::default(),

848+ &mut TextAnnotations::default(),

849+ ),

850+ Axis::V => move_vertically_visual(

851+ slice,

852+ range,

853+ direction,

854+ amount,

855+ Movement::Move,

856+ &TextFormat::default(),

857+ &mut TextAnnotations::default(),

858+ ),

607859 };

608860 assert_eq!(coords_at_pos(slice, range.head), coordinates.into());

609861 assert_eq!(range.head, range.anchor);

@@ -627,18 +879,34 @@ mod test {

627879 let moves_and_expected_coordinates = [

628880 // Places cursor at the fourth kana.

629881 ((Axis::H, Direction::Forward, 4), (0, 4)),

630− // Descent places cursor at the 4th character.

631− ((Axis::V, Direction::Forward, 1usize), (1, 4)),

632− // Moving back 1 character.

633− ((Axis::H, Direction::Backward, 1usize), (1, 3)),

882+ // Descent places cursor at the 8th character.

883+ ((Axis::V, Direction::Forward, 1usize), (1, 8)),

884+ // Moving back 2 characters.

885+ ((Axis::H, Direction::Backward, 2usize), (1, 6)),

634886 // Jumping back up 1 line.

635887 ((Axis::V, Direction::Backward, 1usize), (0, 3)),

636888 ];

637889

638890 for ((axis, direction, amount), coordinates) in moves_and_expected_coordinates {

639891 range = match axis {

640− Axis::H => move_horizontally(slice, range, direction, amount, Movement::Move),

641− Axis::V => move_vertically(slice, range, direction, amount, Movement::Move),

892+ Axis::H => move_horizontally(

893+ slice,

894+ range,

895+ direction,

896+ amount,

897+ Movement::Move,

898+ &TextFormat::default(),

899+ &mut TextAnnotations::default(),

900+ ),

901+ Axis::V => move_vertically_visual(

902+ slice,

903+ range,

904+ direction,

905+ amount,

906+ Movement::Move,

907+ &TextFormat::default(),

908+ &mut TextAnnotations::default(),

909+ ),

642910 };

643911 assert_eq!(coords_at_pos(slice, range.head), coordinates.into());

644912 assert_eq!(range.head, range.anchor);

@@ -1263,6 +1531,100 @@ mod test {

12631531 }

12641532 }

12651533

1534+ #[test]

1535+ fn test_behaviour_when_moving_to_end_of_prev_long_words() {

1536+ let tests = [

1537+ (

1538+ "Basic backward motion from the middle of a word",

1539+ vec![(1, Range::new(3, 3), Range::new(4, 0))],

1540+ ),

1541+ ("Starting from after boundary retreats the anchor",

1542+ vec![(1, Range::new(0, 9), Range::new(8, 0))],

1543+ ),

1544+ (

1545+ "Jump to end of a word succeeded by whitespace",

1546+ vec![(1, Range::new(10, 10), Range::new(10, 4))],

1547+ ),

1548+ (

1549+ " Jump to start of line from end of word preceded by whitespace",

1550+ vec![(1, Range::new(3, 4), Range::new(4, 0))],

1551+ ),

1552+ ("Previous anchor is irrelevant for backward motions",

1553+ vec![(1, Range::new(12, 5), Range::new(6, 0))]),

1554+ (

1555+ " Starting from whitespace moves to first space in sequence",

1556+ vec![(1, Range::new(0, 4), Range::new(4, 0))],

1557+ ),

1558+ ("Identifiers_with_underscores are considered a single word",

1559+ vec![(1, Range::new(0, 20), Range::new(20, 0))]),

1560+ (

1561+ "Jumping\n \nback through a newline selects whitespace",

1562+ vec![(1, Range::new(0, 13), Range::new(12, 8))],

1563+ ),

1564+ (

1565+ "Jumping to start of word from the end selects the word",

1566+ vec![(1, Range::new(6, 7), Range::new(7, 0))],

1567+ ),

1568+ (

1569+ "alphanumeric.!,and.?=punctuation are treated exactly the same",

1570+ vec![(1, Range::new(29, 30), Range::new(30, 0))],

1571+ ),

1572+ (

1573+ "... ... punctuation and spaces behave as expected",

1574+ vec![

1575+ (1, Range::new(0, 10), Range::new(9, 3)),

1576+ (1, Range::new(10, 6), Range::new(7, 3)),

1577+ ],

1578+ ),

1579+ (".._.._ punctuation is joined by underscores into a single block",

1580+ vec![(1, Range::new(0, 6), Range::new(6, 0))]),

1581+ (

1582+ "Newlines\n\nare bridged seamlessly.",

1583+ vec![(1, Range::new(0, 10), Range::new(8, 0))],

1584+ ),

1585+ (

1586+ "Jumping \n\n\n\n\nback from within a newline group selects previous block",

1587+ vec![(1, Range::new(0, 13), Range::new(11, 7))],

1588+ ),

1589+ (

1590+ "Failed motions do not modify the range",

1591+ vec![(0, Range::new(3, 0), Range::new(3, 0))],

1592+ ),

1593+ (

1594+ "Multiple motions at once resolve correctly",

1595+ vec![(3, Range::new(19, 19), Range::new(8, 0))],

1596+ ),

1597+ (

1598+ "Excessive motions are performed partially",

1599+ vec![(999, Range::new(40, 40), Range::new(9, 0))],

1600+ ),

1601+ (

1602+ "", // Edge case of moving backwards in empty string

1603+ vec![(1, Range::new(0, 0), Range::new(0, 0))],

1604+ ),

1605+ (

1606+ "\n\n\n\n\n", // Edge case of moving backwards in all newlines

1607+ vec![(1, Range::new(5, 5), Range::new(0, 0))],

1608+ ),

1609+ (" \n \nJumping back through alternated space blocks and newlines selects the space blocks",

1610+ vec![

1611+ (1, Range::new(0, 8), Range::new(7, 4)),

1612+ (1, Range::new(7, 4), Range::new(3, 0)),

1613+ ]),

1614+ ("ヒーリ..クス multibyte characters behave as normal characters, including when interacting with punctuation",

1615+ vec![

1616+ (1, Range::new(0, 8), Range::new(7, 0)),

1617+ ]),

1618+ ];

1619+

1620+ for (sample, scenario) in tests {

1621+ for (count, begin, expected_end) in scenario.into_iter() {

1622+ let range = move_prev_long_word_end(Rope::from(sample).slice(..), begin, count);

1623+ assert_eq!(range, expected_end, "Case failed: [{}]", sample);

1624+ }

1625+ }

1626+ }

1627+

12661628 #[test]

12671629 fn test_behaviour_when_moving_to_prev_paragraph_single() {

12681630 let tests = [

@@ -1292,7 +1654,7 @@ mod test {

12921654 let text = Rope::from(s.as_str());

12931655 let selection =

12941656 selection.transform(|r| move_prev_paragraph(text.slice(..), r, 1, Movement::Move));

1295− let actual = crate::test::plain(&s, selection);

1657+ let actual = crate::test::plain(s.as_ref(), &selection);

12961658 assert_eq!(actual, expected, "\nbefore: `{:?}`", before);

12971659 }

12981660 }

@@ -1315,7 +1677,7 @@ mod test {

13151677 let text = Rope::from(s.as_str());

13161678 let selection =

13171679 selection.transform(|r| move_prev_paragraph(text.slice(..), r, 2, Movement::Move));

1318− let actual = crate::test::plain(&s, selection);

1680+ let actual = crate::test::plain(s.as_ref(), &selection);

13191681 assert_eq!(actual, expected, "\nbefore: `{:?}`", before);

13201682 }

13211683 }

@@ -1338,7 +1700,7 @@ mod test {

13381700 let text = Rope::from(s.as_str());

13391701 let selection = selection

13401702 .transform(|r| move_prev_paragraph(text.slice(..), r, 1, Movement::Extend));

1341− let actual = crate::test::plain(&s, selection);

1703+ let actual = crate::test::plain(s.as_ref(), &selection);

13421704 assert_eq!(actual, expected, "\nbefore: `{:?}`", before);

13431705 }

13441706 }

@@ -1358,7 +1720,7 @@ mod test {

13581720 "a\nb\n\n#[goto\nthird\n\n|]#paragraph",

13591721 ),

13601722 (

1361− "a\nb#[\n|]#\ngoto\nsecond\n\nparagraph",

1723+ "a\nb#[\n|]#\n\ngoto\nsecond\n\nparagraph",

13621724 "a\nb#[\n\n|]#goto\nsecond\n\nparagraph",

13631725 ),

13641726 (

@@ -1380,7 +1742,7 @@ mod test {

13801742 let text = Rope::from(s.as_str());

13811743 let selection =

13821744 selection.transform(|r| move_next_paragraph(text.slice(..), r, 1, Movement::Move));

1383− let actual = crate::test::plain(&s, selection);

1745+ let actual = crate::test::plain(s.as_ref(), &selection);

13841746 assert_eq!(actual, expected, "\nbefore: `{:?}`", before);

13851747 }

13861748 }

@@ -1403,7 +1765,7 @@ mod test {

14031765 let text = Rope::from(s.as_str());

14041766 let selection =

14051767 selection.transform(|r| move_next_paragraph(text.slice(..), r, 2, Movement::Move));

1406− let actual = crate::test::plain(&s, selection);

1768+ let actual = crate::test::plain(s.as_ref(), &selection);

14071769 assert_eq!(actual, expected, "\nbefore: `{:?}`", before);

14081770 }

14091771 }

@@ -1426,7 +1788,7 @@ mod test {

14261788 let text = Rope::from(s.as_str());

14271789 let selection = selection

14281790 .transform(|r| move_next_paragraph(text.slice(..), r, 1, Movement::Extend));

1429− let actual = crate::test::plain(&s, selection);

1791+ let actual = crate::test::plain(s.as_ref(), &selection);

14301792 assert_eq!(actual, expected, "\nbefore: `{:?}`", before);

14311793 }

14321794 }

helix-core/src/object.rs+4−5

@@ -2,12 +2,11 @@ use crate::{Range, RopeSlice, Selection, Syntax};

22use tree_sitter::Node;

44pub fn expand_selection(syntax: &Syntax, text: RopeSlice, selection: Selection) -> Selection {

5− select_node_impl(syntax, text, selection, |descendant, from, to| {

6− if descendant.start_byte() == from && descendant.end_byte() == to {

7− descendant.parent()

8− } else {

9− Some(descendant)

5+ select_node_impl(syntax, text, selection, |mut node, from, to| {

6+ while node.start_byte() == from && node.end_byte() == to {

7+ node = node.parent()?;

108 }

9+ Some(node)

1110 })

1211}

1312

helix-core/src/path.rs+80−11

@@ -5,16 +5,15 @@ use std::path::{Component, Path, PathBuf};

55/// is available, otherwise returns the path unchanged.

66pub fn fold_home_dir(path: &Path) -> PathBuf {

77 if let Ok(home) = home_dir() {

8− if path.starts_with(&home) {

9− // it's ok to unwrap, the path starts with home dir

10− return PathBuf::from("~").join(path.strip_prefix(&home).unwrap());

8+ if let Ok(stripped) = path.strip_prefix(&home) {

9+ return PathBuf::from("~").join(stripped);

1110 }

1211 }

1312

1413 path.to_path_buf()

1514}

1615

17−/// Expands tilde `~` into users home directory if avilable, otherwise returns the path

16+/// Expands tilde `~` into users home directory if available, otherwise returns the path

1817/// unchanged. The tilde will only be expanded when present as the first component of the path

1918/// and only slash follows it.

2019pub fn expand_tilde(path: &Path) -> PathBuf {

@@ -41,6 +40,21 @@ pub fn expand_tilde(path: &Path) -> PathBuf {

4140/// needs to improve on.

4241/// Copied from cargo: <https://github.com/rust-lang/cargo/blob/070e459c2d8b79c5b2ac5218064e7603329c92ae/crates/cargo-util/src/paths.rs#L81>

4342pub fn get_normalized_path(path: &Path) -> PathBuf {

43+ // normalization strategy is to canonicalize first ancestor path that exists (i.e., canonicalize as much as possible),

44+ // then run handrolled normalization on the non-existent remainder

45+ let (base, path) = path

46+ .ancestors()

47+ .find_map(|base| {

48+ let canonicalized_base = dunce::canonicalize(base).ok()?;

49+ let remainder = path.strip_prefix(base).ok()?.into();

50+ Some((canonicalized_base, remainder))

51+ })

52+ .unwrap_or_else(|| (PathBuf::new(), PathBuf::from(path)));

53+

54+ if path.as_os_str().is_empty() {

55+ return base;

56+ }

57+

4458 let mut components = path.components().peekable();

4559 let mut ret = if let Some(c @ Component::Prefix(..)) = components.peek().cloned() {

4660 components.next();

@@ -64,30 +78,85 @@ pub fn get_normalized_path(path: &Path) -> PathBuf {

6478 }

6579 }

6680 }

67− ret

81+ base.join(ret)

6882}

6983

7084/// Returns the canonical, absolute form of a path with all intermediate components normalized.

7185///

7286/// This function is used instead of `std::fs::canonicalize` because we don't want to verify

7387/// here if the path exists, just normalize it's components.

74−pub fn get_canonicalized_path(path: &Path) -> std::io::Result<PathBuf> {

88+pub fn get_canonicalized_path(path: &Path) -> PathBuf {

7589 let path = expand_tilde(path);

7690 let path = if path.is_relative() {

77− std::env::current_dir().map(|current_dir| current_dir.join(path))?

91+ helix_loader::current_working_dir().join(path)

7892 } else {

7993 path

8094 };

8195

82− Ok(get_normalized_path(path.as_path()))

96+ get_normalized_path(path.as_path())

8397}

8498

8599pub fn get_relative_path(path: &Path) -> PathBuf {

100+ let path = PathBuf::from(path);

86101 let path = if path.is_absolute() {

87− let cwdir = std::env::current_dir().expect("couldn't determine current directory");

88− path.strip_prefix(cwdir).unwrap_or(path)

102+ let cwdir = get_normalized_path(&helix_loader::current_working_dir());

103+ get_normalized_path(&path)

104+ .strip_prefix(cwdir)

105+ .map(PathBuf::from)

106+ .unwrap_or(path)

89107 } else {

90108 path

91109 };

92− fold_home_dir(path)

110+ fold_home_dir(&path)

111+}

112+

113+/// Returns a truncated filepath where the basepart of the path is reduced to the first

114+/// char of the folder and the whole filename appended.

115+///

116+/// Also strip the current working directory from the beginning of the path.

117+/// Note that this function does not check if the truncated path is unambiguous.

118+///

119+/// ```

120+/// use helix_core::path::get_truncated_path;

121+/// use std::path::Path;

122+///

123+/// assert_eq!(

124+/// get_truncated_path("/home/cnorris/documents/jokes.txt").as_path(),

125+/// Path::new("/h/c/d/jokes.txt")

126+/// );

127+/// assert_eq!(

128+/// get_truncated_path("jokes.txt").as_path(),

129+/// Path::new("jokes.txt")

130+/// );

131+/// assert_eq!(

132+/// get_truncated_path("/jokes.txt").as_path(),

133+/// Path::new("/jokes.txt")

134+/// );

135+/// assert_eq!(

136+/// get_truncated_path("/h/c/d/jokes.txt").as_path(),

137+/// Path::new("/h/c/d/jokes.txt")

138+/// );

139+/// assert_eq!(get_truncated_path("").as_path(), Path::new(""));

140+/// ```

141+///

142+pub fn get_truncated_path<P: AsRef<Path>>(path: P) -> PathBuf {

143+ let cwd = helix_loader::current_working_dir();

144+ let path = path

145+ .as_ref()

146+ .strip_prefix(cwd)

147+ .unwrap_or_else(|_| path.as_ref());

148+ let file = path.file_name().unwrap_or_default();

149+ let base = path.parent().unwrap_or_else(|| Path::new(""));

150+ let mut ret = PathBuf::new();

151+ for d in base {

152+ ret.push(

153+ d.to_string_lossy()

154+ .chars()

155+ .next()

156+ .unwrap_or_default()

157+ .to_string(),

158+ );

159+ }

160+ ret.push(file);

161+ ret

93162}

helix-core/src/position.rs+555−4

@@ -1,9 +1,11 @@

1−use std::borrow::Cow;

1+use std::{borrow::Cow, cmp::Ordering};

33use crate::{

44 chars::char_is_line_ending,

5+ doc_formatter::{DocumentFormatter, TextFormat},

56 graphemes::{ensure_grapheme_boundary_prev, grapheme_width, RopeGraphemes},

67 line_ending::line_end_char_index,

8+ text_annotations::TextAnnotations,

79 RopeSlice,

810};

911

@@ -73,6 +75,13 @@ pub fn coords_at_pos(text: RopeSlice, pos: usize) -> Position {

7375/// Takes \t, double-width characters (CJK) into account as well as text

7476/// not in the document in the future.

7577/// See [`coords_at_pos`] for an "objective" one.

78+///

79+/// This function should be used very rarely. Usually `visual_offset_from_anchor`

80+/// or `visual_offset_from_block` is preferable. However when you want to compute the

81+/// actual visual row/column in the text (not what is actually shown on screen)

82+/// then you should use this function. For example aligning text should ignore virtual

83+/// text and softwrap.

84+#[deprecated = "Doesn't account for softwrap or decorations, use visual_offset_from_anchor instead"]

7685pub fn visual_coords_at_pos(text: RopeSlice, pos: usize, tab_width: usize) -> Position {

7786 let line = text.char_to_line(pos);

7887

@@ -93,6 +102,106 @@ pub fn visual_coords_at_pos(text: RopeSlice, pos: usize, tab_width: usize) -> Po

93102 Position::new(line, col)

94103}

95104

105+/// Returns the visual offset from the start of the first visual line

106+/// in the block that contains anchor.

107+/// Text is always wrapped at blocks, they usually correspond to

108+/// actual line breaks but for very long lines

109+/// softwrapping positions are estimated with an O(1) algorithm

110+/// to ensure consistent performance for large lines (currently unimplemented)

111+///

112+/// Usually you want to use `visual_offset_from_anchor` instead but this function

113+/// can be useful (and faster) if

114+/// * You already know the visual position of the block

115+/// * You only care about the horizontal offset (column) and not the vertical offset (row)

116+pub fn visual_offset_from_block(

117+ text: RopeSlice,

118+ anchor: usize,

119+ pos: usize,

120+ text_fmt: &TextFormat,

121+ annotations: &TextAnnotations,

122+) -> (Position, usize) {

123+ let mut last_pos = Position::default();

124+ let (formatter, block_start) =

125+ DocumentFormatter::new_at_prev_checkpoint(text, text_fmt, annotations, anchor);

126+ let mut char_pos = block_start;

127+

128+ for (grapheme, vpos) in formatter {

129+ last_pos = vpos;

130+ char_pos += grapheme.doc_chars();

131+

132+ if char_pos > pos {

133+ return (last_pos, block_start);

134+ }

135+ }

136+

137+ (last_pos, block_start)

138+}

139+

140+#[derive(Debug, PartialEq, Eq, Clone, Copy)]

141+pub enum VisualOffsetError {

142+ PosBeforeAnchorRow,

143+ PosAfterMaxRow,

144+}

145+

146+/// Returns the visual offset from the start of the visual line

147+/// that contains anchor.

148+pub fn visual_offset_from_anchor(

149+ text: RopeSlice,

150+ anchor: usize,

151+ pos: usize,

152+ text_fmt: &TextFormat,

153+ annotations: &TextAnnotations,

154+ max_rows: usize,

155+) -> Result<(Position, usize), VisualOffsetError> {

156+ let (formatter, block_start) =

157+ DocumentFormatter::new_at_prev_checkpoint(text, text_fmt, annotations, anchor);

158+ let mut char_pos = block_start;

159+ let mut anchor_line = None;

160+ let mut found_pos = None;

161+ let mut last_pos = Position::default();

162+

163+ if pos < block_start {

164+ return Err(VisualOffsetError::PosBeforeAnchorRow);

165+ }

166+

167+ for (grapheme, vpos) in formatter {

168+ last_pos = vpos;

169+ char_pos += grapheme.doc_chars();

170+

171+ if char_pos > pos {

172+ if let Some(anchor_line) = anchor_line {

173+ last_pos.row -= anchor_line;

174+ return Ok((last_pos, block_start));

175+ } else {

176+ found_pos = Some(last_pos);

177+ }

178+ }

179+ if char_pos > anchor && anchor_line.is_none() {

180+ if let Some(mut found_pos) = found_pos {

181+ return if found_pos.row == last_pos.row {

182+ found_pos.row = 0;

183+ Ok((found_pos, block_start))

184+ } else {

185+ Err(VisualOffsetError::PosBeforeAnchorRow)

186+ };

187+ } else {

188+ anchor_line = Some(last_pos.row);

189+ }

190+ }

191+

192+ if let Some(anchor_line) = anchor_line {

193+ if vpos.row >= anchor_line + max_rows {

194+ return Err(VisualOffsetError::PosAfterMaxRow);

195+ }

196+ }

197+ }

198+

199+ let anchor_line = anchor_line.unwrap_or(last_pos.row);

200+ last_pos.row -= anchor_line;

201+

202+ Ok((last_pos, block_start))

203+}

204+

96205/// Convert (line, column) coordinates to a character index.

97206///

98207/// If the `line` coordinate is beyond the end of the file, the EOF

@@ -109,9 +218,6 @@ pub fn visual_coords_at_pos(text: RopeSlice, pos: usize, tab_width: usize) -> Po

109218/// with left-side block-cursor positions, as this prevents the the block cursor

110219/// from jumping to the next line. Otherwise you typically want it to be `false`,

111220/// such as when dealing with raw anchor/head positions.

112−///

113−/// TODO: this should be changed to work in terms of visual row/column, not

114−/// graphemes.

115221pub fn pos_at_coords(text: RopeSlice, coords: Position, limit_before_line_ending: bool) -> usize {

116222 let Position { mut row, col } = coords;

117223 if limit_before_line_ending {

@@ -135,6 +241,163 @@ pub fn pos_at_coords(text: RopeSlice, coords: Position, limit_before_line_ending

135241 line_start + col_char_offset

136242}

137243

244+/// Convert visual (line, column) coordinates to a character index.

245+///

246+/// If the `line` coordinate is beyond the end of the file, the EOF

247+/// position will be returned.

248+///

249+/// If the `column` coordinate is past the end of the given line, the

250+/// line-end position (in this case, just before the line ending

251+/// character) will be returned.

252+/// This function should be used very rarely. Usually `char_idx_at_visual_offset` is preferable.

253+/// However when you want to compute a char position from the visual row/column in the text

254+/// (not what is actually shown on screen) then you should use this function.

255+/// For example aligning text should ignore virtual text and softwrap.

256+#[deprecated = "Doesn't account for softwrap or decorations, use char_idx_at_visual_offset instead"]

257+pub fn pos_at_visual_coords(text: RopeSlice, coords: Position, tab_width: usize) -> usize {

258+ let Position { mut row, col } = coords;

259+ row = row.min(text.len_lines() - 1);

260+ let line_start = text.line_to_char(row);

261+ let line_end = line_end_char_index(&text, row);

262+

263+ let mut col_char_offset = 0;

264+ let mut cols_remaining = col;

265+ for grapheme in RopeGraphemes::new(text.slice(line_start..line_end)) {

266+ let grapheme_width = if grapheme == "\t" {

267+ tab_width - ((col - cols_remaining) % tab_width)

268+ } else {

269+ let grapheme = Cow::from(grapheme);

270+ grapheme_width(&grapheme)

271+ };

272+

273+ // If pos is in the middle of a wider grapheme (tab for example)

274+ // return the starting offset.

275+ if grapheme_width > cols_remaining {

276+ break;

277+ }

278+

279+ cols_remaining -= grapheme_width;

280+ col_char_offset += grapheme.chars().count();

281+ }

282+

283+ line_start + col_char_offset

284+}

285+

286+/// Returns the char index on the visual line `row_offset` below the visual line of

287+/// the provided char index `anchor` that is closest to the supplied visual `column`.

288+///

289+/// If the targeted visual line is entirely covered by virtual text the last

290+/// char position before the virtual text and a virtual offset is returned instead.

291+///

292+/// If no (text) grapheme starts at exactly at the specified column the

293+/// start of the grapheme to the left is returned. If there is no grapheme

294+/// to the left (for example if the line starts with virtual text) then the positioning

295+/// of the next grapheme to the right is returned.

296+///

297+/// If the `line` coordinate is beyond the end of the file, the EOF

298+/// position will be returned.

299+///

300+/// If the `column` coordinate is past the end of the given line, the

301+/// line-end position (in this case, just before the line ending

302+/// character) will be returned.

303+///

304+/// # Returns

305+///

306+/// `(real_char_idx, virtual_lines)`

307+///

308+/// The nearest character idx "closest" (see above) to the specified visual offset

309+/// on the visual line is returned if the visual line contains any text:

310+/// If the visual line at the specified offset is a virtual line generated by a `LineAnnotation`

311+/// the previous char_index is returned, together with the remaining vertical offset (`virtual_lines`)

312+pub fn char_idx_at_visual_offset(

313+ text: RopeSlice,

314+ mut anchor: usize,

315+ mut row_offset: isize,

316+ column: usize,

317+ text_fmt: &TextFormat,

318+ annotations: &TextAnnotations,

319+) -> (usize, usize) {

320+ let mut pos = anchor;

321+ // convert row relative to visual line containing anchor to row relative to a block containing anchor (anchor may change)

322+ loop {

323+ let (visual_pos_in_block, block_char_offset) =

324+ visual_offset_from_block(text, anchor, pos, text_fmt, annotations);

325+ row_offset += visual_pos_in_block.row as isize;

326+ anchor = block_char_offset;

327+ if row_offset >= 0 {

328+ break;

329+ }

330+

331+ if block_char_offset == 0 {

332+ row_offset = 0;

333+ break;

334+ }

335+ // the row_offset is negative so we need to look at the previous block

336+ // set the anchor to the last char before the current block so that we can compute

337+ // the distance of this block from the start of the previous block

338+ pos = anchor;

339+ anchor -= 1;

340+ }

341+

342+ char_idx_at_visual_block_offset(

343+ text,

344+ anchor,

345+ row_offset as usize,

346+ column,

347+ text_fmt,

348+ annotations,

349+ )

350+}

351+

352+/// This function behaves the same as `char_idx_at_visual_offset`, except that

353+/// the vertical offset `row` is always computed relative to the block that contains `anchor`

354+/// instead of the visual line that contains `anchor`.

355+/// Usually `char_idx_at_visual_offset` is more useful but this function can be

356+/// used in some situations as an optimization when `visual_offset_from_block` was used

357+///

358+/// # Returns

359+///

360+/// `(real_char_idx, virtual_lines)`

361+///

362+/// See `char_idx_at_visual_offset` for details

363+pub fn char_idx_at_visual_block_offset(

364+ text: RopeSlice,

365+ anchor: usize,

366+ row: usize,

367+ column: usize,

368+ text_fmt: &TextFormat,

369+ annotations: &TextAnnotations,

370+) -> (usize, usize) {

371+ let (formatter, mut char_idx) =

372+ DocumentFormatter::new_at_prev_checkpoint(text, text_fmt, annotations, anchor);

373+ let mut last_char_idx = char_idx;

374+ let mut last_char_idx_on_line = None;

375+ let mut last_row = 0;

376+ for (grapheme, grapheme_pos) in formatter {

377+ match grapheme_pos.row.cmp(&row) {

378+ Ordering::Equal => {

379+ if grapheme_pos.col + grapheme.width() > column {

380+ if !grapheme.is_virtual() {

381+ return (char_idx, 0);

382+ } else if let Some(char_idx) = last_char_idx_on_line {

383+ return (char_idx, 0);

384+ }

385+ } else if !grapheme.is_virtual() {

386+ last_char_idx_on_line = Some(char_idx)

387+ }

388+ }

389+ Ordering::Greater => return (last_char_idx, row - last_row),

390+ _ => (),

391+ }

392+

393+ last_char_idx = char_idx;

394+ last_row = grapheme_pos.row;

395+ char_idx += grapheme.doc_chars();

396+ }

397+

398+ (char_idx, 0)

399+}

400+

138401#[cfg(test)]

139402mod test {

140403 use super::*;

@@ -194,6 +457,7 @@ mod test {

194457 }

195458

196459 #[test]

460+ #[allow(deprecated)]

197461 fn test_visual_coords_at_pos() {

198462 let text = Rope::from("ḧëḷḷö\nẅöṛḷḋ");

199463 let slice = text.slice(..);

@@ -241,6 +505,130 @@ mod test {

241505 assert_eq!(visual_coords_at_pos(slice, 2, 8), (0, 9).into());

242506 }

243507

508+ #[test]

509+ fn test_visual_off_from_block() {

510+ let text = Rope::from("ḧëḷḷö\nẅöṛḷḋ");

511+ let slice = text.slice(..);

512+ let annot = TextAnnotations::default();

513+ let text_fmt = TextFormat::default();

514+ assert_eq!(

515+ visual_offset_from_block(slice, 0, 0, &text_fmt, &annot).0,

516+ (0, 0).into()

517+ );

518+ assert_eq!(

519+ visual_offset_from_block(slice, 0, 5, &text_fmt, &annot).0,

520+ (0, 5).into()

521+ ); // position on \n

522+ assert_eq!(

523+ visual_offset_from_block(slice, 0, 6, &text_fmt, &annot).0,

524+ (1, 0).into()

525+ ); // position on w

526+ assert_eq!(

527+ visual_offset_from_block(slice, 0, 7, &text_fmt, &annot).0,

528+ (1, 1).into()

529+ ); // position on o

530+ assert_eq!(

531+ visual_offset_from_block(slice, 0, 10, &text_fmt, &annot).0,

532+ (1, 4).into()

533+ ); // position on d

534+

535+ // Test with wide characters.

536+ let text = Rope::from("今日はいい\n");

537+ let slice = text.slice(..);

538+ assert_eq!(

539+ visual_offset_from_block(slice, 0, 0, &text_fmt, &annot).0,

540+ (0, 0).into()

541+ );

542+ assert_eq!(

543+ visual_offset_from_block(slice, 0, 1, &text_fmt, &annot).0,

544+ (0, 2).into()

545+ );

546+ assert_eq!(

547+ visual_offset_from_block(slice, 0, 2, &text_fmt, &annot).0,

548+ (0, 4).into()

549+ );

550+ assert_eq!(

551+ visual_offset_from_block(slice, 0, 3, &text_fmt, &annot).0,

552+ (0, 6).into()

553+ );

554+ assert_eq!(

555+ visual_offset_from_block(slice, 0, 4, &text_fmt, &annot).0,

556+ (0, 8).into()

557+ );

558+ assert_eq!(

559+ visual_offset_from_block(slice, 0, 5, &text_fmt, &annot).0,

560+ (0, 10).into()

561+ );

562+ assert_eq!(

563+ visual_offset_from_block(slice, 0, 6, &text_fmt, &annot).0,

564+ (1, 0).into()

565+ );

566+

567+ // Test with grapheme clusters.

568+ let text = Rope::from("a̐éö̲\r\n");

569+ let slice = text.slice(..);

570+ assert_eq!(

571+ visual_offset_from_block(slice, 0, 0, &text_fmt, &annot).0,

572+ (0, 0).into()

573+ );

574+ assert_eq!(

575+ visual_offset_from_block(slice, 0, 2, &text_fmt, &annot).0,

576+ (0, 1).into()

577+ );

578+ assert_eq!(

579+ visual_offset_from_block(slice, 0, 4, &text_fmt, &annot).0,

580+ (0, 2).into()

581+ );

582+ assert_eq!(

583+ visual_offset_from_block(slice, 0, 7, &text_fmt, &annot).0,

584+ (0, 3).into()

585+ );

586+ assert_eq!(

587+ visual_offset_from_block(slice, 0, 9, &text_fmt, &annot).0,

588+ (1, 0).into()

589+ );

590+

591+ // Test with wide-character grapheme clusters.

592+ // TODO: account for cluster.

593+ let text = Rope::from("किमपि\n");

594+ let slice = text.slice(..);

595+ assert_eq!(

596+ visual_offset_from_block(slice, 0, 0, &text_fmt, &annot).0,

597+ (0, 0).into()

598+ );

599+ assert_eq!(

600+ visual_offset_from_block(slice, 0, 2, &text_fmt, &annot).0,

601+ (0, 2).into()

602+ );

603+ assert_eq!(

604+ visual_offset_from_block(slice, 0, 3, &text_fmt, &annot).0,

605+ (0, 3).into()

606+ );

607+ assert_eq!(

608+ visual_offset_from_block(slice, 0, 5, &text_fmt, &annot).0,

609+ (0, 5).into()

610+ );

611+ assert_eq!(

612+ visual_offset_from_block(slice, 0, 6, &text_fmt, &annot).0,

613+ (1, 0).into()

614+ );

615+

616+ // Test with tabs.

617+ let text = Rope::from("\tHello\n");

618+ let slice = text.slice(..);

619+ assert_eq!(

620+ visual_offset_from_block(slice, 0, 0, &text_fmt, &annot).0,

621+ (0, 0).into()

622+ );

623+ assert_eq!(

624+ visual_offset_from_block(slice, 0, 1, &text_fmt, &annot).0,

625+ (0, 4).into()

626+ );

627+ assert_eq!(

628+ visual_offset_from_block(slice, 0, 2, &text_fmt, &annot).0,

629+ (0, 5).into()

630+ );

631+ }

244632 #[test]

245633 fn test_pos_at_coords() {

246634 let text = Rope::from("ḧëḷḷö\nẅöṛḷḋ");

@@ -305,4 +693,167 @@ mod test {

305693 assert_eq!(pos_at_coords(slice, (0, 10).into(), true), 0);

306694 assert_eq!(pos_at_coords(slice, (10, 10).into(), true), 0);

307695 }

696+

697+ #[test]

698+ #[allow(deprecated)]

699+ fn test_pos_at_visual_coords() {

700+ let text = Rope::from("ḧëḷḷö\nẅöṛḷḋ");

701+ let slice = text.slice(..);

702+ assert_eq!(pos_at_visual_coords(slice, (0, 0).into(), 4), 0);

703+ assert_eq!(pos_at_visual_coords(slice, (0, 5).into(), 4), 5); // position on \n

704+ assert_eq!(pos_at_visual_coords(slice, (0, 6).into(), 4), 5); // position after \n

705+ assert_eq!(pos_at_visual_coords(slice, (1, 0).into(), 4), 6); // position on w

706+ assert_eq!(pos_at_visual_coords(slice, (1, 1).into(), 4), 7); // position on o

707+ assert_eq!(pos_at_visual_coords(slice, (1, 4).into(), 4), 10); // position on d

708+

709+ // Test with wide characters.

710+ let text = Rope::from("今日はいい\n");

711+ let slice = text.slice(..);

712+ assert_eq!(pos_at_visual_coords(slice, (0, 0).into(), 4), 0);

713+ assert_eq!(pos_at_visual_coords(slice, (0, 1).into(), 4), 0);

714+ assert_eq!(pos_at_visual_coords(slice, (0, 2).into(), 4), 1);

715+ assert_eq!(pos_at_visual_coords(slice, (0, 3).into(), 4), 1);

716+ assert_eq!(pos_at_visual_coords(slice, (0, 4).into(), 4), 2);

717+ assert_eq!(pos_at_visual_coords(slice, (0, 5).into(), 4), 2);

718+ assert_eq!(pos_at_visual_coords(slice, (0, 6).into(), 4), 3);

719+ assert_eq!(pos_at_visual_coords(slice, (0, 7).into(), 4), 3);

720+ assert_eq!(pos_at_visual_coords(slice, (0, 8).into(), 4), 4);

721+ assert_eq!(pos_at_visual_coords(slice, (0, 9).into(), 4), 4);

722+ // assert_eq!(pos_at_visual_coords(slice, (0, 10).into(), 4, false), 5);

723+ // assert_eq!(pos_at_visual_coords(slice, (0, 10).into(), 4, true), 5);

724+ assert_eq!(pos_at_visual_coords(slice, (1, 0).into(), 4), 6);

725+

726+ // Test with grapheme clusters.

727+ let text = Rope::from("a̐éö̲\r\n");

728+ let slice = text.slice(..);

729+ assert_eq!(pos_at_visual_coords(slice, (0, 0).into(), 4), 0);

730+ assert_eq!(pos_at_visual_coords(slice, (0, 1).into(), 4), 2);

731+ assert_eq!(pos_at_visual_coords(slice, (0, 2).into(), 4), 4);

732+ assert_eq!(pos_at_visual_coords(slice, (0, 3).into(), 4), 7); // \r\n is one char here

733+ assert_eq!(pos_at_visual_coords(slice, (0, 4).into(), 4), 7);

734+ assert_eq!(pos_at_visual_coords(slice, (1, 0).into(), 4), 9);

735+

736+ // Test with wide-character grapheme clusters.

737+ let text = Rope::from("किमपि");

738+ // 2 - 1 - 2 codepoints

739+ // TODO: delete handling as per https://news.ycombinator.com/item?id=20058454

740+ let slice = text.slice(..);

741+ assert_eq!(pos_at_visual_coords(slice, (0, 0).into(), 4), 0);

742+ assert_eq!(pos_at_visual_coords(slice, (0, 1).into(), 4), 0);

743+ assert_eq!(pos_at_visual_coords(slice, (0, 2).into(), 4), 2);

744+ assert_eq!(pos_at_visual_coords(slice, (0, 3).into(), 4), 3);

745+

746+ // Test with tabs.

747+ let text = Rope::from("\tHello\n");

748+ let slice = text.slice(..);

749+ assert_eq!(pos_at_visual_coords(slice, (0, 0).into(), 4), 0);

750+ assert_eq!(pos_at_visual_coords(slice, (0, 1).into(), 4), 0);

751+ assert_eq!(pos_at_visual_coords(slice, (0, 2).into(), 4), 0);

752+ assert_eq!(pos_at_visual_coords(slice, (0, 3).into(), 4), 0);

753+ assert_eq!(pos_at_visual_coords(slice, (0, 4).into(), 4), 1);

754+ assert_eq!(pos_at_visual_coords(slice, (0, 5).into(), 4), 2);

755+

756+ // Test out of bounds.

757+ let text = Rope::new();

758+ let slice = text.slice(..);

759+ assert_eq!(pos_at_visual_coords(slice, (10, 0).into(), 4), 0);

760+ assert_eq!(pos_at_visual_coords(slice, (0, 10).into(), 4), 0);

761+ assert_eq!(pos_at_visual_coords(slice, (10, 10).into(), 4), 0);

762+ }

763+

764+ #[test]

765+ fn test_char_idx_at_visual_row_offset() {

766+ let text = Rope::from("ḧëḷḷö\nẅöṛḷḋ\nfoo");

767+ let slice = text.slice(..);

768+ let mut text_fmt = TextFormat::default();

769+ for i in 0isize..3isize {

770+ for j in -2isize..=2isize {

771+ if !(0..3).contains(&(i + j)) {

772+ continue;

773+ }

774+ println!("{i} {j}");

775+ assert_eq!(

776+ char_idx_at_visual_offset(

777+ slice,

778+ slice.line_to_char(i as usize),

779+ j,

780+ 3,

781+ &text_fmt,

782+ &TextAnnotations::default(),

783+ )

784+ .0,

785+ slice.line_to_char((i + j) as usize) + 3

786+ );

787+ }

788+ }

789+

790+ text_fmt.soft_wrap = true;

791+ let mut softwrapped_text = "foo ".repeat(10);

792+ softwrapped_text.push('\n');

793+ let last_char = softwrapped_text.len() - 1;

794+

795+ let text = Rope::from(softwrapped_text.repeat(3));

796+ let slice = text.slice(..);

797+ assert_eq!(

798+ char_idx_at_visual_offset(

799+ slice,

800+ last_char,

801+ 0,

802+ 0,

803+ &text_fmt,

804+ &TextAnnotations::default(),

805+ )

806+ .0,

807+ 32

808+ );

809+ assert_eq!(

810+ char_idx_at_visual_offset(

811+ slice,

812+ last_char,

813+ -1,

814+ 0,

815+ &text_fmt,

816+ &TextAnnotations::default(),

817+ )

818+ .0,

819+ 16

820+ );

821+ assert_eq!(

822+ char_idx_at_visual_offset(

823+ slice,

824+ last_char,

825+ -2,

826+ 0,

827+ &text_fmt,

828+ &TextAnnotations::default(),

829+ )

830+ .0,

831+ 0

832+ );

833+ assert_eq!(

834+ char_idx_at_visual_offset(

835+ slice,

836+ softwrapped_text.len() + last_char,

837+ -2,

838+ 0,

839+ &text_fmt,

840+ &TextAnnotations::default(),

841+ )

842+ .0,

843+ softwrapped_text.len()

844+ );

845+

846+ assert_eq!(

847+ char_idx_at_visual_offset(

848+ slice,

849+ softwrapped_text.len() + last_char,

850+ -5,

851+ 0,

852+ &text_fmt,

853+ &TextAnnotations::default(),

854+ )

855+ .0,

856+ 0

857+ );

858+ }

308859}

helix-core/src/register.rsdeleted−75

@@ -1,75 +0,0 @@

1−use std::collections::HashMap;

2−

3−#[derive(Debug)]

4−pub struct Register {

5− name: char,

6− values: Vec<String>,

7−}

8−

9−impl Register {

10− pub const fn new(name: char) -> Self {

11− Self {

12− name,

13− values: Vec::new(),

14− }

15− }

16−

17− pub fn new_with_values(name: char, values: Vec<String>) -> Self {

18− if name == '_' {

19− Self::new(name)

20− } else {

21− Self { name, values }

22− }

23− }

24−

25− pub const fn name(&self) -> char {

26− self.name

27− }

28−

29− pub fn read(&self) -> &[String] {

30− &self.values

31− }

32−

33− pub fn write(&mut self, values: Vec<String>) {

34− if self.name != '_' {

35− self.values = values;

36− }

37− }

38−

39− pub fn push(&mut self, value: String) {

40− if self.name != '_' {

41− self.values.push(value);

42− }

43− }

44−}

45−

46−/// Currently just wraps a `HashMap` of `Register`s

47−#[derive(Debug, Default)]

48−pub struct Registers {

49− inner: HashMap<char, Register>,

50−}

51−

52−impl Registers {

53− pub fn get(&self, name: char) -> Option<&Register> {

54− self.inner.get(&name)

55− }

56−

57− pub fn get_mut(&mut self, name: char) -> &mut Register {

58− self.inner

59− .entry(name)

60− .or_insert_with(|| Register::new(name))

61− }

62−

63− pub fn write(&mut self, name: char, values: Vec<String>) {

64− self.inner

65− .insert(name, Register::new_with_values(name, values));

66− }

67−

68− pub fn read(&self, name: char) -> Option<&[String]> {

69− self.get(name).map(|reg| reg.read())

70− }

71−

72− pub fn inner(&self) -> &HashMap<char, Register> {

73− &self.inner

74− }

75−}

helix-core/src/rope_reader.rsnew file+37

@@ -0,0 +1,37 @@

1+use std::io;

3+use ropey::iter::Chunks;

4+use ropey::RopeSlice;

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+321−83

@@ -8,7 +8,7 @@ use crate::{

88 prev_grapheme_boundary,

99 },

1010 movement::Direction,

11− Assoc, ChangeSet, RopeSlice,

11+ Assoc, ChangeSet, RopeGraphemes, RopeSlice,

1212};

1313use smallvec::{smallvec, SmallVec};

1414use std::borrow::Cow;

@@ -21,14 +21,14 @@ use std::borrow::Cow;

2121/// can be in any order, or even share the same position.

2222///

2323/// The anchor and head positions use gap indexing, meaning

24−/// that their indices represent the the gaps *between* `char`s

24+/// that their indices represent the gaps *between* `char`s

2525/// rather than the `char`s themselves. For example, 1

2626/// represents the position between the first and second `char`.

2727///

28−/// Below are some example `Range` configurations to better

29−/// illustrate. The anchor and head indices are show as

30−/// "(anchor, head)", followed by example text with "[" and "]"

31−/// inserted to represent the anchor and head positions:

28+/// Below are some examples of `Range` configurations.

29+/// The anchor and head indices are shown as "(anchor, head)"

30+/// tuples, followed by example text with "[" and "]" symbols

31+/// representing the anchor and head positions:

3232///

3333/// - (0, 3): `[Som]e text`.

3434/// - (3, 0): `]Som[e text`.

@@ -38,7 +38,7 @@ use std::borrow::Cow;

3838/// Ranges are considered to be inclusive on the left and

3939/// exclusive on the right, regardless of anchor-head ordering.

4040/// This means, for example, that non-zero-width ranges that

41−/// are directly adjecent, sharing an edge, do not overlap.

41+/// are directly adjacent, sharing an edge, do not overlap.

4242/// However, a zero-width range will overlap with the shared

4343/// left-edge of another range.

4444///

@@ -53,7 +53,9 @@ pub struct Range {

5353 pub anchor: usize,

5454 /// The head of the range, moved when extending.

5555 pub head: usize,

56− pub horiz: Option<u32>,

56+ /// The previous visual offset (softwrapped lines and columns) from

57+ /// the start of the line

58+ pub old_visual_position: Option<(u32, u32)>,

5759}

5860

5961impl Range {

@@ -61,7 +63,7 @@ impl Range {

6163 Self {

6264 anchor,

6365 head,

64− horiz: None,

66+ old_visual_position: None,

6567 }

6668 }

6769

@@ -122,12 +124,22 @@ impl Range {

122124 }

123125 }

124126

125− // flips the direction of the selection

127+ /// Flips the direction of the selection

126128 pub fn flip(&self) -> Self {

127129 Self {

128130 anchor: self.head,

129131 head: self.anchor,

130− horiz: self.horiz,

132+ old_visual_position: self.old_visual_position,

133+ }

134+ }

135+

136+ /// Returns the selection if it goes in the direction of `direction`,

137+ /// flipping the selection otherwise.

138+ pub fn with_direction(self, direction: Direction) -> Self {

139+ if self.direction() == direction {

140+ self

141+ } else {

142+ self.flip()

131143 }

132144 }

133145

@@ -149,34 +161,35 @@ impl Range {

149161 self.from() <= pos && pos < self.to()

150162 }

151163

152− /// Map a range through a set of changes. Returns a new range representing the same position

153− /// after the changes are applied.

154− pub fn map(self, changes: &ChangeSet) -> Self {

164+ /// Map a range through a set of changes. Returns a new range representing

165+ /// the same position after the changes are applied. Note that this

166+ /// function runs in O(N) (N is number of changes) and can therefore

167+ /// cause performance problems if run for a large number of ranges as the

168+ /// complexity is then O(MN) (for multicuror M=N usually). Instead use

169+ /// [Selection::map] or [ChangeSet::update_positions] instead

170+ pub fn map(mut self, changes: &ChangeSet) -> Self {

155171 use std::cmp::Ordering;

156− let (anchor, head) = match self.anchor.cmp(&self.head) {

157− Ordering::Equal => (

158− changes.map_pos(self.anchor, Assoc::After),

159− changes.map_pos(self.head, Assoc::After),

160− ),

161− Ordering::Less => (

162− changes.map_pos(self.anchor, Assoc::After),

163− changes.map_pos(self.head, Assoc::Before),

164− ),

165− Ordering::Greater => (

166− changes.map_pos(self.anchor, Assoc::Before),

167− changes.map_pos(self.head, Assoc::After),

168− ),

169− };

170−

171− // We want to return a new `Range` with `horiz == None` every time,

172− // even if the anchor and head haven't changed, because we don't

173− // know if the *visual* position hasn't changed due to

174− // character-width or grapheme changes earlier in the text.

175− Self {

176− anchor,

177− head,

178− horiz: None,

172+ if changes.is_empty() {

173+ return self;

179174 }

175+

176+ let positions_to_map = match self.anchor.cmp(&self.head) {

177+ Ordering::Equal => [

178+ (&mut self.anchor, Assoc::After),

179+ (&mut self.head, Assoc::After),

180+ ],

181+ Ordering::Less => [

182+ (&mut self.anchor, Assoc::After),

183+ (&mut self.head, Assoc::Before),

184+ ],

185+ Ordering::Greater => [

186+ (&mut self.head, Assoc::After),

187+ (&mut self.anchor, Assoc::Before),

188+ ],

189+ };

190+ changes.update_positions(positions_to_map.into_iter());

191+ self.old_visual_position = None;

192+ self

180193 }

181194

182195 /// Extend the range to cover at least `from` `to`.

@@ -188,13 +201,13 @@ impl Range {

188201 Self {

189202 anchor: self.anchor.min(from),

190203 head: self.head.max(to),

191− horiz: None,

204+ old_visual_position: None,

192205 }

193206 } else {

194207 Self {

195208 anchor: self.anchor.max(to),

196209 head: self.head.min(from),

197− horiz: None,

210+ old_visual_position: None,

198211 }

199212 }

200213 }

@@ -209,22 +222,36 @@ impl Range {

209222 Range {

210223 anchor: self.anchor.max(other.anchor),

211224 head: self.head.min(other.head),

212− horiz: None,

225+ old_visual_position: None,

213226 }

214227 } else {

215228 Range {

216229 anchor: self.from().min(other.from()),

217230 head: self.to().max(other.to()),

218− horiz: None,

231+ old_visual_position: None,

219232 }

220233 }

221234 }

222235

223236 // groupAt

224237

238+ /// Returns the text inside this range given the text of the whole buffer.

239+ ///

240+ /// The returned `Cow` is a reference if the range of text is inside a single

241+ /// chunk of the rope. Otherwise a copy of the text is returned. Consider

242+ /// using `slice` instead if you do not need a `Cow` or `String` to avoid copying.

225243 #[inline]

226244 pub fn fragment<'a, 'b: 'a>(&'a self, text: RopeSlice<'b>) -> Cow<'b, str> {

227− text.slice(self.from()..self.to()).into()

245+ self.slice(text).into()

246+ }

247+

248+ /// Returns the text inside this range given the text of the whole buffer.

249+ ///

250+ /// The returned value is a reference to the passed slice. This method never

251+ /// copies any contents.

252+ #[inline]

253+ pub fn slice<'a, 'b: 'a>(&'a self, text: RopeSlice<'b>) -> RopeSlice<'b> {

254+ text.slice(self.from()..self.to())

228255 }

229256

230257 //--------------------------------

@@ -255,8 +282,8 @@ impl Range {

255282 Range {

256283 anchor: new_anchor,

257284 head: new_head,

258− horiz: if new_anchor == self.anchor {

259− self.horiz

285+ old_visual_position: if new_anchor == self.anchor {

286+ self.old_visual_position

260287 } else {

261288 None

262289 },

@@ -282,7 +309,7 @@ impl Range {

282309 Range {

283310 anchor: self.anchor,

284311 head: next_grapheme_boundary(slice, self.head),

285− horiz: self.horiz,

312+ old_visual_position: self.old_visual_position,

286313 }

287314 } else {

288315 *self

@@ -339,6 +366,14 @@ impl Range {

339366 pub fn cursor_line(&self, text: RopeSlice) -> usize {

340367 text.char_to_line(self.cursor(text))

341368 }

369+

370+ /// Returns true if this Range covers a single grapheme in the given text

371+ pub fn is_single_grapheme(&self, doc: RopeSlice) -> bool {

372+ let mut graphemes = RopeGraphemes::new(doc.slice(self.from()..self.to()));

373+ let first = graphemes.next();

374+ let second = graphemes.next();

375+ first.is_some() && second.is_none()

376+ }

342377}

343378

344379impl From<(usize, usize)> for Range {

@@ -346,7 +381,7 @@ impl From<(usize, usize)> for Range {

346381 Self {

347382 anchor,

348383 head,

349− horiz: None,

384+ old_visual_position: None,

350385 }

351386 }

352387}

@@ -417,17 +452,36 @@ impl Selection {

417452 /// Map selections over a set of changes. Useful for adjusting the selection position after

418453 /// applying changes to a document.

419454 pub fn map(self, changes: &ChangeSet) -> Self {

455+ self.map_no_normalize(changes).normalize()

456+ }

457+

458+ /// Map selections over a set of changes. Useful for adjusting the selection position after

459+ /// applying changes to a document. Doesn't normalize the selection

460+ pub fn map_no_normalize(mut self, changes: &ChangeSet) -> Self {

420461 if changes.is_empty() {

421462 return self;

422463 }

423464

424− Self::new(

425− self.ranges

426− .into_iter()

427− .map(|range| range.map(changes))

428− .collect(),

429− self.primary_index,

430− )

465+ let positions_to_map = self.ranges.iter_mut().flat_map(|range| {

466+ use std::cmp::Ordering;

467+ range.old_visual_position = None;

468+ match range.anchor.cmp(&range.head) {

469+ Ordering::Equal => [

470+ (&mut range.anchor, Assoc::After),

471+ (&mut range.head, Assoc::After),

472+ ],

473+ Ordering::Less => [

474+ (&mut range.anchor, Assoc::After),

475+ (&mut range.head, Assoc::Before),

476+ ],

477+ Ordering::Greater => [

478+ (&mut range.head, Assoc::After),

479+ (&mut range.anchor, Assoc::Before),

480+ ],

481+ }

482+ });

483+ changes.update_positions(positions_to_map);

484+ self

431485 }

432486

433487 pub fn ranges(&self) -> &[Range] {

@@ -450,7 +504,7 @@ impl Selection {

450504 ranges: smallvec![Range {

451505 anchor,

452506 head,

453− horiz: None

507+ old_visual_position: None

454508 }],

455509 primary_index: 0,

456510 }

@@ -463,28 +517,63 @@ impl Selection {

463517

464518 /// Normalizes a `Selection`.

465519 fn normalize(mut self) -> Self {

466− let primary = self.ranges[self.primary_index];

520+ if self.len() < 2 {

521+ return self;

522+ }

523+ let mut primary = self.ranges[self.primary_index];

467524 self.ranges.sort_unstable_by_key(Range::from);

525+

526+ self.ranges.dedup_by(|curr_range, prev_range| {

527+ if prev_range.overlaps(curr_range) {

528+ let new_range = curr_range.merge(*prev_range);

529+ if prev_range == &primary || curr_range == &primary {

530+ primary = new_range;

531+ }

532+ *prev_range = new_range;

533+ true

534+ } else {

535+ false

536+ }

537+ });

538+

468539 self.primary_index = self

469540 .ranges

470541 .iter()

471542 .position(|&range| range == primary)

472543 .unwrap();

473544

474− let mut prev_i = 0;

475− for i in 1..self.ranges.len() {

476− if self.ranges[prev_i].overlaps(&self.ranges[i]) {

477− self.ranges[prev_i] = self.ranges[prev_i].merge(self.ranges[i]);

545+ self

546+ }

547+

548+ /// Replaces ranges with one spanning from first to last range.

549+ pub fn merge_ranges(self) -> Self {

550+ let first = self.ranges.first().unwrap();

551+ let last = self.ranges.last().unwrap();

552+ Selection::new(smallvec![first.merge(*last)], 0)

553+ }

554+

555+ /// Merges all ranges that are consecutive.

556+ pub fn merge_consecutive_ranges(mut self) -> Self {

557+ let mut primary = self.ranges[self.primary_index];

558+

559+ self.ranges.dedup_by(|curr_range, prev_range| {

560+ if prev_range.to() == curr_range.from() {

561+ let new_range = curr_range.merge(*prev_range);

562+ if prev_range == &primary || curr_range == &primary {

563+ primary = new_range;

564+ }

565+ *prev_range = new_range;

566+ true

478567 } else {

479− prev_i += 1;

480− self.ranges[prev_i] = self.ranges[i];

481− }

482− if i == self.primary_index {

483− self.primary_index = prev_i;

568+ false

484569 }

485− }

570+ });

486571

487− self.ranges.truncate(prev_i + 1);

572+ self.primary_index = self

573+ .ranges

574+ .iter()

575+ .position(|&range| range == primary)

576+ .unwrap();

488577

489578 self

490579 }

@@ -495,23 +584,18 @@ impl Selection {

495584 assert!(!ranges.is_empty());

496585 debug_assert!(primary_index < ranges.len());

497586

498− let mut selection = Self {

587+ let selection = Self {

499588 ranges,

500589 primary_index,

501590 };

502591

503− if selection.ranges.len() > 1 {

504− // TODO: only normalize if needed (any ranges out of order)

505− selection = selection.normalize();

506− }

507−

508− selection

592+ selection.normalize()

509593 }

510594

511595 /// Takes a closure and maps each `Range` over the closure.

512− pub fn transform<F>(mut self, f: F) -> Self

596+ pub fn transform<F>(mut self, mut f: F) -> Self

513597 where

514− F: Fn(Range) -> Range,

598+ F: FnMut(Range) -> Range,

515599 {

516600 for range in self.ranges.iter_mut() {

517601 *range = f(*range)

@@ -519,6 +603,16 @@ impl Selection {

519603 self.normalize()

520604 }

521605

606+ /// Takes a closure and maps each `Range` over the closure to multiple `Range`s.

607+ pub fn transform_iter<F, I>(mut self, f: F) -> Self

608+ where

609+ F: FnMut(Range) -> I,

610+ I: Iterator<Item = Range>,

611+ {

612+ self.ranges = self.ranges.into_iter().flat_map(f).collect();

613+ self.normalize()

614+ }

615+

522616 // Ensures the selection adheres to the following invariants:

523617 // 1. All ranges are grapheme aligned.

524618 // 2. All ranges are at least 1 character wide, unless at the

@@ -536,10 +630,22 @@ impl Selection {

536630 self.transform(|range| Range::point(range.cursor(text)))

537631 }

538632

539− pub fn fragments<'a>(&'a self, text: RopeSlice<'a>) -> impl Iterator<Item = Cow<str>> + 'a {

633+ pub fn fragments<'a>(

634+ &'a self,

635+ text: RopeSlice<'a>,

636+ ) -> impl DoubleEndedIterator<Item = Cow<'a, str>> + ExactSizeIterator<Item = Cow<str>> + 'a

637+ {

540638 self.ranges.iter().map(move |range| range.fragment(text))

541639 }

542640

641+ pub fn slices<'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))

647+ }

648+

543649 #[inline(always)]

544650 pub fn iter(&self) -> std::slice::Iter<'_, Range> {

545651 self.ranges.iter()

@@ -552,11 +658,6 @@ impl Selection {

552658

553659 // returns true if self ⊇ other

554660 pub fn contains(&self, other: &Selection) -> bool {

555− // can't contain other if it is larger

556− if other.len() > self.len() {

557− return false;

558− }

559−

560661 let (mut iter_self, mut iter_other) = (self.iter(), other.iter());

561662 let (mut ele_self, mut ele_other) = (iter_self.next(), iter_other.next());

562663

@@ -593,6 +694,15 @@ impl<'a> IntoIterator for &'a Selection {

593694 }

594695}

595696

697+impl IntoIterator for Selection {

698+ type Item = Range;

699+ type IntoIter = smallvec::IntoIter<[Range; 1]>;

700+

701+ fn into_iter(self) -> smallvec::IntoIter<[Range; 1]> {

702+ self.ranges.into_iter()

703+ }

704+}

705+

596706// TODO: checkSelection -> check if valid for doc length && sorted

597707

598708pub fn keep_or_remove_matches(

@@ -633,7 +743,13 @@ pub fn select_on_matches(

633743

634744 let start = text.byte_to_char(start_byte + mat.start());

635745 let end = text.byte_to_char(start_byte + mat.end());

636− result.push(Range::new(start, end));

746+

747+ let range = Range::new(start, end);

748+ // Make sure the match is not right outside of the selection.

749+ // These invalid matches can come from using RegEx anchors like `^`, `$`

750+ if range != Range::point(sel.to()) {

751+ result.push(range);

752+ }

637753 }

638754 }

639755

@@ -830,7 +946,7 @@ mod test {

830946 }

831947

832948 #[test]

833− fn test_graphem_aligned() {

949+ fn test_grapheme_aligned() {

834950 let r = Rope::from_str("\r\nHi\r\n");

835951 let s = r.slice(..);

836952

@@ -903,6 +1019,76 @@ mod test {

9031019 assert_eq!(Range::new(6, 5).min_width_1(s), Range::new(6, 5));

9041020 }

9051021

1022+ #[test]

1023+ fn test_select_on_matches() {

1024+ use crate::regex::{Regex, RegexBuilder};

1025+

1026+ let r = Rope::from_str("Nobody expects the Spanish inquisition");

1027+ let s = r.slice(..);

1028+

1029+ let selection = Selection::single(0, r.len_chars());

1030+ assert_eq!(

1031+ select_on_matches(s, &selection, &Regex::new(r"[A-Z][a-z]*").unwrap()),

1032+ Some(Selection::new(

1033+ smallvec![Range::new(0, 6), Range::new(19, 26)],

1034+ 0

1035+ ))

1036+ );

1037+

1038+ let r = Rope::from_str("This\nString\n\ncontains multiple\nlines");

1039+ let s = r.slice(..);

1040+

1041+ let start_of_line = RegexBuilder::new(r"^").multi_line(true).build().unwrap();

1042+ let end_of_line = RegexBuilder::new(r"$").multi_line(true).build().unwrap();

1043+

1044+ // line without ending

1045+ assert_eq!(

1046+ select_on_matches(s, &Selection::single(0, 4), &start_of_line),

1047+ Some(Selection::single(0, 0))

1048+ );

1049+ assert_eq!(

1050+ select_on_matches(s, &Selection::single(0, 4), &end_of_line),

1051+ None

1052+ );

1053+ // line with ending

1054+ assert_eq!(

1055+ select_on_matches(s, &Selection::single(0, 5), &start_of_line),

1056+ Some(Selection::single(0, 0))

1057+ );

1058+ assert_eq!(

1059+ select_on_matches(s, &Selection::single(0, 5), &end_of_line),

1060+ Some(Selection::single(4, 4))

1061+ );

1062+ // line with start of next line

1063+ assert_eq!(

1064+ select_on_matches(s, &Selection::single(0, 6), &start_of_line),

1065+ Some(Selection::new(

1066+ smallvec![Range::point(0), Range::point(5)],

1067+ 0

1068+ ))

1069+ );

1070+ assert_eq!(

1071+ select_on_matches(s, &Selection::single(0, 6), &end_of_line),

1072+ Some(Selection::single(4, 4))

1073+ );

1074+

1075+ // multiple lines

1076+ assert_eq!(

1077+ select_on_matches(

1078+ s,

1079+ &Selection::single(0, s.len_chars()),

1080+ &RegexBuilder::new(r"^[a-z ]*$")

1081+ .multi_line(true)

1082+ .build()

1083+ .unwrap()

1084+ ),

1085+ Some(Selection::new(

1086+ smallvec![Range::point(12), Range::new(13, 30), Range::new(31, 36)],

1087+ 0

1088+ ))

1089+ );

1090+ }

1091+

9061092 #[test]

9071093 fn test_line_range() {

9081094 let r = Rope::from_str("\r\nHi\r\nthere!");

@@ -1020,6 +1206,52 @@ mod test {

10201206 &["", "abcd", "efg", "rs", "xyz"]

10211207 );

10221208 }

1209+

1210+ #[test]

1211+ fn test_merge_consecutive_ranges() {

1212+ let selection = Selection::new(

1213+ smallvec![

1214+ Range::new(0, 1),

1215+ Range::new(1, 10),

1216+ Range::new(15, 20),

1217+ Range::new(25, 26),

1218+ Range::new(26, 30)

1219+ ],

1220+ 4,

1221+ );

1222+

1223+ let result = selection.merge_consecutive_ranges();

1224+

1225+ assert_eq!(

1226+ result.ranges(),

1227+ &[Range::new(0, 10), Range::new(15, 20), Range::new(25, 30)]

1228+ );

1229+ assert_eq!(result.primary_index, 2);

1230+

1231+ let selection = Selection::new(smallvec![Range::new(0, 1)], 0);

1232+ let result = selection.merge_consecutive_ranges();

1233+

1234+ assert_eq!(result.ranges(), &[Range::new(0, 1)]);

1235+ assert_eq!(result.primary_index, 0);

1236+

1237+ let selection = Selection::new(

1238+ smallvec![

1239+ Range::new(0, 1),

1240+ Range::new(1, 5),

1241+ Range::new(5, 8),

1242+ Range::new(8, 10),

1243+ Range::new(10, 15),

1244+ Range::new(18, 25)

1245+ ],

1246+ 3,

1247+ );

1248+

1249+ let result = selection.merge_consecutive_ranges();

1250+

1251+ assert_eq!(result.ranges(), &[Range::new(0, 15), Range::new(18, 25)]);

1252+ assert_eq!(result.primary_index, 0);

1253+ }

1254+

10231255 #[test]

10241256 fn test_selection_contains() {

10251257 fn contains(a: Vec<(usize, usize)>, b: Vec<(usize, usize)>) -> bool {

@@ -1045,5 +1277,11 @@ mod test {

10451277 vec!((3, 4), (7, 9))

10461278 ));

10471279 assert!(!contains(vec!((1, 1), (5, 6)), vec!((1, 6))));

1280+

1281+ // multiple ranges of other are all contained in some ranges of self,

1282+ assert!(contains(

1283+ vec!((1, 4), (7, 10)),

1284+ vec!((1, 2), (3, 4), (7, 9))

1285+ ));

10481286 }

10491287}

helix-core/src/shellwords.rs+275−89

@@ -1,97 +1,199 @@

11use std::borrow::Cow;

3−/// Get the vec of escaped / quoted / doublequoted filenames from the input str

4−pub fn shellwords(input: &str) -> Vec<Cow<'_, str>> {

5− enum State {

6− Normal,

7− NormalEscaped,

8− Quoted,

9− QuoteEscaped,

10− Dquoted,

11− DquoteEscaped,

12− }

13−

14− use State::*;

15−

16− let mut state = Normal;

17− let mut args: Vec<Cow<str>> = Vec::new();

18− let mut escaped = String::with_capacity(input.len());

19−

20− let mut start = 0;

21− let mut end = 0;

22−

23− for (i, c) in input.char_indices() {

24− state = match state {

25− Normal => match c {

26− '\\' => {

27− escaped.push_str(&input[start..i]);

28− start = i + 1;

29− NormalEscaped

30− }

31− '"' => {

32− end = i;

33− Dquoted

34− }

35− '\'' => {

36− end = i;

37− Quoted

38− }

39− c if c.is_ascii_whitespace() => {

40− end = i;

41− Normal

42− }

43− _ => Normal,

44− },

45− NormalEscaped => Normal,

46− Quoted => match c {

47− '\\' => {

48− escaped.push_str(&input[start..i]);

49− start = i + 1;

50− QuoteEscaped

51− }

52− '\'' => {

53− end = i;

54− Normal

55− }

56− _ => Quoted,

57− },

58− QuoteEscaped => Quoted,

59− Dquoted => match c {

60− '\\' => {

61− escaped.push_str(&input[start..i]);

62− start = i + 1;

63− DquoteEscaped

64− }

65− '"' => {

66− end = i;

67− Normal

68− }

69− _ => Dquoted,

70− },

71− DquoteEscaped => Dquoted,

72− };

3+/// Auto escape for shellwords usage.

4+pub fn escape(input: Cow<str>) -> Cow<str> {

5+ if !input.chars().any(|x| x.is_ascii_whitespace()) {

6+ input

7+ } else if cfg!(unix) {

8+ Cow::Owned(input.chars().fold(String::new(), |mut buf, c| {

9+ if c.is_ascii_whitespace() {

10+ buf.push('\\');

11+ }

12+ buf.push(c);

13+ buf

14+ }))

15+ } else {

16+ Cow::Owned(format!("\"{}\"", input))

17+ }

18+}

7319

74− if i >= input.len() - 1 && end == 0 {

75− end = i + 1;

76− }

20+enum State {

21+ OnWhitespace,

22+ Unquoted,

23+ UnquotedEscaped,

24+ Quoted,

25+ QuoteEscaped,

26+ Dquoted,

27+ DquoteEscaped,

28+}

29+

30+pub struct Shellwords<'a> {

31+ state: State,

32+ /// Shellwords where whitespace and escapes has been resolved.

33+ words: Vec<Cow<'a, str>>,

34+ /// The parts of the input that are divided into shellwords. This can be

35+ /// used to retrieve the original text for a given word by looking up the

36+ /// same index in the Vec as the word in `words`.

37+ parts: Vec<&'a str>,

38+}

39+

40+impl<'a> From<&'a str> for Shellwords<'a> {

41+ fn from(input: &'a str) -> Self {

42+ use State::*;

43+

44+ let mut state = Unquoted;

45+ let mut words = Vec::new();

46+ let mut parts = Vec::new();

47+ let mut escaped = String::with_capacity(input.len());

7748

78− if end > 0 {

79− let esc_trim = escaped.trim();

80− let inp = &input[start..end];

49+ let mut part_start = 0;

50+ let mut unescaped_start = 0;

51+ let mut end = 0;

8152

82− if !(esc_trim.is_empty() && inp.trim().is_empty()) {

83− if esc_trim.is_empty() {

84− args.push(inp.into());

85− } else {

86− args.push([escaped, inp.into()].concat().into());

87− escaped = "".to_string();

53+ for (i, c) in input.char_indices() {

54+ state = match state {

55+ OnWhitespace => match c {

56+ '"' => {

57+ end = i;

58+ Dquoted

59+ }

60+ '\'' => {

61+ end = i;

62+ Quoted

63+ }

64+ '\\' => {

65+ if cfg!(unix) {

66+ escaped.push_str(&input[unescaped_start..i]);

67+ unescaped_start = i + 1;

68+ UnquotedEscaped

69+ } else {

70+ OnWhitespace

71+ }

72+ }

73+ c if c.is_ascii_whitespace() => {

74+ end = i;

75+ OnWhitespace

76+ }

77+ _ => Unquoted,

78+ },

79+ Unquoted => match c {

80+ '\\' => {

81+ if cfg!(unix) {

82+ escaped.push_str(&input[unescaped_start..i]);

83+ unescaped_start = i + 1;

84+ UnquotedEscaped

85+ } else {

86+ Unquoted

87+ }

88+ }

89+ c if c.is_ascii_whitespace() => {

90+ end = i;

91+ OnWhitespace

92+ }

93+ _ => Unquoted,

94+ },

95+ UnquotedEscaped => Unquoted,

96+ Quoted => match c {

97+ '\\' => {

98+ if cfg!(unix) {

99+ escaped.push_str(&input[unescaped_start..i]);

100+ unescaped_start = i + 1;

101+ QuoteEscaped

102+ } else {

103+ Quoted

104+ }

105+ }

106+ '\'' => {

107+ end = i;

108+ OnWhitespace

109+ }

110+ _ => Quoted,

111+ },

112+ QuoteEscaped => Quoted,

113+ Dquoted => match c {

114+ '\\' => {

115+ if cfg!(unix) {

116+ escaped.push_str(&input[unescaped_start..i]);

117+ unescaped_start = i + 1;

118+ DquoteEscaped

119+ } else {

120+ Dquoted

121+ }

122+ }

123+ '"' => {

124+ end = i;

125+ OnWhitespace

126+ }

127+ _ => Dquoted,

128+ },

129+ DquoteEscaped => Dquoted,

130+ };

131+

132+ let c_len = c.len_utf8();

133+ if i == input.len() - c_len && end == 0 {

134+ end = i + c_len;

135+ }

136+

137+ if end > 0 {

138+ let esc_trim = escaped.trim();

139+ let inp = &input[unescaped_start..end];

140+

141+ if !(esc_trim.is_empty() && inp.trim().is_empty()) {

142+ if esc_trim.is_empty() {

143+ words.push(inp.into());

144+ parts.push(inp);

145+ } else {

146+ words.push([escaped, inp.into()].concat().into());

147+ parts.push(&input[part_start..end]);

148+ escaped = "".to_string();

149+ }

88150 }

151+ unescaped_start = i + 1;

152+ part_start = i + 1;

153+ end = 0;

89154 }

90− start = i + 1;

91− end = 0;

92155 }

156+

157+ debug_assert!(words.len() == parts.len());

158+

159+ Self {

160+ state,

161+ words,

162+ parts,

163+ }

164+ }

165+}

166+

167+impl<'a> Shellwords<'a> {

168+ /// Checks that the input ends with a whitespace character which is not escaped.

169+ ///

170+ /// # Examples

171+ ///

172+ /// ```rust

173+ /// use helix_core::shellwords::Shellwords;

174+ /// assert_eq!(Shellwords::from(" ").ends_with_whitespace(), true);

175+ /// assert_eq!(Shellwords::from(":open ").ends_with_whitespace(), true);

176+ /// assert_eq!(Shellwords::from(":open foo.txt ").ends_with_whitespace(), true);

177+ /// assert_eq!(Shellwords::from(":open").ends_with_whitespace(), false);

178+ /// #[cfg(unix)]

179+ /// assert_eq!(Shellwords::from(":open a\\ ").ends_with_whitespace(), false);

180+ /// #[cfg(unix)]

181+ /// assert_eq!(Shellwords::from(":open a\\ b.txt").ends_with_whitespace(), false);

182+ /// ```

183+ pub fn ends_with_whitespace(&self) -> bool {

184+ matches!(self.state, State::OnWhitespace)

185+ }

186+

187+ /// Returns the list of shellwords calculated from the input string.

188+ pub fn words(&self) -> &[Cow<'a, str>] {

189+ &self.words

190+ }

191+

192+ /// Returns a list of strings which correspond to [`Self::words`] but represent the original

193+ /// text in the input string - including escape characters - without separating whitespace.

194+ pub fn parts(&self) -> &[&'a str] {

195+ &self.parts

93196 }

94− args

95197}

96198

97199#[cfg(test)]

@@ -99,9 +201,30 @@ mod test {

99201 use super::*;

100202

101203 #[test]

204+ #[cfg(windows)]

102205 fn test_normal() {

103206 let input = r#":o single_word twó wörds \three\ \"with\ escaping\\"#;

104− let result = shellwords(input);

207+ let shellwords = Shellwords::from(input);

208+ let result = shellwords.words().to_vec();

209+ let expected = vec![

210+ Cow::from(":o"),

211+ Cow::from("single_word"),

212+ Cow::from("twó"),

213+ Cow::from("wörds"),

214+ Cow::from("\\three\\"),

215+ Cow::from("\\"),

216+ Cow::from("with\\ escaping\\\\"),

217+ ];

218+ // TODO test is_owned and is_borrowed, once they get stabilized.

219+ assert_eq!(expected, result);

220+ }

221+

222+ #[test]

223+ #[cfg(unix)]

224+ fn test_normal() {

225+ let input = r#":o single_word twó wörds \three\ \"with\ escaping\\"#;

226+ let shellwords = Shellwords::from(input);

227+ let result = shellwords.words().to_vec();

105228 let expected = vec![

106229 Cow::from(":o"),

107230 Cow::from("single_word"),

@@ -114,10 +237,12 @@ mod test {

114237 }

115238

116239 #[test]

240+ #[cfg(unix)]

117241 fn test_quoted() {

118242 let quoted =

119243 r#":o 'single_word' 'twó wörds' '' ' ''\three\' \"with\ escaping\\' 'quote incomplete"#;

120− let result = shellwords(quoted);

244+ let shellwords = Shellwords::from(quoted);

245+ let result = shellwords.words().to_vec();

121246 let expected = vec![

122247 Cow::from(":o"),

123248 Cow::from("single_word"),

@@ -129,9 +254,11 @@ mod test {

129254 }

130255

131256 #[test]

257+ #[cfg(unix)]

132258 fn test_dquoted() {

133259 let dquoted = r#":o "single_word" "twó wörds" "" " ""\three\' \"with\ escaping\\" "dquote incomplete"#;

134− let result = shellwords(dquoted);

260+ let shellwords = Shellwords::from(dquoted);

261+ let result = shellwords.words().to_vec();

135262 let expected = vec![

136263 Cow::from(":o"),

137264 Cow::from("single_word"),

@@ -143,9 +270,11 @@ mod test {

143270 }

144271

145272 #[test]

273+ #[cfg(unix)]

146274 fn test_mixed() {

147275 let dquoted = r#":o single_word 'twó wörds' "\three\' \"with\ escaping\\""no space before"'and after' $#%^@ "%^&(%^" ')(*&^%''a\\\\\b' '"#;

148− let result = shellwords(dquoted);

276+ let shellwords = Shellwords::from(dquoted);

277+ let result = shellwords.words().to_vec();

149278 let expected = vec![

150279 Cow::from(":o"),

151280 Cow::from("single_word"),

@@ -161,4 +290,61 @@ mod test {

161290 ];

162291 assert_eq!(expected, result);

163292 }

293+

294+ #[test]

295+ fn test_lists() {

296+ let input =

297+ r#":set statusline.center ["file-type","file-encoding"] '["list", "in", "quotes"]'"#;

298+ let shellwords = Shellwords::from(input);

299+ let result = shellwords.words().to_vec();

300+ let expected = vec![

301+ Cow::from(":set"),

302+ Cow::from("statusline.center"),

303+ Cow::from(r#"["file-type","file-encoding"]"#),

304+ Cow::from(r#"["list", "in", "quotes"]"#),

305+ ];

306+ assert_eq!(expected, result);

307+ }

308+

309+ #[test]

310+ #[cfg(unix)]

311+ fn test_escaping_unix() {

312+ assert_eq!(escape("foobar".into()), Cow::Borrowed("foobar"));

313+ assert_eq!(escape("foo bar".into()), Cow::Borrowed("foo\\ bar"));

314+ assert_eq!(escape("foo\tbar".into()), Cow::Borrowed("foo\\\tbar"));

315+ }

316+

317+ #[test]

318+ #[cfg(windows)]

319+ fn test_escaping_windows() {

320+ assert_eq!(escape("foobar".into()), Cow::Borrowed("foobar"));

321+ assert_eq!(escape("foo bar".into()), Cow::Borrowed("\"foo bar\""));

322+ }

323+

324+ #[test]

325+ #[cfg(unix)]

326+ fn test_parts() {

327+ assert_eq!(Shellwords::from(":o a").parts(), &[":o", "a"]);

328+ assert_eq!(Shellwords::from(":o a\\ ").parts(), &[":o", "a\\ "]);

329+ }

330+

331+ #[test]

332+ #[cfg(windows)]

333+ fn test_parts() {

334+ assert_eq!(Shellwords::from(":o a").parts(), &[":o", "a"]);

335+ assert_eq!(Shellwords::from(":o a\\ ").parts(), &[":o", "a\\"]);

336+ }

337+

338+ #[test]

339+ fn test_multibyte_at_end() {

340+ assert_eq!(Shellwords::from("𒀀").parts(), &["𒀀"]);

341+ assert_eq!(

342+ Shellwords::from(":sh echo 𒀀").parts(),

343+ &[":sh", "echo", "𒀀"]

344+ );

345+ assert_eq!(

346+ Shellwords::from(":sh echo 𒀀 hello world𒀀").parts(),

347+ &[":sh", "echo", "𒀀", "hello", "world𒀀"]

348+ );

349+ }

164350}

helix-core/src/state.rsdeleted−17

@@ -1,17 +0,0 @@

1−use crate::{Rope, Selection};

2−

3−#[derive(Debug, Clone)]

4−pub struct State {

5− pub doc: Rope,

6− pub selection: Selection,

7−}

8−

9−impl State {

10− #[must_use]

11− pub fn new(doc: Rope) -> Self {

12− Self {

13− doc,

14− selection: Selection::point(0),

15− }

16− }

17−}

helix-core/src/surround.rs+178−111

@@ -1,6 +1,6 @@

11use std::fmt::Display;

3−use crate::{search, Range, Selection};

3+use crate::{movement::Direction, search, Range, Selection};

44use ropey::RopeSlice;

66pub const PAIRS: &[(char, char)] = &[

@@ -13,7 +13,7 @@ pub const PAIRS: &[(char, char)] = &[

1313 ('（', '）'),

1414];

1515

16−#[derive(Debug, PartialEq)]

16+#[derive(Debug, PartialEq, Eq)]

1717pub enum Error {

1818 PairNotFound,

1919 CursorOverlap,

@@ -52,6 +52,74 @@ pub fn get_pair(ch: char) -> (char, char) {

5252 .unwrap_or((ch, ch))

5353}

5454

55+pub fn find_nth_closest_pairs_pos(

56+ text: RopeSlice,

57+ range: Range,

58+ mut skip: usize,

59+) -> Result<(usize, usize)> {

60+ let is_open_pair = |ch| PAIRS.iter().any(|(open, _)| *open == ch);

61+ let is_close_pair = |ch| PAIRS.iter().any(|(_, close)| *close == ch);

62+

63+ let mut stack = Vec::with_capacity(2);

64+ let pos = range.from();

65+ let mut close_pos = pos.saturating_sub(1);

66+

67+ for ch in text.chars_at(pos) {

68+ close_pos += 1;

69+

70+ if is_open_pair(ch) {

71+ // Track open pairs encountered so that we can step over

72+ // the corresponding close pairs that will come up further

73+ // down the loop. We want to find a lone close pair whose

74+ // open pair is before the cursor position.

75+ stack.push(ch);

76+ continue;

77+ }

78+

79+ if !is_close_pair(ch) {

80+ // We don't care if this character isn't a brace pair item,

81+ // so short circuit here.

82+ continue;

83+ }

84+

85+ let (open, close) = get_pair(ch);

86+

87+ if stack.last() == Some(&open) {

88+ // If we are encountering the closing pair for an opener

89+ // we just found while traversing, then its inside the

90+ // selection and should be skipped over.

91+ stack.pop();

92+ continue;

93+ }

94+

95+ match find_nth_open_pair(text, open, close, close_pos, 1) {

96+ // Before we accept this pair, we want to ensure that the

97+ // pair encloses the range rather than just the cursor.

98+ Some(open_pos)

99+ if open_pos <= pos.saturating_add(1)

100+ && close_pos >= range.to().saturating_sub(1) =>

101+ {

102+ // Since we have special conditions for when to

103+ // accept, we can't just pass the skip parameter on

104+ // through to the find_nth_*_pair methods, so we

105+ // track skips manually here.

106+ if skip > 1 {

107+ skip -= 1;

108+ continue;

109+ }

110+

111+ return match range.direction() {

112+ Direction::Forward => Ok((open_pos, close_pos)),

113+ Direction::Backward => Ok((close_pos, open_pos)),

114+ };

115+ }

116+ _ => continue,

117+ }

118+ }

119+

120+ Err(Error::PairNotFound)

121+}

122+

55123/// Find the position of surround pairs of `ch` which can be either a closing

56124/// or opening pair. `n` will skip n - 1 pairs (eg. n=2 will discard (only)

57125/// the first pair found and keep looking)

@@ -173,17 +241,22 @@ fn find_nth_close_pair(

173241/// Find position of surround characters around every cursor. Returns None

174242/// if any positions overlap. Note that the positions are in a flat Vec.

175243/// Use get_surround_pos().chunks(2) to get matching pairs of surround positions.

176−/// `ch` can be either closing or opening pair.

244+/// `ch` can be either closing or opening pair. If `ch` is None, surround pairs

245+/// are automatically detected around each cursor (note that this may result

246+/// in them selecting different surround characters for each selection).

177247pub fn get_surround_pos(

178248 text: RopeSlice,

179249 selection: &Selection,

180− ch: char,

250+ ch: Option<char>,

181251 skip: usize,

182252) -> Result<Vec<usize>> {

183253 let mut change_pos = Vec::new();

184254

185255 for &range in selection {

186− let (open_pos, close_pos) = find_nth_pairs_pos(text, ch, range, skip)?;

256+ let (open_pos, close_pos) = match ch {

257+ Some(ch) => find_nth_pairs_pos(text, ch, range, skip)?,

258+ None => find_nth_closest_pairs_pos(text, range, skip)?,

259+ };

187260 if change_pos.contains(&open_pos) || change_pos.contains(&close_pos) {

188261 return Err(Error::CursorOverlap);

189262 }

@@ -200,141 +273,135 @@ mod test {

200273 use ropey::Rope;

201274 use smallvec::SmallVec;

202275

203− #[allow(clippy::type_complexity)]

204− fn check_find_nth_pair_pos(

205− text: &str,

206− cases: Vec<(usize, char, usize, Result<(usize, usize)>)>,

207− ) {

208− let doc = Rope::from(text);

209− let slice = doc.slice(..);

210−

211− for (cursor_pos, ch, n, expected_range) in cases {

212− let range = find_nth_pairs_pos(slice, ch, (cursor_pos, cursor_pos + 1).into(), n);

213− assert_eq!(

214− range, expected_range,

215− "Expected {:?}, got {:?}",

216− expected_range, range

276+ #[test]

277+ fn test_get_surround_pos() {

278+ #[rustfmt::skip]

279+ let (doc, selection, expectations) =

280+ rope_with_selections_and_expectations(

281+ "(some) (chars)\n(newline)",

282+ "_ ^ _ _ ^ _\n_ ^ _"

217283 );

218− }

284+

285+ assert_eq!(

286+ get_surround_pos(doc.slice(..), &selection, Some('('), 1).unwrap(),

287+ expectations

288+ );

219289 }

220290

221291 #[test]

222− fn test_find_nth_pairs_pos() {

223− check_find_nth_pair_pos(

224− "some (text) here",

225− vec![

226− // cursor on [t]ext

227− (6, '(', 1, Ok((5, 10))),

228− (6, ')', 1, Ok((5, 10))),

229− // cursor on so[m]e

230− (2, '(', 1, Err(Error::PairNotFound)),

231− // cursor on bracket itself

232− (5, '(', 1, Ok((5, 10))),

233− (10, '(', 1, Ok((5, 10))),

234− ],

292+ fn test_get_surround_pos_bail_different_surround_chars() {

293+ #[rustfmt::skip]

294+ let (doc, selection, _) =

295+ rope_with_selections_and_expectations(

296+ "[some]\n(chars)xx\n(newline)",

297+ " ^ \n ^ \n "

298+ );

299+

300+ assert_eq!(

301+ get_surround_pos(doc.slice(..), &selection, Some('('), 1),

302+ Err(Error::PairNotFound)

235303 );

236304 }

237305

238306 #[test]

239− fn test_find_nth_pairs_pos_skip() {

240− check_find_nth_pair_pos(

241− "(so (many (good) text) here)",

242− vec![

243− // cursor on go[o]d

244− (13, '(', 1, Ok((10, 15))),

245− (13, '(', 2, Ok((4, 21))),

246− (13, '(', 3, Ok((0, 27))),

247− ],

307+ fn test_get_surround_pos_bail_overlapping_surround_chars() {

308+ #[rustfmt::skip]

309+ let (doc, selection, _) =

310+ rope_with_selections_and_expectations(

311+ "[some]\n(chars)xx\n(newline)",

312+ " \n ^ \n ^ "

313+ );

314+

315+ assert_eq!(

316+ get_surround_pos(doc.slice(..), &selection, Some('('), 1),

317+ Err(Error::PairNotFound) // overlapping surround chars

248318 );

249319 }

250320

251321 #[test]

252− fn test_find_nth_pairs_pos_same() {

253− check_find_nth_pair_pos(

254− "'so 'many 'good' text' here'",

255− vec![

256− // cursor on go[o]d

257− (13, '\'', 1, Ok((10, 15))),

258− (13, '\'', 2, Ok((4, 21))),

259− (13, '\'', 3, Ok((0, 27))),

260− // cursor on the quotes

261− (10, '\'', 1, Err(Error::CursorOnAmbiguousPair)),

262− ],

263− )

322+ fn test_get_surround_pos_bail_cursor_overlap() {

323+ #[rustfmt::skip]

324+ let (doc, selection, _) =

325+ rope_with_selections_and_expectations(

326+ "[some]\n(chars)xx\n(newline)",

327+ " ^^ \n \n "

328+ );

329+

330+ assert_eq!(

331+ get_surround_pos(doc.slice(..), &selection, Some('['), 1),

332+ Err(Error::CursorOverlap)

333+ );

264334 }

265335

266336 #[test]

267− fn test_find_nth_pairs_pos_step() {

268− check_find_nth_pair_pos(

269− "((so)((many) good (text))(here))",

270− vec![

271− // cursor on go[o]d

272− (15, '(', 1, Ok((5, 24))),

273− (15, '(', 2, Ok((0, 31))),

274− ],

337+ fn test_find_nth_pairs_pos_quote_success() {

338+ #[rustfmt::skip]

339+ let (doc, selection, expectations) =

340+ rope_with_selections_and_expectations(

341+ "some 'quoted text' on this 'line'\n'and this one'",

342+ " _ ^ _ \n "

343+ );

344+

345+ assert_eq!(2, expectations.len());

346+ assert_eq!(

347+ find_nth_pairs_pos(doc.slice(..), '\'', selection.primary(), 1)

348+ .expect("find should succeed"),

349+ (expectations[0], expectations[1])

275350 )

276351 }

277352

278353 #[test]

279− fn test_find_nth_pairs_pos_mixed() {

280− check_find_nth_pair_pos(

281− "(so [many {good} text] here)",

282− vec![

283− // cursor on go[o]d

284− (13, '{', 1, Ok((10, 15))),

285− (13, '[', 1, Ok((4, 21))),

286− (13, '(', 1, Ok((0, 27))),

287− ],

354+ fn test_find_nth_pairs_pos_nested_quote_success() {

355+ #[rustfmt::skip]

356+ let (doc, selection, expectations) =

357+ rope_with_selections_and_expectations(

358+ "some 'nested 'quoted' text' on this 'line'\n'and this one'",

359+ " _ ^ _ \n "

360+ );

361+

362+ assert_eq!(2, expectations.len());

363+ assert_eq!(

364+ find_nth_pairs_pos(doc.slice(..), '\'', selection.primary(), 2)

365+ .expect("find should succeed"),

366+ (expectations[0], expectations[1])

288367 )

289368 }

290369

291370 #[test]

292− fn test_get_surround_pos() {

293− let doc = Rope::from("(some) (chars)\n(newline)");

294− let slice = doc.slice(..);

295− let selection = Selection::new(

296− SmallVec::from_slice(&[Range::point(2), Range::point(9), Range::point(20)]),

297− 0,

298− );

371+ fn test_find_nth_pairs_pos_inside_quote_ambiguous() {

372+ #[rustfmt::skip]

373+ let (doc, selection, _) =

374+ rope_with_selections_and_expectations(

375+ "some 'nested 'quoted' text' on this 'line'\n'and this one'",

376+ " ^ \n "

377+ );

299378

300− // cursor on s[o]me, c[h]ars, newl[i]ne

301379 assert_eq!(

302− get_surround_pos(slice, &selection, '(', 1)

303− .unwrap()

304− .as_slice(),

305− &[0, 5, 7, 13, 15, 23]

306− );

380+ find_nth_pairs_pos(doc.slice(..), '\'', selection.primary(), 1),

381+ Err(Error::CursorOnAmbiguousPair)

382+ )

307383 }

308384

309− #[test]

310− fn test_get_surround_pos_bail() {

311− let doc = Rope::from("[some]\n(chars)xx\n(newline)");

312− let slice = doc.slice(..);

385+ // Create a Rope and a matching Selection using a specification language.

386+ // ^ is a single-point selection.

387+ // _ is an expected index. These are returned as a Vec<usize> for use in assertions.

388+ fn rope_with_selections_and_expectations(

389+ text: &str,

390+ spec: &str,

391+ ) -> (Rope, Selection, Vec<usize>) {

392+ if text.len() != spec.len() {

393+ panic!("specification must match text length -- are newlines aligned?");

394+ }

313395

314− let selection =

315− Selection::new(SmallVec::from_slice(&[Range::point(2), Range::point(9)]), 0);

316− // cursor on s[o]me, c[h]ars

317− assert_eq!(

318− get_surround_pos(slice, &selection, '(', 1),

319− Err(Error::PairNotFound) // different surround chars

320− );

396+ let rope = Rope::from(text);

321397

322− let selection = Selection::new(

323− SmallVec::from_slice(&[Range::point(14), Range::point(24)]),

324− 0,

325− );

326− // cursor on [x]x, newli[n]e

327− assert_eq!(

328− get_surround_pos(slice, &selection, '(', 1),

329− Err(Error::PairNotFound) // overlapping surround chars

330− );

398+ let selections: SmallVec<[Range; 1]> = spec

399+ .match_indices('^')

400+ .map(|(i, _)| Range::point(i))

401+ .collect();

331402

332− let selection =

333− Selection::new(SmallVec::from_slice(&[Range::point(2), Range::point(3)]), 0);

334− // cursor on s[o][m]e

335− assert_eq!(

336− get_surround_pos(slice, &selection, '[', 1),

337− Err(Error::CursorOverlap)

338− );

403+ let expectations: Vec<usize> = spec.match_indices('_').map(|(i, _)| i).collect();

404+

405+ (rope, Selection::new(selections, 0), expectations)

339406 }

340407}

helix-core/src/syntax.rs+992−335