mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-04 03:17:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'helix-editor:master' into scroll_preview_fixed

Browse source
This commit is contained in:
Shaun_Sheep 2025-03-13 18:18:21 +01:00 • committed by GitHub
commit eda5aa17eb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
71 changed files with 4998 additions and 1999 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.envrc
View file

@ -1,7 +1,8 @@
watch_file shell.nix
watch_file default.nix
watch_file flake.lock
watch_file rust-toolchain.toml
# try to use flakes, if it fails use normal nix (ie. shell.nix)
use flake || use nix
eval "$shellHook"
eval "$shellHook"

4
.github/workflows/cachix.yml vendored
View file

@ -14,10 +14,10 @@ jobs:
uses: actions/checkout@v4
- name: Install nix
uses: cachix/install-nix-action@v30
uses: cachix/install-nix-action@v31
- name: Authenticate with Cachix
uses: cachix/cachix-action@v15
uses: cachix/cachix-action@v16
with:
name: helix
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}

303
Cargo.lock generated
View file

@ -68,9 +68,9 @@ dependencies = [
[[package]]
name = "anyhow"
version = "1.0.95"
version = "1.0.97"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
[[package]]
name = "arc-swap"
@ -101,9 +101,9 @@ dependencies = [
[[package]]
name = "bitflags"
version = "2.8.0"
version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
[[package]]
name = "bstr"
@ -136,9 +136,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
[[package]]
name = "cc"
version = "1.2.14"
version = "1.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c3d1b2e905a3a7b00a6141adb0e4c0bb941d11caf55349d863942a1cc44e3c9"
checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
dependencies = [
"shlex",
]
@ -162,14 +162,14 @@ dependencies = [
[[package]]
name = "chrono"
version = "0.4.39"
version = "0.4.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
dependencies = [
"android-tzdata",
"iana-time-zone",
"num-traits",
"windows-targets 0.52.6",
"windows-link",
]
[[package]]
@ -249,7 +249,7 @@ dependencies = [
"libc",
"mio",
"parking_lot",
"rustix",
"rustix 0.38.44",
"signal-hook",
"signal-hook-mio",
"winapi",
@ -349,13 +349,13 @@ checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b"
[[package]]
name = "etcetera"
version = "0.8.0"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
checksum = "26c7b13d0780cb82722fd59f6f57f925e143427e4a75313a6c77243bf5326ae6"
dependencies = [
"cfg-if",
"home",
"windows-sys 0.48.0",
"windows-sys 0.59.0",
]
[[package]]
@ -492,7 +492,7 @@ dependencies = [
"cfg-if",
"libc",
"wasi 0.13.3+wasi-0.2.2",
"windows-targets 0.52.6",
"windows-targets",
]
[[package]]
@ -548,7 +548,7 @@ dependencies = [
"gix-worktree",
"once_cell",
"smallvec",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -561,7 +561,7 @@ dependencies = [
"gix-date",
"gix-utils",
"itoa",
"thiserror 2.0.11",
"thiserror 2.0.12",
"winnow 0.6.18",
]
@ -578,7 +578,7 @@ dependencies = [
"gix-trace",
"kstring",
"smallvec",
"thiserror 2.0.11",
"thiserror 2.0.12",
"unicode-bom",
]
@ -588,7 +588,7 @@ version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1db9765c69502650da68f0804e3dc2b5f8ccc6a2d104ca6c85bc40700d37540"
dependencies = [
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -597,7 +597,7 @@ version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b1f1d8764958699dc764e3f727cef280ff4d1bd92c107bbf8acd85b30c1bd6f"
dependencies = [
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -623,7 +623,7 @@ dependencies = [
"gix-features",
"gix-hash",
"memmap2",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -642,7 +642,7 @@ dependencies = [
"memchr",
"once_cell",
"smallvec",
"thiserror 2.0.11",
"thiserror 2.0.12",
"unicode-bom",
"winnow 0.6.18",
]
@ -657,7 +657,7 @@ dependencies = [
"bstr",
"gix-path",
"libc",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -669,7 +669,7 @@ dependencies = [
"bstr",
"itoa",
"jiff",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -693,7 +693,7 @@ dependencies = [
"gix-traverse",
"gix-worktree",
"imara-diff",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -713,7 +713,7 @@ dependencies = [
"gix-trace",
"gix-utils",
"gix-worktree",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -729,7 +729,7 @@ dependencies = [
"gix-path",
"gix-ref",
"gix-sec",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -747,7 +747,7 @@ dependencies = [
"once_cell",
"prodash",
"sha1_smol",
"thiserror 2.0.11",
"thiserror 2.0.12",
"walkdir",
]
@ -769,7 +769,7 @@ dependencies = [
"gix-trace",
"gix-utils",
"smallvec",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -802,7 +802,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e81c5ec48649b1821b3ed066a44efb95f1a268b35c1d91295e61252539fbe9f8"
dependencies = [
"faster-hex",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -852,9 +852,9 @@ dependencies = [
"itoa",
"libc",
"memmap2",
"rustix",
"rustix 0.38.44",
"smallvec",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -865,7 +865,7 @@ checksum = "9739815270ff6940968441824d162df9433db19211ca9ba8c3fc1b50b849c642"
dependencies = [
"gix-tempfile",
"gix-utils",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -885,7 +885,7 @@ dependencies = [
"gix-validate",
"itoa",
"smallvec",
"thiserror 2.0.11",
"thiserror 2.0.12",
"winnow 0.6.18",
]
@ -907,7 +907,7 @@ dependencies = [
"gix-quote",
"parking_lot",
"tempfile",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -925,7 +925,7 @@ dependencies = [
"gix-path",
"memmap2",
"smallvec",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -937,7 +937,7 @@ dependencies = [
"bstr",
"faster-hex",
"gix-trace",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -949,7 +949,7 @@ dependencies = [
"bstr",
"faster-hex",
"gix-trace",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -962,7 +962,7 @@ dependencies = [
"gix-trace",
"home",
"once_cell",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -977,7 +977,7 @@ dependencies = [
"gix-config-value",
"gix-glob",
"gix-path",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -995,7 +995,7 @@ dependencies = [
"gix-transport",
"gix-utils",
"maybe-async",
"thiserror 2.0.11",
"thiserror 2.0.12",
"winnow 0.6.18",
]
@ -1007,7 +1007,7 @@ checksum = "e49357fccdb0c85c0d3a3292a9f6db32d9b3535959b5471bb9624908f4a066c6"
dependencies = [
"bstr",
"gix-utils",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -1027,7 +1027,7 @@ dependencies = [
"gix-utils",
"gix-validate",
"memmap2",
"thiserror 2.0.11",
"thiserror 2.0.12",
"winnow 0.6.18",
]
@ -1042,7 +1042,7 @@ dependencies = [
"gix-revision",
"gix-validate",
"smallvec",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -1057,7 +1057,7 @@ dependencies = [
"gix-hash",
"gix-object",
"gix-revwalk",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -1072,7 +1072,7 @@ dependencies = [
"gix-hashtable",
"gix-object",
"smallvec",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -1096,7 +1096,7 @@ dependencies = [
"bstr",
"gix-hash",
"gix-lock",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -1119,7 +1119,7 @@ dependencies = [
"gix-pathspec",
"gix-worktree",
"portable-atomic",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -1134,7 +1134,7 @@ dependencies = [
"gix-pathspec",
"gix-refspec",
"gix-url",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -1170,7 +1170,7 @@ dependencies = [
"gix-quote",
"gix-sec",
"gix-url",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -1187,7 +1187,7 @@ dependencies = [
"gix-object",
"gix-revwalk",
"smallvec",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -1200,7 +1200,7 @@ dependencies = [
"gix-features",
"gix-path",
"percent-encoding",
"thiserror 2.0.11",
"thiserror 2.0.12",
"url",
]
@ -1222,7 +1222,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9eaa01c3337d885617c0a42e92823922a2aea71f4caeace6fe87002bdcadbd90"
dependencies = [
"bstr",
"thiserror 2.0.11",
"thiserror 2.0.12",
]
[[package]]
@ -1246,9 +1246,9 @@ dependencies = [
[[package]]
name = "globset"
version = "0.4.15"
version = "0.4.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19"
checksum = "54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5"
dependencies = [
"aho-corasick",
"bstr",
@ -1350,7 +1350,7 @@ dependencies = [
"tree-sitter",
"unicode-general-category",
"unicode-segmentation",
"unicode-width",
"unicode-width 0.1.12",
"url",
]
@ -1365,7 +1365,7 @@ dependencies = [
"log",
"serde",
"serde_json",
"thiserror 2.0.11",
"thiserror 2.0.12",
"tokio",
]
@ -1419,7 +1419,7 @@ dependencies = [
"serde",
"serde_json",
"slotmap",
"thiserror 2.0.11",
"thiserror 2.0.12",
"tokio",
"tokio-stream",
]
@ -1449,7 +1449,7 @@ dependencies = [
"regex-automata",
"regex-cursor",
"ropey",
"rustix",
"rustix 1.0.2",
"tempfile",
"unicode-segmentation",
"which",
@ -1495,7 +1495,7 @@ dependencies = [
"smallvec",
"tempfile",
"termini",
"thiserror 2.0.11",
"thiserror 2.0.12",
"tokio",
"tokio-stream",
"toml",
@ -1556,12 +1556,12 @@ dependencies = [
"log",
"once_cell",
"parking_lot",
"rustix",
"rustix 1.0.2",
"serde",
"serde_json",
"slotmap",
"tempfile",
"thiserror 2.0.11",
"thiserror 2.0.12",
"tokio",
"tokio-stream",
"toml",
@ -1772,9 +1772,9 @@ dependencies = [
[[package]]
name = "indexmap"
version = "2.7.1"
version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058"
dependencies = [
"equivalent",
"hashbrown 0.15.2",
@ -1782,9 +1782,9 @@ dependencies = [
[[package]]
name = "indoc"
version = "2.0.5"
version = "2.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
[[package]]
name = "is-docker"
@ -1856,9 +1856,9 @@ dependencies = [
[[package]]
name = "libc"
version = "0.2.169"
version = "0.2.170"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
[[package]]
name = "libloading"
@ -1867,7 +1867,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
dependencies = [
"cfg-if",
"windows-targets 0.52.6",
"windows-targets",
]
[[package]]
@ -1887,6 +1887,12 @@ version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
[[package]]
name = "linux-raw-sys"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6db9c683daf087dc577b7506e9695b3d556a9f3849903fa28186283afd6809e9"
[[package]]
name = "litemap"
version = "0.7.3"
@ -1905,9 +1911,9 @@ dependencies = [
[[package]]
name = "log"
version = "0.4.25"
version = "0.4.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
[[package]]
name = "maybe-async"
@ -2017,9 +2023,9 @@ dependencies = [
[[package]]
name = "once_cell"
version = "1.20.3"
version = "1.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
checksum = "cde51589ab56b20a6f686b2c68f7a0bd6add753d697abf720d63f8db3ab7b1ad"
[[package]]
name = "open"
@ -2052,7 +2058,7 @@ dependencies = [
"libc",
"redox_syscall",
"smallvec",
"windows-targets 0.52.6",
"windows-targets",
]
[[package]]
@ -2205,9 +2211,9 @@ dependencies = [
[[package]]
name = "regex-cursor"
version = "0.1.4"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae4327b5fde3ae6fda0152128d3d59b95a5aad7be91c405869300091720f7169"
checksum = "0497c781d2f982ae8284d2932aee6a877e58a4541daa5e8fadc18cc75c23a61d"
dependencies = [
"log",
"memchr",
@ -2247,7 +2253,20 @@ dependencies = [
"bitflags",
"errno",
"libc",
"linux-raw-sys",
"linux-raw-sys 0.4.14",
"windows-sys 0.59.0",
]
[[package]]
name = "rustix"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7178faa4b75a30e269c71e61c353ce2748cf3d76f0c44c393f4e60abf49b825"
dependencies = [
"bitflags",
"errno",
"libc",
"linux-raw-sys 0.9.2",
"windows-sys 0.59.0",
]
@ -2274,18 +2293,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "serde"
version = "1.0.217"
version = "1.0.219"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.217"
version = "1.0.219"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
dependencies = [
"proc-macro2",
"quote",
@ -2294,9 +2313,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.138"
version = "1.0.140"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
dependencies = [
"itoa",
"memchr",
@ -2466,15 +2485,15 @@ dependencies = [
[[package]]
name = "tempfile"
version = "3.17.1"
version = "3.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230"
checksum = "2c317e0a526ee6120d8dabad239c8dadca62b24b6f168914bbbc8e2fb1f0e567"
dependencies = [
"cfg-if",
"fastrand",
"getrandom 0.3.1",
"once_cell",
"rustix",
"rustix 1.0.2",
"windows-sys 0.59.0",
]
@ -2489,13 +2508,13 @@ dependencies = [
[[package]]
name = "textwrap"
version = "0.16.1"
version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057"
dependencies = [
"smawk",
"unicode-linebreak",
"unicode-width",
"unicode-width 0.2.0",
]
[[package]]
@ -2509,11 +2528,11 @@ dependencies = [
[[package]]
name = "thiserror"
version = "2.0.11"
version = "2.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
dependencies = [
"thiserror-impl 2.0.11",
"thiserror-impl 2.0.12",
]
[[package]]
@ -2529,9 +2548,9 @@ dependencies = [
[[package]]
name = "thiserror-impl"
version = "2.0.11"
version = "2.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
dependencies = [
"proc-macro2",
"quote",
@ -2574,9 +2593,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
version = "1.43.0"
version = "1.44.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
checksum = "9975ea0f48b5aa3972bf2d888c238182458437cc2a19374b81b25cdf1023fb3a"
dependencies = [
"backtrace",
"bytes",
@ -2710,6 +2729,12 @@ version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
[[package]]
name = "unicode-width"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
[[package]]
name = "url"
version = "2.5.4"
@ -2828,7 +2853,7 @@ checksum = "2774c861e1f072b3aadc02f8ba886c26ad6321567ecc294c935434cad06f1283"
dependencies = [
"either",
"env_home",
"rustix",
"rustix 0.38.44",
"winsafe",
]
@ -2869,17 +2894,14 @@ version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
dependencies = [
"windows-targets 0.52.6",
"windows-targets",
]
[[package]]
name = "windows-sys"
version = "0.48.0"
name = "windows-link"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
dependencies = [
"windows-targets 0.48.5",
]
checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"
[[package]]
name = "windows-sys"
@ -2887,7 +2909,7 @@ version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
"windows-targets 0.52.6",
"windows-targets",
]
[[package]]
@ -2896,22 +2918,7 @@ version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
dependencies = [
"windows-targets 0.52.6",
]
[[package]]
name = "windows-targets"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
dependencies = [
"windows_aarch64_gnullvm 0.48.5",
"windows_aarch64_msvc 0.48.5",
"windows_i686_gnu 0.48.5",
"windows_i686_msvc 0.48.5",
"windows_x86_64_gnu 0.48.5",
"windows_x86_64_gnullvm 0.48.5",
"windows_x86_64_msvc 0.48.5",
"windows-targets",
]
[[package]]
@ -2920,46 +2927,28 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
dependencies = [
"windows_aarch64_gnullvm 0.52.6",
"windows_aarch64_msvc 0.52.6",
"windows_i686_gnu 0.52.6",
"windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_gnullvm",
"windows_i686_msvc 0.52.6",
"windows_x86_64_gnu 0.52.6",
"windows_x86_64_gnullvm 0.52.6",
"windows_x86_64_msvc 0.52.6",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_gnullvm",
"windows_x86_64_msvc",
]
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
[[package]]
name = "windows_aarch64_msvc"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
[[package]]
name = "windows_aarch64_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
[[package]]
name = "windows_i686_gnu"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
[[package]]
name = "windows_i686_gnu"
version = "0.52.6"
@ -2972,48 +2961,24 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
[[package]]
name = "windows_i686_msvc"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
[[package]]
name = "windows_i686_msvc"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
[[package]]
name = "windows_x86_64_gnu"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
[[package]]
name = "windows_x86_64_gnu"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
[[package]]
name = "windows_x86_64_msvc"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "windows_x86_64_msvc"
version = "0.52.6"

5
Cargo.toml
View file

@ -41,11 +41,12 @@ tree-sitter = { version = "0.22" }
nucleo = "0.5.0"
slotmap = "1.0.7"
thiserror = "2.0"
tempfile = "3.17.1"
bitflags = "2.8"
tempfile = "3.18.0"
bitflags = "2.9"
unicode-segmentation = "1.2"
ropey = { version = "1.6.1", default-features = false, features = ["simd"] }
foldhash = "0.1"
parking_lot = "0.12"
[workspace.package]
version = "25.1.1"

1
book/src/SUMMARY.md
View file

@ -12,6 +12,7 @@
- [Syntax aware motions](./syntax-aware-motions.md)
- [Pickers](./pickers.md)
- [Keymap](./keymap.md)
- [Command line](./command-line.md)
- [Commands](./commands.md)
- [Language support](./lang-support.md)
- [Migrating from Vim](./from-vim.md)

82
book/src/command-line.md Normal file
View file

@ -0,0 +1,82 @@
# Command line
- [Quoting](#quoting)
- [Flags](#flags)
- [Expansions](#expansions)
- [Exceptions](#exceptions)
The command line is used for executing [typable commands](./commands.md#typable-commands) like `:write` or `:quit`. Press `:` to activate the command line.
Typable commands optionally accept arguments. `:write` for example accepts an optional path to write the file contents. The command line also supports a quoting syntax for arguments, flags to modify command behaviors, and _expansions_ - a way to insert values from the editor. Most commands support these features but some have custom parsing rules (see the [exceptions](#exceptions) below).
## Quoting
By default, command arguments are split on tabs and space characters. `:open README.md CHANGELOG.md` for example should open two files, `README.md` and `CHANGELOG.md`. Arguments that contain spaces can be surrounded in single quotes (`'`) or backticks (`` ` ``) to prevent the space from separating the argument, like `:open 'a b.txt'`.
Double quotes may be used the same way, but double quotes _expand_ their inner content. `:echo "%{cursor_line}"` for example may print `1` because of the expansion for the `cursor_line` variable. `:echo '%{cursor_line}'` though prints `%{cursor_line}` literally: content within single quotes or backticks is interpreted as-is.
On Unix systems the backslash character may be used to escape certain characters depending on where it is used. Within an argument which isn't surround in quotes, the backslash can be used to escape the space or tab characters: `:open a\ b.txt` is equivalent to `:open 'a b.txt'`. The backslash may also be used to escape quote characters (`'`, `` ` ``, `"`) or the percent token (`%`) when used at the beginning of an argument. `:echo \%%sh{foo}` for example prints `%sh{foo}` instead of invoking a `foo` shell command and `:echo \"quote` prints `"quote`. The backslash character is treated literally in any other situation on Unix systems and always on Windows: `:echo \n` always prints `\n`.
## Flags
Command flags are optional switches that can be used to alter the behavior of a command. For example the `:sort` command accepts an optional `--reverse` (or `-r` for short) flag which causes the sort command to reverse the sorting direction. Typing the `-` character shows completions for the current command's flags, if any.
The `--` flag specifies the end of flags. All arguments after `--` are treated as positional arguments: `:open -- -a.txt` opens a file called `-a.txt`.
## Expansions
Expansions are patterns that Helix recognizes and replaces within the command line. Helix recognizes anything starting with a percent token (`%`) as an expansion, for example `%sh{echo hi!}`. Expansions are particularly useful when used in commands like `:echo` or `:noop` for executing simple scripts. For example:
```toml
[keys.normal]
# Print the current line's git blame information to the statusline.
space.B = ":echo %sh{git blame -L %{cursor_line},+1 %{buffer_name}}"
```
Expansions take the form `%[<kind>]<open><contents><close>`. In `%sh{echo hi!}`, for example, the kind is `sh` - the shell expansion - and the contents are "echo hi!", with `{` and `}` acting as opening and closing delimiters. The following open/close characters are recognized as expansion delimiter pairs: `(`/`)`, `[`/`]`, `{`/`}` and `<`/`>`. Plus the single characters `'`, `"` or `|` may be used instead: `%{cursor_line}` is equivalent to `%<cursor_line>`, `%[cursor_line]` or `%|cursor_line|`.
To escape a percent character instead of treating it as an expansion, use two percent characters consecutively. To execute a shell command like `date -u +'%Y-%m-%d'`, double the percent characters: `:echo %sh{date -u +'%%Y-%%m-%%d'}`.
When no `<kind>` is provided, Helix will expand a **variable**. For example `%{cursor_line}` can be used as in argument to insert the line number. `:echo %{cursor_line}` for instance may print `1` to the statusline.
The following variables are supported:
| Name | Description |
|--- |--- |
| `cursor_line` | The line number of the primary cursor in the currently focused document, starting at 1. |
| `cursor_column` | The column number of the primary cursor in the currently focused document, starting at 1. This is counted as the number of grapheme clusters from the start of the line rather than bytes or codepoints. |
| `buffer_name` | The relative path of the currently focused document. `[scratch]` is expanded instead for scratch buffers. |
| `line_ending` | A string containing the line ending of the currently focused document. For example on Unix systems this is usually a line-feed character (`\n`) but on Windows systems this may be a carriage-return plus a line-feed (`\r\n`). The line ending kind of the currently focused document can be inspected with the `:line-ending` command. |
Aside from editor variables, the following expansions may be used:
* Unicode `%u{..}`. The contents may contain up to six hexadecimal numbers corresponding to a Unicode codepoint value. For example `:echo %u{25CF}` prints `●` to the statusline.
* Shell `%sh{..}`. The contents are passed to the configured shell command. For example `:echo %sh{echo "20 * 5" | bc}` may print `100` on the statusline on when using a shell with `echo` and the `bc` calculator installed. Shell expansions are evaluated recursively. `%sh{echo '%{buffer_name}:%{cursor_line}'}` for example executes a command like `echo 'README.md:1'`: the variables within the `%sh{..}` expansion are evaluated before executing the shell command.
As mentioned above, double quotes can be used to surround arguments containing spaces but also support expansions within the quoted content unlike singe quotes or backticks. For example `:echo "circle: %u{25CF}"` prints `circle: ●` to the statusline while `:echo 'circle: %u{25CF}'` prints `circle: %u{25CF}`.
Note that expansions are only evaluated once the Enter key is pressed in command mode.
## Exceptions
The following commands support expansions but otherwise pass the given argument directly to the shell program without interpreting quotes:
* `:insert-output`
* `:append-output`
* `:pipe`
* `:pipe-to`
* `:run-shell-command`
For example executing `:sh echo "%{buffer_name}:%{cursor_column}"` would pass text like `echo "README.md:1"` as an argument to the shell program: the expansions are evaluated but not the quotes. As mentioned above, percent characters can be used in shell commands by doubling the percent character. To insert the output of a command like `date -u +'%Y-%m-%d'` use `:insert-output date -u +'%%Y-%%m-%%d'`.
The `:set-option` and `:toggle-option` commands use regular parsing for the first argument - the config option name - and parse the rest depending on the config option's type. `:set-option` interprets the second argument as a string for string config options and parses everything else as JSON.
`:toggle-option`'s behavior depends on the JSON type of the config option supplied as the first argument:
* Booleans: only the config option name should be provided. For example `:toggle-option auto-format` will flip the `auto-format` option.
* Strings: the rest of the command line is parsed with regular quoting rules. For example `:toggle-option indent-heuristic hybrid tree-sitter simple` cycles through "hybrid", "tree-sitter" and "simple" values on each invocation of the command.
* Numbers, arrays and objects: the rest of the command line is parsed as a stream of JSON values. For example `:toggle-option rulers [81] [51, 73]` cycles through `[81]` and `[51, 73]`.
When providing multiple values to `:toggle-option` there should be no duplicates. `:toggle-option indent-heuristic hybrid simple tree-sitter simple` for example would only toggle between "hybrid" and "tree-sitter" values.
`:lsp-workspace-command` works similarly to `:toggle-option`. The first argument (if present) is parsed according to normal rules. The rest of the line is parsed as JSON values. Unlike `:toggle-option`, string arguments for a command must be quoted. For example `:lsp-workspace-command lsp.Command "foo" "bar"`.

2
book/src/editor.md
View file

@ -53,6 +53,8 @@
| `workspace-lsp-roots` | Directories relative to the workspace root that are treated as LSP roots. Should only be set in `.helix/config.toml` | `[]` |
| `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` |
| `insert-final-newline` | Whether to automatically insert a trailing line-ending on write if missing | `true` |
| `trim-final-newlines` | Whether to automatically remove line-endings after the final one on write | `false` |
| `trim-trailing-whitespace` | Whether to automatically remove whitespace preceding line endings on write | `false` |
| `popup-border` | Draw border around `popup`, `menu`, `all`, or `none` | `none` |
| `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`
| `jump-label-alphabet` | The characters that are used to generate two character jump labels. Characters at the start of the alphabet are used first. | `"abcdefghijklmnopqrstuvwxyz"`

13
book/src/generated/lang-support.md
View file

@ -4,7 +4,7 @@
| adl | ✓ | ✓ | ✓ | |
| agda | ✓ | | | |
| amber | ✓ | | | |
| astro | ✓ | | | |
| astro | ✓ | | | `astro-ls` |
| awk | ✓ | ✓ | | `awk-language-server` |
| bash | ✓ | ✓ | ✓ | `bash-language-server` |
| bass | ✓ | | | `bass` |
@ -134,6 +134,7 @@
| log | ✓ | | | |
| lpf | ✓ | | | |
| lua | ✓ | ✓ | ✓ | `lua-language-server` |
| mail | ✓ | ✓ | | |
| make | ✓ | | ✓ | |
| markdoc | ✓ | | | `markdoc-ls` |
| markdown | ✓ | | | `marksman`, `markdown-oxide` |
@ -168,14 +169,14 @@
| php | ✓ | ✓ | ✓ | `intelephense` |
| php-only | ✓ | | | |
| pkgbuild | ✓ | ✓ | ✓ | `termux-language-server`, `bash-language-server` |
| pkl | ✓ | | ✓ | |
| pkl | ✓ | | ✓ | `pkl-lsp` |
| po | ✓ | ✓ | | |
| pod | ✓ | | | |
| ponylang | ✓ | ✓ | ✓ | |
| powershell | ✓ | | | |
| prisma | ✓ | ✓ | | `prisma-language-server` |
| prolog | | | | `swipl` |
| protobuf | ✓ | ✓ | ✓ | `bufls`, `pb` |
| protobuf | ✓ | ✓ | ✓ | `buf`, `pb`, `protols` |
| prql | ✓ | | | |
| purescript | ✓ | ✓ | | `purescript-language-server` |
| python | ✓ | ✓ | ✓ | `ruff`, `jedi-language-server`, `pylsp` |
@ -202,11 +203,12 @@
| sml | ✓ | | | |
| snakemake | ✓ | | ✓ | `pylsp` |
| solidity | ✓ | ✓ | | `solc` |
| sourcepawn | ✓ | ✓ | | `sourcepawn-studio` |
| spade | ✓ | | ✓ | `spade-language-server` |
| spicedb | ✓ | | | |
| sql | ✓ | ✓ | | |
| sshclientconfig | ✓ | | | |
| starlark | ✓ | ✓ | | |
| starlark | ✓ | ✓ | | `starpls` |
| strace | ✓ | | | |
| supercollider | ✓ | | | |
| svelte | ✓ | | ✓ | `svelteserver` |
@ -223,6 +225,7 @@
| textproto | ✓ | ✓ | ✓ | |
| tfvars | ✓ | | ✓ | `terraform-ls` |
| thrift | ✓ | | | |
| tlaplus | ✓ | | | |
| todotxt | ✓ | | | |
| toml | ✓ | ✓ | | `taplo` |
| tsq | ✓ | | | `ts_query_ls` |
@ -244,7 +247,7 @@
| wast | ✓ | | | |
| wat | ✓ | | | `wat_server` |
| webc | ✓ | | | |
| wgsl | ✓ | | | `wgsl_analyzer` |
| wgsl | ✓ | | | `wgsl-analyzer` |
| wit | ✓ | | ✓ | |
| wren | ✓ | ✓ | ✓ | |
| xit | ✓ | | | |

5
book/src/generated/typable-cmd.md
View file

@ -67,10 +67,9 @@
| `:goto`, `:g` | Goto line number. |
| `:set-language`, `:lang` | Set the language of current buffer (show current language if no value specified). |
| `:set-option`, `:set` | Set a config option at runtime.<br>For example to disable smart case search, use `:set search.smart-case false`. |
| `:toggle-option`, `:toggle` | Toggle a boolean config option at runtime.<br>For example to toggle smart case search, use `:toggle search.smart-case`. |
| `:toggle-option`, `:toggle` | Toggle a config option at runtime.<br>For example to toggle smart case search, use `:toggle search.smart-case`. |
| `:get-option`, `:get` | Get the current value of a config option. |
| `:sort` | Sort ranges in selection. |
| `:rsort` | Sort ranges in selection in reverse order. |
| `:reflow` | Hard-wrap the current selection of lines to a given width. |
| `:tree-sitter-subtree`, `:ts-subtree` | Display the smallest tree-sitter subtree that spans the primary selection, primarily for debugging queries. |
| `:config-reload` | Refresh user config. |
@ -88,3 +87,5 @@
| `:move`, `:mv` | Move the current buffer and its corresponding file to a different path |
| `:yank-diagnostic` | Yank diagnostic(s) under primary cursor to register, or clipboard by default |
| `:read`, `:r` | Load a file into buffer |
| `:echo` | Prints the given arguments to the statusline. |
| `:noop` | Does nothing. |

3
book/src/install.md
View file

@ -1,6 +1,7 @@
# Installing Helix
To install Helix, follow the instructions specific to your operating system.
The typical way to install Helix is via [your operating system's package manager](./package-managers.md).
Note that:
- To get the latest nightly version of Helix, you need to

90
default.nix
View file

@ -1,8 +1,84 @@
# Flake's default package for non-flake-enabled nix instances
let
compat = builtins.fetchTarball {
url = "https://github.com/edolstra/flake-compat/archive/b4a34015c698c7793d592d66adbab377907a2be8.tar.gz";
sha256 = "sha256:1qc703yg0babixi6wshn5wm2kgl5y1drcswgszh4xxzbrwkk9sv7";
};
{
lib,
rustPlatform,
callPackage,
runCommand,
installShellFiles,
git,
gitRev ? null,
...
}: let
fs = lib.fileset;
src = fs.difference (fs.gitTracked ./.) (fs.unions [
./.envrc
./rustfmt.toml
./screenshot.png
./book
./docs
./runtime
./flake.lock
(fs.fileFilter (file: lib.strings.hasInfix ".git" file.name) ./.)
(fs.fileFilter (file: file.hasExt "svg") ./.)
(fs.fileFilter (file: file.hasExt "md") ./.)
(fs.fileFilter (file: file.hasExt "nix") ./.)
]);
# Next we actually need to build the grammars and the runtime directory
# that they reside in. It is built by calling the derivation in the
# grammars.nix file, then taking the runtime directory in the git repo
# and hooking symlinks up to it.
grammars = callPackage ./grammars.nix {};
runtimeDir = runCommand "helix-runtime" {} ''
mkdir -p $out
ln -s ${./runtime}/* $out
rm -r $out/grammars
ln -s ${grammars} $out/grammars
'';
in
(import compat {src = ./.;}).defaultNix
rustPlatform.buildRustPackage (self: {
cargoLock = {
lockFile = ./Cargo.lock;
# This is not allowed in nixpkgs but is very convenient here: it allows us to
# avoid specifying `outputHashes` here for any git dependencies we might take
# on temporarily.
allowBuiltinFetchGit = true;
};
nativeBuildInputs = [
installShellFiles
git
];
buildType = "release";
name = with builtins; (fromTOML (readFile ./helix-term/Cargo.toml)).package.name;
src = fs.toSource {
root = ./.;
fileset = src;
};
# Helix attempts to reach out to the network and get the grammars. Nix doesn't allow this.
HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
# So Helix knows what rev it is.
HELIX_NIX_BUILD_REV = gitRev;
doCheck = false;
strictDeps = true;
# Sets the Helix runtime dir to the grammars
env.HELIX_DEFAULT_RUNTIME = "${runtimeDir}";
# Get all the application stuff in the output directory.
postInstall = ''
mkdir -p $out/lib
installShellCompletion ${./contrib/completion}/hx.{bash,fish,zsh}
mkdir -p $out/share/{applications,icons/hicolor/{256x256,scalable}/apps}
cp ${./contrib/Helix.desktop} $out/share/applications
cp ${./logo.svg} $out/share/icons/hicolor/scalable/apps/helix.svg
cp ${./contrib/helix.png} $out/share/icons/hicolor/256x256/apps
'';
meta.mainProgram = "hx";
})

28
flake.lock generated
View file

@ -1,20 +1,5 @@
{
"nodes": {
"crane": {
"locked": {
"lastModified": 1737563566,
"narHash": "sha256-GLJvkOG29XCynQm8XWPyykMRqIhxKcBARVu7Ydrz02M=",
"owner": "ipetkov",
"repo": "crane",
"rev": "849376434956794ebc7a6b487d31aace395392ba",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
@ -35,11 +20,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1728018373,
"narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
"lastModified": 1740560979,
"narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
"rev": "5135c59491985879812717f4c9fea69604e7f26f",
"type": "github"
},
"original": {
@ -51,7 +36,6 @@
},
"root": {
"inputs": {
"crane": "crane",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay"
@ -64,11 +48,11 @@
]
},
"locked": {
"lastModified": 1737599167,
"narHash": "sha256-S2rHCrQWCDVp63XxL/AQbGr1g5M8Zx14C7Jooa4oM8o=",
"lastModified": 1740623427,
"narHash": "sha256-3SdPQrZoa4odlScFDUHd4CUPQ/R1gtH4Mq9u8CBiK8M=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "38374302ae9edf819eac666d1f276d62c712dd06",
"rev": "d342e8b5fd88421ff982f383c853f0fc78a847ab",
"type": "github"
},
"original": {

206
flake.nix
View file

@ -8,183 +8,79 @@
url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs";
};
crane.url = "github:ipetkov/crane";
};
outputs = {
self,
nixpkgs,
crane,
flake-utils,
rust-overlay,
...
}:
}: let
gitRev = self.rev or self.dirtyRev or null;
in
flake-utils.lib.eachDefaultSystem (system: let
pkgs = import nixpkgs {
inherit system;
overlays = [(import rust-overlay)];
};
mkRootPath = rel:
builtins.path {
path = "${toString ./.}/${rel}";
name = rel;
};
filteredSource = let
pathsToIgnore = [
".envrc"
".ignore"
".github"
".gitignore"
"logo_dark.svg"
"logo_light.svg"
"rust-toolchain.toml"
"rustfmt.toml"
"runtime"
"screenshot.png"
"book"
"docs"
"README.md"
"CHANGELOG.md"
"shell.nix"
"default.nix"
"grammars.nix"
"flake.nix"
"flake.lock"
];
ignorePaths = path: type: let
inherit (nixpkgs) lib;
# split the nix store path into its components
components = lib.splitString "/" path;
# drop off the `/nix/hash-source` section from the path
relPathComponents = lib.drop 4 components;
# reassemble the path components
relPath = lib.concatStringsSep "/" relPathComponents;
in
lib.all (p: ! (lib.hasPrefix p relPath)) pathsToIgnore;
in
builtins.path {
name = "helix-source";
path = toString ./.;
# filter out unnecessary paths
filter = ignorePaths;
};
makeOverridableHelix = old: config: let
grammars = pkgs.callPackage ./grammars.nix config;
runtimeDir = pkgs.runCommand "helix-runtime" {} ''
mkdir -p $out
ln -s ${mkRootPath "runtime"}/* $out
rm -r $out/grammars
ln -s ${grammars} $out/grammars
'';
helix-wrapped =
pkgs.runCommand
old.name
{
inherit (old) pname version;
meta = old.meta or {};
passthru =
(old.passthru or {})
// {
unwrapped = old;
};
nativeBuildInputs = [pkgs.makeWrapper];
makeWrapperArgs = config.makeWrapperArgs or [];
}
''
cp -rs --no-preserve=mode,ownership ${old} $out
wrapProgram "$out/bin/hx" ''${makeWrapperArgs[@]} --set HELIX_RUNTIME "${runtimeDir}"
'';
in
helix-wrapped
// {
override = makeOverridableHelix old;
passthru =
helix-wrapped.passthru
// {
wrapper = old: makeOverridableHelix old config;
};
};
stdenv =
if pkgs.stdenv.isLinux
then pkgs.stdenv
else pkgs.clangStdenv;
rustFlagsEnv = pkgs.lib.optionalString stdenv.isLinux "-C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment --cfg tokio_unstable";
rustToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
craneLibMSRV = (crane.mkLib pkgs).overrideToolchain rustToolchain;
craneLibStable = (crane.mkLib pkgs).overrideToolchain pkgs.pkgsBuildHost.rust-bin.stable.latest.default;
commonArgs = {
inherit stdenv;
inherit (craneLibMSRV.crateNameFromCargoToml {cargoToml = ./helix-term/Cargo.toml;}) pname;
inherit (craneLibMSRV.crateNameFromCargoToml {cargoToml = ./Cargo.toml;}) version;
src = filteredSource;
# disable fetching and building of tree-sitter grammars in the helix-term build.rs
HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
buildInputs = [stdenv.cc.cc.lib];
nativeBuildInputs = [pkgs.installShellFiles];
# disable tests
doCheck = false;
meta.mainProgram = "hx";
# Get Helix's MSRV toolchain to build with by default.
msrvToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
msrvPlatform = pkgs.makeRustPlatform {
cargo = msrvToolchain;
rustc = msrvToolchain;
};
cargoArtifacts = craneLibMSRV.buildDepsOnly commonArgs;
in {
packages = {
helix-unwrapped = craneLibStable.buildPackage (commonArgs
// {
cargoArtifacts = craneLibStable.buildDepsOnly commonArgs;
postInstall = ''
mkdir -p $out/share/applications $out/share/icons/hicolor/scalable/apps $out/share/icons/hicolor/256x256/apps
cp contrib/Helix.desktop $out/share/applications
cp logo.svg $out/share/icons/hicolor/scalable/apps/helix.svg
cp contrib/helix.png $out/share/icons/hicolor/256x256/apps
installShellCompletion contrib/completion/hx.{bash,fish,zsh}
'';
# set git revision for nix flake builds, see 'git_hash' in helix-loader/build.rs
HELIX_NIX_BUILD_REV = self.rev or self.dirtyRev or null;
});
helix = makeOverridableHelix self.packages.${system}.helix-unwrapped {};
default = self.packages.${system}.helix;
packages = rec {
helix = pkgs.callPackage ./default.nix {inherit gitRev;};
/**
The default Helix build. Uses the latest stable Rust toolchain, and unstable
nixpkgs.
The build inputs can be overriden with the following:
packages.${system}.default.override { rustPlatform = newPlatform; };
Overriding a derivation attribute can be done as well:
packages.${system}.default.overrideAttrs { buildType = "debug"; };
*/
default = helix;
};
checks = {
# Build the crate itself
inherit (self.packages.${system}) helix;
clippy = craneLibMSRV.cargoClippy (commonArgs
// {
inherit cargoArtifacts;
cargoClippyExtraArgs = "--all-targets -- --deny warnings";
});
fmt = craneLibMSRV.cargoFmt commonArgs;
doc = craneLibMSRV.cargoDoc (commonArgs
// {
inherit cargoArtifacts;
});
test = craneLibMSRV.cargoTest (commonArgs
// {
inherit cargoArtifacts;
});
checks.helix = self.outputs.packages.${system}.helix.override {
buildType = "debug";
rustPlatform = msrvPlatform;
};
devShells.default = pkgs.mkShell {
inputsFrom = builtins.attrValues self.checks.${system};
nativeBuildInputs = with pkgs;
[lld_13 cargo-flamegraph rust-analyzer]
++ (lib.optional (stdenv.isx86_64 && stdenv.isLinux) pkgs.cargo-tarpaulin)
++ (lib.optional stdenv.isLinux pkgs.lldb)
++ (lib.optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.CoreFoundation);
shellHook = ''
export HELIX_RUNTIME="$PWD/runtime"
export RUST_BACKTRACE="1"
export RUSTFLAGS="''${RUSTFLAGS:-""} ${rustFlagsEnv}"
'';
};
# Devshell behavior is preserved.
devShells.default = let
commonRustFlagsEnv = "-C link-arg=-fuse-ld=lld -C target-cpu=native --cfg tokio_unstable";
platformRustFlagsEnv = pkgs.lib.optionalString pkgs.stdenv.isLinux "-Clink-arg=-Wl,--no-rosegment";
in
pkgs.mkShell
{
inputsFrom = [self.checks.${system}.helix];
nativeBuildInputs = with pkgs;
[
lld
cargo-flamegraph
rust-bin.nightly.latest.rust-analyzer
]
++ (lib.optional (stdenv.isx86_64 && stdenv.isLinux) cargo-tarpaulin)
++ (lib.optional stdenv.isLinux lldb)
++ (lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation);
shellHook = ''
export RUST_BACKTRACE="1"
export RUSTFLAGS="''${RUSTFLAGS:-""} ${commonRustFlagsEnv} ${platformRustFlagsEnv}"
'';
};
})
// {
overlays.default = final: prev: {
inherit (self.packages.${final.system}) helix;
helix = final.callPackage ./default.nix {inherit gitRev;};
};
};

32
grammars.nix
View file

@ -32,10 +32,10 @@
# If `use-grammars.except` is set, use all other grammars.
# Otherwise use all grammars.
useGrammar = grammar:
if languagesConfig?use-grammars.only then
builtins.elem grammar.name languagesConfig.use-grammars.only
else if languagesConfig?use-grammars.except then
!(builtins.elem grammar.name languagesConfig.use-grammars.except)
if languagesConfig ? use-grammars.only
then builtins.elem grammar.name languagesConfig.use-grammars.only
else if languagesConfig ? use-grammars.except
then !(builtins.elem grammar.name languagesConfig.use-grammars.except)
else true;
grammarsToUse = builtins.filter useGrammar languagesConfig.grammar;
gitGrammars = builtins.filter isGitGrammar grammarsToUse;
@ -66,10 +66,10 @@
version = grammar.source.rev;
src = source;
sourceRoot = if builtins.hasAttr "subpath" grammar.source then
"source/${grammar.source.subpath}"
else
"source";
sourceRoot =
if builtins.hasAttr "subpath" grammar.source
then "source/${grammar.source.subpath}"
else "source";
dontConfigure = true;
@ -116,15 +116,19 @@
'';
};
grammarsToBuild = builtins.filter includeGrammarIf gitGrammars;
builtGrammars = builtins.map (grammar: {
inherit (grammar) name;
value = buildGrammar grammar;
}) grammarsToBuild;
builtGrammars =
builtins.map (grammar: {
inherit (grammar) name;
value = buildGrammar grammar;
})
grammarsToBuild;
extensibleGrammars =
lib.makeExtensible (self: builtins.listToAttrs builtGrammars);
overlaidGrammars = lib.pipe extensibleGrammars
overlaidGrammars =
lib.pipe extensibleGrammars
(builtins.map (overlay: grammar: grammar.extend overlay) grammarOverlays);
grammarLinks = lib.mapAttrsToList
grammarLinks =
lib.mapAttrsToList
(name: artifact: "ln -s ${artifact}/${name}.so $out/${name}.so")
(lib.filterAttrs (n: v: lib.isDerivation v) overlaidGrammars);
in

12
helix-core/Cargo.toml
View file

@ -33,7 +33,7 @@ unicode-width = "=0.1.12"
unicode-general-category = "1.0"
slotmap.workspace = true
tree-sitter.workspace = true
once_cell = "1.20"
once_cell = "1.21"
arc-swap = "1"
regex = "1"
bitflags.workspace = true
@ -53,13 +53,13 @@ encoding_rs = "0.8"
chrono = { version = "0.4", default-features = false, features = ["alloc", "std"] }
textwrap = "0.16.1"
textwrap = "0.16.2"
nucleo.workspace = true
parking_lot = "0.12"
globset = "0.4.15"
regex-cursor = "0.1.4"
parking_lot.workspace = true
globset = "0.4.16"
regex-cursor = "0.1.5"
[dev-dependencies]
quickcheck = { version = "1", default-features = false }
indoc = "2.0.5"
indoc = "2.0.6"

1270
helix-core/src/command_line.rs Normal file
View file

File diff suppressed because it is too large Load diff

2
helix-core/src/lib.rs
View file

@ -3,6 +3,7 @@ pub use encoding_rs as encoding;
pub mod auto_pairs;
pub mod case_conversion;
pub mod chars;
pub mod command_line;
pub mod comment;
pub mod completion;
pub mod config;
@ -22,7 +23,6 @@ pub mod object;
mod position;
pub mod search;
pub mod selection;
pub mod shellwords;
pub mod snippets;
pub mod surround;
pub mod syntax;

350
helix-core/src/shellwords.rs
View file

@ -1,350 +0,0 @@
use std::borrow::Cow;
/// Auto escape for shellwords usage.
pub fn escape(input: Cow<str>) -> Cow<str> {
if !input.chars().any(|x| x.is_ascii_whitespace()) {
input
} else if cfg!(unix) {
Cow::Owned(input.chars().fold(String::new(), |mut buf, c| {
if c.is_ascii_whitespace() {
buf.push('\\');
}
buf.push(c);
buf
}))
} else {
Cow::Owned(format!("\"{}\"", input))
}
}
enum State {
OnWhitespace,
Unquoted,
UnquotedEscaped,
Quoted,
QuoteEscaped,
Dquoted,
DquoteEscaped,
}
pub struct Shellwords<'a> {
state: State,
/// Shellwords where whitespace and escapes has been resolved.
words: Vec<Cow<'a, str>>,
/// The parts of the input that are divided into shellwords. This can be
/// used to retrieve the original text for a given word by looking up the
/// same index in the Vec as the word in `words`.
parts: Vec<&'a str>,
}
impl<'a> From<&'a str> for Shellwords<'a> {
fn from(input: &'a str) -> Self {
use State::*;
let mut state = Unquoted;
let mut words = Vec::new();
let mut parts = Vec::new();
let mut escaped = String::with_capacity(input.len());
let mut part_start = 0;
let mut unescaped_start = 0;
let mut end = 0;
for (i, c) in input.char_indices() {
state = match state {
OnWhitespace => match c {
'"' => {
end = i;
Dquoted
}
'\'' => {
end = i;
Quoted
}
'\\' => {
if cfg!(unix) {
escaped.push_str(&input[unescaped_start..i]);
unescaped_start = i + 1;
UnquotedEscaped
} else {
OnWhitespace
}
}
c if c.is_ascii_whitespace() => {
end = i;
OnWhitespace
}
_ => Unquoted,
},
Unquoted => match c {
'\\' => {
if cfg!(unix) {
escaped.push_str(&input[unescaped_start..i]);
unescaped_start = i + 1;
UnquotedEscaped
} else {
Unquoted
}
}
c if c.is_ascii_whitespace() => {
end = i;
OnWhitespace
}
_ => Unquoted,
},
UnquotedEscaped => Unquoted,
Quoted => match c {
'\\' => {
if cfg!(unix) {
escaped.push_str(&input[unescaped_start..i]);
unescaped_start = i + 1;
QuoteEscaped
} else {
Quoted
}
}
'\'' => {
end = i;
OnWhitespace
}
_ => Quoted,
},
QuoteEscaped => Quoted,
Dquoted => match c {
'\\' => {
if cfg!(unix) {
escaped.push_str(&input[unescaped_start..i]);
unescaped_start = i + 1;
DquoteEscaped
} else {
Dquoted
}
}
'"' => {
end = i;
OnWhitespace
}
_ => Dquoted,
},
DquoteEscaped => Dquoted,
};
let c_len = c.len_utf8();
if i == input.len() - c_len && end == 0 {
end = i + c_len;
}
if end > 0 {
let esc_trim = escaped.trim();
let inp = &input[unescaped_start..end];
if !(esc_trim.is_empty() && inp.trim().is_empty()) {
if esc_trim.is_empty() {
words.push(inp.into());
parts.push(inp);
} else {
words.push([escaped, inp.into()].concat().into());
parts.push(&input[part_start..end]);
escaped = "".to_string();
}
}
unescaped_start = i + 1;
part_start = i + 1;
end = 0;
}
}
debug_assert!(words.len() == parts.len());
Self {
state,
words,
parts,
}
}
}
impl<'a> Shellwords<'a> {
/// Checks that the input ends with a whitespace character which is not escaped.
///
/// # Examples
///
/// ```rust
/// use helix_core::shellwords::Shellwords;
/// assert_eq!(Shellwords::from(" ").ends_with_whitespace(), true);
/// assert_eq!(Shellwords::from(":open ").ends_with_whitespace(), true);
/// assert_eq!(Shellwords::from(":open foo.txt ").ends_with_whitespace(), true);
/// assert_eq!(Shellwords::from(":open").ends_with_whitespace(), false);
/// #[cfg(unix)]
/// assert_eq!(Shellwords::from(":open a\\ ").ends_with_whitespace(), false);
/// #[cfg(unix)]
/// assert_eq!(Shellwords::from(":open a\\ b.txt").ends_with_whitespace(), false);
/// ```
pub fn ends_with_whitespace(&self) -> bool {
matches!(self.state, State::OnWhitespace)
}
/// Returns the list of shellwords calculated from the input string.
pub fn words(&self) -> &[Cow<'a, str>] {
&self.words
}
/// Returns a list of strings which correspond to [`Self::words`] but represent the original
/// text in the input string - including escape characters - without separating whitespace.
pub fn parts(&self) -> &[&'a str] {
&self.parts
}
}
#[cfg(test)]
mod test {
use super::*;
#[test]
#[cfg(windows)]
fn test_normal() {
let input = r#":o single_word twó wörds \three\ \"with\ escaping\\"#;
let shellwords = Shellwords::from(input);
let result = shellwords.words().to_vec();
let expected = vec![
Cow::from(":o"),
Cow::from("single_word"),
Cow::from("twó"),
Cow::from("wörds"),
Cow::from("\\three\\"),
Cow::from("\\"),
Cow::from("with\\ escaping\\\\"),
];
// TODO test is_owned and is_borrowed, once they get stabilized.
assert_eq!(expected, result);
}
#[test]
#[cfg(unix)]
fn test_normal() {
let input = r#":o single_word twó wörds \three\ \"with\ escaping\\"#;
let shellwords = Shellwords::from(input);
let result = shellwords.words().to_vec();
let expected = vec![
Cow::from(":o"),
Cow::from("single_word"),
Cow::from("twó"),
Cow::from("wörds"),
Cow::from(r#"three "with escaping\"#),
];
// TODO test is_owned and is_borrowed, once they get stabilized.
assert_eq!(expected, result);
}
#[test]
#[cfg(unix)]
fn test_quoted() {
let quoted =
r#":o 'single_word' 'twó wörds' '' ' ''\three\' \"with\ escaping\\' 'quote incomplete"#;
let shellwords = Shellwords::from(quoted);
let result = shellwords.words().to_vec();
let expected = vec![
Cow::from(":o"),
Cow::from("single_word"),
Cow::from("twó wörds"),
Cow::from(r#"three' "with escaping\"#),
Cow::from("quote incomplete"),
];
assert_eq!(expected, result);
}
#[test]
#[cfg(unix)]
fn test_dquoted() {
let dquoted = r#":o "single_word" "twó wörds" "" " ""\three\' \"with\ escaping\\" "dquote incomplete"#;
let shellwords = Shellwords::from(dquoted);
let result = shellwords.words().to_vec();
let expected = vec![
Cow::from(":o"),
Cow::from("single_word"),
Cow::from("twó wörds"),
Cow::from(r#"three' "with escaping\"#),
Cow::from("dquote incomplete"),
];
assert_eq!(expected, result);
}
#[test]
#[cfg(unix)]
fn test_mixed() {
let dquoted = r#":o single_word 'twó wörds' "\three\' \"with\ escaping\\""no space before"'and after' $#%^@ "%^&(%^" ')(*&^%''a\\\\\b' '"#;
let shellwords = Shellwords::from(dquoted);
let result = shellwords.words().to_vec();
let expected = vec![
Cow::from(":o"),
Cow::from("single_word"),
Cow::from("twó wörds"),
Cow::from("three' \"with escaping\\"),
Cow::from("no space before"),
Cow::from("and after"),
Cow::from("$#%^@"),
Cow::from("%^&(%^"),
Cow::from(")(*&^%"),
Cow::from(r#"a\\b"#),
//last ' just changes to quoted but since we dont have anything after it, it should be ignored
];
assert_eq!(expected, result);
}
#[test]
fn test_lists() {
let input =
r#":set statusline.center ["file-type","file-encoding"] '["list", "in", "quotes"]'"#;
let shellwords = Shellwords::from(input);
let result = shellwords.words().to_vec();
let expected = vec![
Cow::from(":set"),
Cow::from("statusline.center"),
Cow::from(r#"["file-type","file-encoding"]"#),
Cow::from(r#"["list", "in", "quotes"]"#),
];
assert_eq!(expected, result);
}
#[test]
#[cfg(unix)]
fn test_escaping_unix() {
assert_eq!(escape("foobar".into()), Cow::Borrowed("foobar"));
assert_eq!(escape("foo bar".into()), Cow::Borrowed("foo\\ bar"));
assert_eq!(escape("foo\tbar".into()), Cow::Borrowed("foo\\\tbar"));
}
#[test]
#[cfg(windows)]
fn test_escaping_windows() {
assert_eq!(escape("foobar".into()), Cow::Borrowed("foobar"));
assert_eq!(escape("foo bar".into()), Cow::Borrowed("\"foo bar\""));
}
#[test]
#[cfg(unix)]
fn test_parts() {
assert_eq!(Shellwords::from(":o a").parts(), &[":o", "a"]);
assert_eq!(Shellwords::from(":o a\\ ").parts(), &[":o", "a\\ "]);
}
#[test]
#[cfg(windows)]
fn test_parts() {
assert_eq!(Shellwords::from(":o a").parts(), &[":o", "a"]);
assert_eq!(Shellwords::from(":o a\\ ").parts(), &[":o", "a\\"]);
}
#[test]
fn test_multibyte_at_end() {
assert_eq!(Shellwords::from("𒀀").parts(), &["𒀀"]);
assert_eq!(
Shellwords::from(":sh echo 𒀀").parts(),
&[":sh", "echo", "𒀀"]
);
assert_eq!(
Shellwords::from(":sh echo 𒀀 hello world𒀀").parts(),
&[":sh", "echo", "𒀀", "hello", "world𒀀"]
);
}
}

4
helix-event/Cargo.toml
View file

@ -18,8 +18,8 @@ tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "p
# the event registry is essentially read only but must be an rwlock so we can
# setup new events on initialization, hardware-lock-elision hugely benefits this case
# as it essentially makes the lock entirely free as long as there is no writes
parking_lot = { version = "0.12", features = ["hardware-lock-elision"] }
once_cell = "1.20"
parking_lot = { workspace = true, features = ["hardware-lock-elision"] }
once_cell = "1.21"
anyhow = "1"
log = "0.4"

4
helix-loader/Cargo.toml
View file

@ -20,9 +20,9 @@ helix-stdx = { path = "../helix-stdx" }
anyhow = "1"
serde = { version = "1.0", features = ["derive"] }
toml = "0.8"
etcetera = "0.8"
etcetera = "0.10"
tree-sitter.workspace = true
once_cell = "1.20"
once_cell = "1.21"
log = "0.4"
# TODO: these two should be on !wasm32 only

4
helix-lsp-types/Cargo.toml
View file

@ -22,8 +22,8 @@ license = "MIT"
[dependencies]
bitflags.workspace = true
serde = { version = "1.0.217", features = ["derive"] }
serde_json = "1.0.138"
serde = { version = "1.0.219", features = ["derive"] }
serde_json = "1.0.140"
url = {version = "2.5.4", features = ["serde"]}
[features]

6
helix-lsp/Cargo.toml
View file

@ -21,13 +21,13 @@ helix-lsp-types = { path = "../helix-lsp-types" }
anyhow = "1.0"
futures-executor = "0.3"
futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
globset = "0.4.15"
globset = "0.4.16"
log = "0.4"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
tokio = { version = "1.43", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
tokio = { version = "1.44", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
tokio-stream = "0.1.17"
parking_lot = "0.12.3"
parking_lot.workspace = true
arc-swap = "1"
slotmap.workspace = true
thiserror.workspace = true

5
helix-lsp/src/client.rs
View file

@ -1119,7 +1119,7 @@ impl Client {
text_document: lsp::TextDocumentIdentifier,
position: lsp::Position,
work_done_token: Option<lsp::ProgressToken>,
) -> Option<impl Future<Output = Result<Value>>> {
) -> Option<impl Future<Output = Result<Option<lsp::Hover>>>> {
let capabilities = self.capabilities.get().unwrap();
// Return early if the server does not support hover.
@ -1140,7 +1140,8 @@ impl Client {
// lsp::SignatureHelpContext
};
Some(self.call::<lsp::request::HoverRequest>(params))
let res = self.call::<lsp::request::HoverRequest>(params);
Some(async move { Ok(serde_json::from_value(res.await?)?) })
}
// formatting

3
helix-lsp/src/lib.rs
View file

@ -1032,7 +1032,8 @@ mod tests {
let mut source = Rope::from_str("[\n\"🇺🇸\",\n\"🎄\",\n]");
let transaction = generate_transaction_from_edits(&source, edits, OffsetEncoding::Utf8);
let transaction = generate_transaction_from_edits(&source, edits, OffsetEncoding::Utf16);
assert!(transaction.apply(&mut source));
assert_eq!(source, "[\n \"🇺🇸\",\n \"🎄\",\n]");
}
}

5
helix-lsp/src/transport.rs
View file

@ -223,10 +223,7 @@ impl Transport {
language_server_name: &str,
) -> Result<()> {
let (id, result) = match output {
jsonrpc::Output::Success(jsonrpc::Success { id, result, .. }) => {
info!("{language_server_name} <- {}", result);
(id, Ok(result))
}
jsonrpc::Output::Success(jsonrpc::Success { id, result, .. }) => (id, Ok(result)),
jsonrpc::Output::Failure(jsonrpc::Failure { id, error, .. }) => {
error!("{language_server_name} <- {error}");
(id, Err(error.into()))

8
helix-stdx/Cargo.toml
View file

@ -13,12 +13,12 @@ homepage.workspace = true
[dependencies]
dunce = "1.0"
etcetera = "0.8"
etcetera = "0.10"
ropey.workspace = true
which = "7.0"
regex-cursor = "0.1.4"
regex-cursor = "0.1.5"
bitflags.workspace = true
once_cell = "1.20"
once_cell = "1.21"
regex-automata = "0.4.9"
unicode-segmentation.workspace = true
@ -26,7 +26,7 @@ unicode-segmentation.workspace = true
windows-sys = { version = "0.59", features = ["Win32_Foundation", "Win32_Security", "Win32_Security_Authorization", "Win32_Storage_FileSystem", "Win32_System_Threading"] }
[target.'cfg(unix)'.dependencies]
rustix = { version = "0.38", features = ["fs"] }
rustix = { version = "1.0", features = ["fs"] }
[dev-dependencies]
tempfile.workspace = true

4
helix-stdx/src/faccess.rs
View file

@ -51,8 +51,8 @@ mod imp {
}
fn chown(p: &Path, uid: Option<u32>, gid: Option<u32>) -> io::Result<()> {
let uid = uid.map(|n| unsafe { rustix::fs::Uid::from_raw(n) });
let gid = gid.map(|n| unsafe { rustix::fs::Gid::from_raw(n) });
let uid = uid.map(rustix::fs::Uid::from_raw);
let gid = gid.map(rustix::fs::Gid::from_raw);
rustix::fs::chown(p, uid, gid)?;
Ok(())
}

8
helix-term/Cargo.toml
View file

@ -51,7 +51,7 @@ helix-vcs = { path = "../helix-vcs" }
helix-loader = { path = "../helix-loader" }
anyhow = "1"
once_cell = "1.20"
once_cell = "1.21"
tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot"] }
tui = { path = "../helix-tui", package = "helix-tui", default-features = false, features = ["crossterm"] }
@ -61,7 +61,7 @@ tokio-stream = "0.1"
futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
arc-swap = { version = "1.7.1" }
termini = "1"
indexmap = "2.7"
indexmap = "2.8"
# Logging
fern = "0.7"
@ -93,7 +93,7 @@ grep-searcher = "0.1.14"
[target.'cfg(not(windows))'.dependencies] # https://github.com/vorner/signal-hook/issues/100
signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
libc = "0.2.169"
libc = "0.2.170"
[target.'cfg(target_os = "macos")'.dependencies]
crossterm = { version = "0.28", features = ["event-stream", "use-dev-tty", "libc"] }
@ -103,6 +103,6 @@ helix-loader = { path = "../helix-loader" }
[dev-dependencies]
smallvec = "1.14"
indoc = "2.0.5"
indoc = "2.0.6"
tempfile.workspace = true
same-file = "1.0.1"

78
helix-term/src/application.rs
View file

@ -103,22 +103,6 @@ impl Application {
theme_parent_dirs.extend(helix_loader::runtime_dirs().iter().cloned());
let theme_loader = theme::Loader::new(&theme_parent_dirs);
let true_color = config.editor.true_color || crate::true_color();
let theme = config
.theme
.as_ref()
.and_then(|theme| {
theme_loader
.load(theme)
.map_err(|e| {
log::warn!("failed to load theme `{}` - {}", theme, e);
e
})
.ok()
.filter(|theme| (true_color || theme.is_16_color()))
})
.unwrap_or_else(|| theme_loader.default_theme(true_color));
#[cfg(not(feature = "integration"))]
let backend = CrosstermBackend::new(stdout(), &config.editor);
@ -139,6 +123,7 @@ impl Application {
})),
handlers,
);
Self::load_configured_theme(&mut editor, &config.load());
let keys = Box::new(Map::new(Arc::clone(&config), |config: &Config| {
&config.keys
@ -156,7 +141,7 @@ impl Application {
// If the first file is a directory, skip it and open a picker
if let Some((first, _)) = files_it.next_if(|(p, _)| p.is_dir()) {
let picker = ui::file_picker(first, &config.load().editor);
let picker = ui::file_picker(&editor, first);
compositor.push(Box::new(overlaid(picker)));
}
@ -237,8 +222,6 @@ impl Application {
.unwrap_or_else(|_| editor.new_file(Action::VerticalSplit));
}
editor.set_theme(theme);
#[cfg(windows)]
let signals = futures_util::stream::empty();
#[cfg(not(windows))]
@ -419,35 +402,13 @@ impl Application {
Ok(())
}
/// Refresh theme after config change
fn refresh_theme(&mut self, config: &Config) -> Result<(), Error> {
let true_color = config.editor.true_color || crate::true_color();
let theme = config
.theme
.as_ref()
.and_then(|theme| {
self.editor
.theme_loader
.load(theme)
.map_err(|e| {
log::warn!("failed to load theme `{}` - {}", theme, e);
e
})
.ok()
.filter(|theme| (true_color || theme.is_16_color()))
})
.unwrap_or_else(|| self.editor.theme_loader.default_theme(true_color));
self.editor.set_theme(theme);
Ok(())
}
fn refresh_config(&mut self) {
let mut refresh_config = || -> Result<(), Error> {
let default_config = Config::load_default()
.map_err(|err| anyhow::anyhow!("Failed to load config: {}", err))?;
self.refresh_language_config()?;
self.refresh_theme(&default_config)?;
// Refresh theme after config change
Self::load_configured_theme(&mut self.editor, &default_config);
self.terminal
.reconfigure(default_config.editor.clone().into())?;
// Store new config
@ -465,6 +426,37 @@ impl Application {
}
}
/// Load the theme set in configuration
fn load_configured_theme(editor: &mut Editor, config: &Config) {
let true_color = config.editor.true_color || crate::true_color();
let theme = config
.theme
.as_ref()
.and_then(|theme| {
editor
.theme_loader
.load(theme)
.map_err(|e| {
log::warn!("failed to load theme `{}` - {}", theme, e);
e
})
.ok()
.filter(|theme| {
let colors_ok = true_color || theme.is_16_color();
if !colors_ok {
log::warn!(
"loaded theme `{}` but cannot use it because true color \
support is not enabled",
theme.name()
);
}
colors_ok
})
})
.unwrap_or_else(|| editor.theme_loader.default_theme(true_color));
editor.set_theme(theme);
}
#[cfg(windows)]
// no signal handling available on windows
pub async fn handle_signals(&mut self, _signal: ()) -> bool {

108
helix-term/src/commands.rs
View file

@ -11,13 +11,16 @@ use helix_stdx::{
};
use helix_vcs::{FileChange, Hunk};
pub use lsp::*;
use tui::text::Span;
use tui::{
text::{Span, Spans},
widgets::Cell,
};
pub use typed::*;
use helix_core::{
char_idx_at_visual_offset,
chars::char_is_word,
comment,
command_line, comment,
doc_formatter::TextFormat,
encoding, find_workspace,
graphemes::{self, next_grapheme_boundary},
@ -30,7 +33,7 @@ use helix_core::{
object, pos_at_coords,
regex::{self, Regex},
search::{self, CharMatcher},
selection, shellwords, surround,
selection, surround,
syntax::{BlockCommentToken, LanguageServerFeature},
text_annotations::{Overlay, TextAnnotations},
textobject,
@ -55,7 +58,6 @@ use insert::*;
use movement::Movement;
use crate::{
args,
compositor::{self, Component, Compositor},
filter_picker_entry,
job::Callback,
@ -64,6 +66,7 @@ use crate::{
use crate::job::{self, Jobs};
use std::{
char::{ToLowercase, ToUppercase},
cmp::Ordering,
collections::{HashMap, HashSet},
error::Error,
@ -207,7 +210,7 @@ use helix_view::{align_view, Align};
pub enum MappableCommand {
Typable {
name: String,
args: Vec<String>,
args: String,
doc: String,
},
Static {
@ -242,16 +245,19 @@ impl MappableCommand {
pub fn execute(&self, cx: &mut Context) {
match &self {
Self::Typable { name, args, doc: _ } => {
let args: Vec<Cow<str>> = args.iter().map(Cow::from).collect();
if let Some(command) = typed::TYPABLE_COMMAND_MAP.get(name.as_str()) {
let mut cx = compositor::Context {
editor: cx.editor,
jobs: cx.jobs,
scroll: None,
};
if let Err(e) = (command.fun)(&mut cx, &args[..], PromptEvent::Validate) {
if let Err(e) =
typed::execute_command(&mut cx, command, args, PromptEvent::Validate)
{
cx.editor.set_error(format!("{}", e));
}
} else {
cx.editor.set_error(format!("no such command: '{name}'"));
}
}
Self::Static { fun, .. } => (fun)(cx),
@ -625,13 +631,8 @@ impl std::str::FromStr for MappableCommand {
fn from_str(s: &str) -> Result<Self, Self::Err> {
if let Some(suffix) = s.strip_prefix(':') {
let mut typable_command = suffix.split(' ').map(|arg| arg.trim());
let name = typable_command
.next()
.ok_or_else(|| anyhow!("Expected typable command name"))?;
let args = typable_command
.map(|s| s.to_owned())
.collect::<Vec<String>>();
let (name, args, _) = command_line::split(suffix);
ensure!(!name.is_empty(), "Expected typable command name");
typed::TYPABLE_COMMAND_MAP
.get(name)
.map(|cmd| {
@ -643,7 +644,7 @@ impl std::str::FromStr for MappableCommand {
MappableCommand::Typable {
name: cmd.name.to_owned(),
doc,
args,
args: args.to_string(),
}
})
.ok_or_else(|| anyhow!("No TypableCommand named '{}'", s))
@ -1341,7 +1342,7 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
let path = path::expand(&sel);
let path = &rel_path.join(path);
if path.is_dir() {
let picker = ui::file_picker(path.into(), &cx.editor.config());
let picker = ui::file_picker(cx.editor, path.into());
cx.push_layer(Box::new(overlaid(picker)));
} else if let Err(e) = cx.editor.open(path, action) {
cx.editor.set_error(format!("Open file failed: {:?}", e));
@ -1378,7 +1379,7 @@ fn open_url(cx: &mut Context, url: Url, action: Action) {
Ok(_) | Err(_) => {
let path = &rel_path.join(url.path());
if path.is_dir() {
let picker = ui::file_picker(path.into(), &cx.editor.config());
let picker = ui::file_picker(cx.editor, path.into());
cx.push_layer(Box::new(overlaid(picker)));
} else if let Err(e) = cx.editor.open(path, action) {
cx.editor.set_error(format!("Open file failed: {:?}", e));
@ -1724,17 +1725,48 @@ where
exit_select_mode(cx);
}
enum CaseSwitcher {
Upper(ToUppercase),
Lower(ToLowercase),
Keep(Option<char>),
}
impl Iterator for CaseSwitcher {
type Item = char;
fn next(&mut self) -> Option<Self::Item> {
match self {
CaseSwitcher::Upper(upper) => upper.next(),
CaseSwitcher::Lower(lower) => lower.next(),
CaseSwitcher::Keep(ch) => ch.take(),
}
}
fn size_hint(&self) -> (usize, Option<usize>) {
match self {
CaseSwitcher::Upper(upper) => upper.size_hint(),
CaseSwitcher::Lower(lower) => lower.size_hint(),
CaseSwitcher::Keep(ch) => {
let n = if ch.is_some() { 1 } else { 0 };
(n, Some(n))
}
}
}
}
impl ExactSizeIterator for CaseSwitcher {}
fn switch_case(cx: &mut Context) {
switch_case_impl(cx, |string| {
string
.chars()
.flat_map(|ch| {
if ch.is_lowercase() {
ch.to_uppercase().collect()
CaseSwitcher::Upper(ch.to_uppercase())
} else if ch.is_uppercase() {
ch.to_lowercase().collect()
CaseSwitcher::Lower(ch.to_lowercase())
} else {
vec![ch]
CaseSwitcher::Keep(Some(ch))
}
})
.collect()
@ -2404,18 +2436,42 @@ fn global_search(cx: &mut Context) {
struct GlobalSearchConfig {
smart_case: bool,
file_picker_config: helix_view::editor::FilePickerConfig,
directory_style: Style,
number_style: Style,
colon_style: Style,
}
let config = cx.editor.config();
let config = GlobalSearchConfig {
smart_case: config.search.smart_case,
file_picker_config: config.file_picker.clone(),
directory_style: cx.editor.theme.get("ui.text.directory"),
number_style: cx.editor.theme.get("constant.numeric.integer"),
colon_style: cx.editor.theme.get("punctuation"),
};
let columns = [
PickerColumn::new("path", |item: &FileResult, _| {
PickerColumn::new("path", |item: &FileResult, config: &GlobalSearchConfig| {
let path = helix_stdx::path::get_relative_path(&item.path);
format!("{}:{}", path.to_string_lossy(), item.line_num + 1).into()
let directories = path
.parent()
.filter(|p| !p.as_os_str().is_empty())
.map(|p| format!("{}{}", p.display(), std::path::MAIN_SEPARATOR))
.unwrap_or_default();
let filename = item
.path
.file_name()
.expect("global search paths are normalized (can't end in `..`)")
.to_string_lossy();
Cell::from(Spans::from(vec![
Span::styled(directories, config.directory_style),
Span::raw(filename),
Span::styled(":", config.colon_style),
Span::styled((item.line_num + 1).to_string(), config.number_style),
]))
}),
PickerColumn::hidden("contents"),
];
@ -2974,7 +3030,7 @@ fn file_picker(cx: &mut Context) {
cx.editor.set_error("Workspace directory does not exist");
return;
}
let picker = ui::file_picker(root, &cx.editor.config());
let picker = ui::file_picker(cx.editor, root);
cx.push_layer(Box::new(overlaid(picker)));
}
@ -2991,7 +3047,7 @@ fn file_picker_in_current_buffer_directory(cx: &mut Context) {
}
};
let picker = ui::file_picker(path, &cx.editor.config());
let picker = ui::file_picker(cx.editor, path);
cx.push_layer(Box::new(overlaid(picker)));
}
@ -3002,7 +3058,7 @@ fn file_picker_in_current_directory(cx: &mut Context) {
.set_error("Current working directory does not exist");
return;
}
let picker = ui::file_picker(cwd, &cx.editor.config());
let picker = ui::file_picker(cx.editor, cwd);
cx.push_layer(Box::new(overlaid(picker)));
}
@ -3325,7 +3381,7 @@ pub fn command_palette(cx: &mut Context) {
.iter()
.map(|cmd| MappableCommand::Typable {
name: cmd.name.to_owned(),
args: Vec::new(),
args: String::new(),
doc: cmd.doc.to_owned(),
}),
);

20
helix-term/src/commands/lsp.rs
View file

@ -407,6 +407,13 @@ pub fn symbol_picker(cx: &mut Context) {
ui::PickerColumn::new("name", |item: &SymbolInformationItem, _| {
item.symbol.name.as_str().into()
}),
ui::PickerColumn::new("container", |item: &SymbolInformationItem, _| {
item.symbol
.container_name
.as_deref()
.unwrap_or_default()
.into()
}),
];
let picker = Picker::new(
@ -508,6 +515,13 @@ pub fn workspace_symbol_picker(cx: &mut Context) {
item.symbol.name.as_str().into()
})
.without_filtering(),
ui::PickerColumn::new("container", |item: &SymbolInformationItem, _| {
item.symbol
.container_name
.as_deref()
.unwrap_or_default()
.into()
}),
ui::PickerColumn::new("path", |item: &SymbolInformationItem, _| {
if let Some(path) = item.location.uri.as_path() {
path::get_relative_path(path)
@ -1062,11 +1076,7 @@ pub fn hover(cx: &mut Context) {
.text_document_hover(doc.identifier(), pos, None)
.unwrap();
async move {
let json = request.await?;
let response = serde_json::from_value::<Option<lsp::Hover>>(json)?;
anyhow::Ok((server_name, response))
}
async move { anyhow::Ok((server_name, request.await?)) }
})
.collect();

1613
helix-term/src/commands/typed.rs
View file

File diff suppressed because it is too large Load diff

2
helix-term/src/handlers/completion.rs
View file

@ -57,7 +57,7 @@ async fn replace_completions(
return;
};
if handle.is_canceled() {
log::error!("dropping outdated completion response");
log::info!("dropping outdated completion response");
return;
}

6
helix-term/src/keymap.rs
View file

@ -601,11 +601,7 @@ mod tests {
MappableCommand::select_all,
MappableCommand::Typable {
name: "pipe".to_string(),
args: vec!{
"sed".to_string(),
"-E".to_string(),
"'s/\\s+$//g'".to_string()
},
args: "sed -E 's/\\s+$//g'".to_string(),
doc: "".to_string(),
},
})

3
helix-term/src/ui/editor.rs
View file

@ -176,6 +176,8 @@ impl EditorView {
);
}
Self::render_rulers(editor, doc, view, inner, surface, theme);
let primary_cursor = doc
.selection(view.id)
.primary()
@ -210,7 +212,6 @@ impl EditorView {
theme,
decorations,
);
Self::render_rulers(editor, doc, view, inner, surface, theme);
// if we're not at the edge of the screen, draw a right border
if viewport.right() != view.area.right() {

39
helix-term/src/ui/mod.rs
View file

@ -30,7 +30,7 @@ pub use spinner::{ProgressSpinners, Spinner};
pub use text::Text;
use helix_view::Editor;
use tui::text::Span;
use tui::text::{Span, Spans};
use std::path::Path;
use std::{error::Error, path::PathBuf};
@ -185,12 +185,23 @@ pub fn raw_regex_prompt(
cx.push_layer(Box::new(prompt));
}
type FilePicker = Picker<PathBuf, PathBuf>;
#[derive(Debug)]
pub struct FilePickerData {
root: PathBuf,
directory_style: Style,
}
type FilePicker = Picker<PathBuf, FilePickerData>;
pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePicker {
pub fn file_picker(editor: &Editor, root: PathBuf) -> FilePicker {
use ignore::{types::TypesBuilder, WalkBuilder};
use std::time::Instant;
let config = editor.config();
let data = FilePickerData {
root: root.clone(),
directory_style: editor.theme.get("ui.text.directory"),
};
let now = Instant::now();
let dedup_symlinks = config.file_picker.deduplicate_links;
@ -236,14 +247,24 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePi
let columns = [PickerColumn::new(
"path",
|item: &PathBuf, root: &PathBuf| {
item.strip_prefix(root)
.unwrap_or(item)
.to_string_lossy()
.into()
|item: &PathBuf, data: &FilePickerData| {
let path = item.strip_prefix(&data.root).unwrap_or(item);
let mut spans = Vec::with_capacity(3);
if let Some(dirs) = path.parent().filter(|p| !p.as_os_str().is_empty()) {
spans.extend([
Span::styled(dirs.to_string_lossy(), data.directory_style),
Span::styled(std::path::MAIN_SEPARATOR_STR, data.directory_style),
]);
}
let filename = path
.file_name()
.expect("normalized paths can't end in `..`")
.to_string_lossy();
spans.push(Span::raw(filename));
Spans::from(spans).into()
},
)];
let picker = Picker::new(columns, 0, [], root, move |cx, path: &PathBuf, action| {
let picker = Picker::new(columns, 0, [], data, move |cx, path: &PathBuf, action| {
if let Err(e) = cx.editor.open(path, action) {
let err = if let Some(err) = e.source() {
format!("{}", err)

10
helix-term/src/ui/picker.rs
View file

@ -1191,7 +1191,15 @@ impl<I: 'static + Send + Sync, D: 'static + Send + Sync> Component for Picker<I,
.first_history_completion(ctx.editor)
.filter(|_| self.prompt.line().is_empty())
{
self.prompt.set_line(completion.to_string(), ctx.editor);
// The percent character is used by the query language and needs to be
// escaped with a backslash.
let completion = if completion.contains('%') {
completion.replace('%', "\\%")
} else {
completion.into_owned()
};
self.prompt.set_line(completion, ctx.editor);
// Inserting from the history register is a paste.
self.handle_prompt_change(true);
} else {

2
helix-term/tests/integration.rs
View file

@ -17,9 +17,9 @@ mod test {
mod auto_indent;
mod auto_pairs;
mod command_line;
mod commands;
mod languages;
mod movement;
mod prompt;
mod splits;
}

103
helix-term/tests/test/command_line.rs Normal file
View file

@ -0,0 +1,103 @@
use super::*;
use helix_core::diagnostic::Severity;
#[tokio::test(flavor = "multi_thread")]
async fn history_completion() -> anyhow::Result<()> {
test_key_sequence(
&mut AppBuilder::new().build()?,
Some(":asdf<ret>:theme d<C-n><tab>"),
Some(&|app| {
assert!(!app.editor.is_err());
}),
false,
)
.await?;
Ok(())
}
async fn test_statusline(
line: &str,
expected_status: &str,
expected_severity: Severity,
) -> anyhow::Result<()> {
test_key_sequence(
&mut AppBuilder::new().build()?,
Some(&format!("{line}<ret>")),
Some(&|app| {
let (status, &severity) = app.editor.get_status().unwrap();
assert_eq!(
severity, expected_severity,
"'{line}' printed {severity:?}: {status}"
);
assert_eq!(status.as_ref(), expected_status);
}),
false,
)
.await
}
#[tokio::test(flavor = "multi_thread")]
async fn variable_expansion() -> anyhow::Result<()> {
test_statusline(r#":echo %{cursor_line}"#, "1", Severity::Info).await?;
// Double quotes can be used with expansions:
test_statusline(
r#":echo "line%{cursor_line}line""#,
"line1line",
Severity::Info,
)
.await?;
// Within double quotes you can escape the percent token for an expansion by doubling it.
test_statusline(
r#":echo "%%{cursor_line}""#,
"%{cursor_line}",
Severity::Info,
)
.await?;
Ok(())
}
#[tokio::test(flavor = "multi_thread")]
async fn unicode_expansion() -> anyhow::Result<()> {
test_statusline(r#":echo %u{20}"#, " ", Severity::Info).await?;
test_statusline(r#":echo %u{0020}"#, " ", Severity::Info).await?;
test_statusline(r#":echo %u{25CF}"#, "●", Severity::Info).await?;
// Not a valid Unicode codepoint:
test_statusline(
r#":echo %u{deadbeef}"#,
"'echo': could not interpret 'deadbeef' as a Unicode character code",
Severity::Error,
)
.await?;
Ok(())
}
#[cfg(unix)]
#[tokio::test(flavor = "multi_thread")]
async fn shell_expansion() -> anyhow::Result<()> {
test_statusline(
r#":echo %sh{echo "hello world"}"#,
"hello world",
Severity::Info,
)
.await?;
// Shell expansion is recursive.
test_statusline(":echo %sh{echo '%{cursor_line}'}", "1", Severity::Info).await?;
Ok(())
}
#[tokio::test(flavor = "multi_thread")]
async fn percent_escaping() -> anyhow::Result<()> {
test_statusline(
r#":sh echo hello 10%"#,
"'run-shell-command': '%' was not properly escaped. Please use '%%'",
Severity::Error,
)
.await?;
Ok(())
}

59
helix-term/tests/test/commands/write.rs
View file

@ -420,6 +420,50 @@ async fn test_write_utf_bom_file() -> anyhow::Result<()> {
Ok(())
}
#[tokio::test(flavor = "multi_thread")]
async fn test_write_trim_trailing_whitespace() -> anyhow::Result<()> {
let mut file = tempfile::NamedTempFile::new()?;
let mut app = helpers::AppBuilder::new()
.with_config(Config {
editor: helix_view::editor::Config {
trim_trailing_whitespace: true,
..Default::default()
},
..Default::default()
})
.with_file(file.path(), None)
.with_input_text(LineFeedHandling::Native.apply("#[f|]#oo \n\n \nbar "))
.build()?;
test_key_sequence(&mut app, Some(":w<ret>"), None, false).await?;
helpers::assert_file_has_content(&mut file, &LineFeedHandling::Native.apply("foo\n\n\nbar"))?;
Ok(())
}
#[tokio::test(flavor = "multi_thread")]
async fn test_write_trim_final_newlines() -> anyhow::Result<()> {
let mut file = tempfile::NamedTempFile::new()?;
let mut app = helpers::AppBuilder::new()
.with_config(Config {
editor: helix_view::editor::Config {
trim_final_newlines: true,
..Default::default()
},
..Default::default()
})
.with_file(file.path(), None)
.with_input_text(LineFeedHandling::Native.apply("#[f|]#oo\n \n\n\n"))
.build()?;
test_key_sequence(&mut app, Some(":w<ret>"), None, false).await?;
helpers::assert_file_has_content(&mut file, &LineFeedHandling::Native.apply("foo\n \n"))?;
Ok(())
}
#[tokio::test(flavor = "multi_thread")]
async fn test_write_insert_final_newline_added_if_missing() -> anyhow::Result<()> {
let mut file = tempfile::NamedTempFile::new()?;
@ -438,6 +482,21 @@ async fn test_write_insert_final_newline_added_if_missing() -> anyhow::Result<()
Ok(())
}
#[tokio::test(flavor = "multi_thread")]
async fn test_write_insert_final_newline_unchanged_if_empty() -> anyhow::Result<()> {
let mut file = tempfile::NamedTempFile::new()?;
let mut app = helpers::AppBuilder::new()
.with_file(file.path(), None)
.with_input_text("#[|]#")
.build()?;
test_key_sequence(&mut app, Some(":w<ret>"), None, false).await?;
helpers::assert_file_has_content(&mut file, "")?;
Ok(())
}
#[tokio::test(flavor = "multi_thread")]
async fn test_write_insert_final_newline_unchanged_if_not_missing() -> anyhow::Result<()> {
let mut file = tempfile::NamedTempFile::new()?;

16
helix-term/tests/test/prompt.rs
View file

@ -1,16 +0,0 @@
use super::*;
#[tokio::test(flavor = "multi_thread")]
async fn test_history_completion() -> anyhow::Result<()> {
test_key_sequence(
&mut AppBuilder::new().build()?,
Some(":asdf<ret>:theme d<C-n><tab>"),
Some(&|app| {
assert!(!app.editor.is_err());
}),
false,
)
.await?;
Ok(())
}

2
helix-tui/Cargo.toml
View file

@ -23,5 +23,5 @@ cassowary = "0.3"
unicode-segmentation.workspace = true
crossterm = { version = "0.28", optional = true }
termini = "1.0"
once_cell = "1.20"
once_cell = "1.21"
log = "~0.4"

2
helix-vcs/Cargo.toml
View file

@ -16,7 +16,7 @@ helix-core = { path = "../helix-core" }
helix-event = { path = "../helix-event" }
tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot", "macros"] }
parking_lot = "0.12"
parking_lot.workspace = true
arc-swap = { version = "1.7.1" }
gix = { version = "0.70.0", features = ["attributes", "status"], default-features = false, optional = true }

6
helix-view/Cargo.toml
View file

@ -31,7 +31,7 @@ crossterm = { version = "0.28", optional = true }
tempfile.workspace = true
# Conversion traits
once_cell = "1.20"
once_cell = "1.21"
url = "2.5.4"
arc-swap = { version = "1.7.1" }
@ -49,7 +49,7 @@ serde_json = "1.0"
toml = "0.8"
log = "~0.4"
parking_lot = "0.12.3"
parking_lot.workspace = true
thiserror.workspace = true
[target.'cfg(windows)'.dependencies]
@ -57,7 +57,7 @@ clipboard-win = { version = "5.4", features = ["std"] }
[target.'cfg(unix)'.dependencies]
libc = "0.2"
rustix = { version = "0.38", features = ["fs"] }
rustix = { version = "1.0", features = ["fs"] }
[dev-dependencies]
helix-tui = { path = "../helix-tui" }

8
helix-view/src/editor.rs
View file

@ -342,6 +342,12 @@ pub struct Config {
pub default_line_ending: LineEndingConfig,
/// Whether to automatically insert a trailing line-ending on write if missing. Defaults to `true`.
pub insert_final_newline: bool,
/// Whether to automatically remove all trailing line-endings after the final one on write.
/// Defaults to `false`.
pub trim_final_newlines: bool,
/// Whether to automatically remove all whitespace characters preceding line-endings on write.
/// Defaults to `false`.
pub trim_trailing_whitespace: bool,
/// Enables smart tab
pub smart_tab: Option<SmartTabConfig>,
/// Draw border around popups.
@ -994,6 +1000,8 @@ impl Default for Config {
workspace_lsp_roots: Vec::new(),
default_line_ending: LineEndingConfig::default(),
insert_final_newline: true,
trim_final_newlines: false,
trim_trailing_whitespace: false,
smart_tab: Some(SmartTabConfig::default()),
popup_border: PopupBorderConfig::None,
indent_heuristic: IndentationHeuristic::default(),

219
helix-view/src/expansion.rs Normal file
View file

@ -0,0 +1,219 @@
use std::borrow::Cow;
use helix_core::command_line::{ExpansionKind, Token, TokenKind, Tokenizer};
use anyhow::{anyhow, bail, Result};
use crate::Editor;
/// Variables that can be expanded in the command mode (`:`) via the expansion syntax.
///
/// For example `%{cursor_line}`.
//
// To add a new variable follow these steps:
//
// * Add the new enum member to `Variable` below.
// * Add an item to the `VARIANTS` constant - this enables completion.
// * Add a branch in `Variable::as_str`, converting the name from TitleCase to snake_case.
// * Add a branch in `Variable::from_name` with the reverse association.
// * Add a branch in the `expand_variable` function to read the value from the editor.
// * Add the new variable to the documentation in `book/src/command-line.md`.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum Variable {
/// The one-indexed line number of the primary cursor in the currently focused document.
CursorLine,
/// The one-indexed column number of the primary cursor in the currently focused document.
///
/// Note that this is the count of grapheme clusters from the start of the line (regardless of
/// softwrap) - the same as the `position` element in the statusline.
CursorColumn,
/// The display name of the currently focused document.
///
/// This corresponds to `crate::Document::display_name`.
BufferName,
/// A string containing the line-ending of the currently focused document.
LineEnding,
}
impl Variable {
pub const VARIANTS: &'static [Self] = &[
Self::CursorLine,
Self::CursorColumn,
Self::BufferName,
Self::LineEnding,
];
pub const fn as_str(&self) -> &'static str {
match self {
Self::CursorLine => "cursor_line",
Self::CursorColumn => "cursor_column",
Self::BufferName => "buffer_name",
Self::LineEnding => "line_ending",
}
}
pub fn from_name(s: &str) -> Option<Self> {
match s {
"cursor_line" => Some(Self::CursorLine),
"cursor_column" => Some(Self::CursorColumn),
"buffer_name" => Some(Self::BufferName),
"line_ending" => Some(Self::LineEnding),
_ => None,
}
}
}
/// Expands the given command line token.
///
/// Note that the lifetime of the expanded variable is only bound to the input token and not the
/// `Editor`. See `expand_variable` below for more discussion of lifetimes.
pub fn expand<'a>(editor: &Editor, token: Token<'a>) -> Result<Cow<'a, str>> {
// Note: see the `TokenKind` documentation for more details on how each branch should expand.
match token.kind {
TokenKind::Unquoted | TokenKind::Quoted(_) => Ok(token.content),
TokenKind::Expansion(ExpansionKind::Variable) => {
let var = Variable::from_name(&token.content)
.ok_or_else(|| anyhow!("unknown variable '{}'", token.content))?;
expand_variable(editor, var)
}
TokenKind::Expansion(ExpansionKind::Unicode) => {
if let Some(ch) = u32::from_str_radix(token.content.as_ref(), 16)
.ok()
.and_then(char::from_u32)
{
Ok(Cow::Owned(ch.to_string()))
} else {
Err(anyhow!(
"could not interpret '{}' as a Unicode character code",
token.content
))
}
}
TokenKind::Expand => expand_inner(editor, token.content),
TokenKind::Expansion(ExpansionKind::Shell) => expand_shell(editor, token.content),
// Note: see the docs for this variant.
TokenKind::ExpansionKind => unreachable!(
"expansion name tokens cannot be emitted when command line validation is enabled"
),
}
}
/// Expand a shell command.
pub fn expand_shell<'a>(editor: &Editor, content: Cow<'a, str>) -> Result<Cow<'a, str>> {
use std::process::{Command, Stdio};
// Recursively expand the expansion's content before executing the shell command.
let content = expand_inner(editor, content)?;
let config = editor.config();
let shell = &config.shell;
let mut process = Command::new(&shell[0]);
process
.args(&shell[1..])
.arg(content.as_ref())
.stdin(Stdio::null())
.stdout(Stdio::piped())
.stderr(Stdio::piped());
// TODO: there is no protection here against a shell command taking a long time.
// Ideally you should be able to hit `<ret>` in command mode and then be able to
// cancel the invocation (for example with `<C-c>`) if it takes longer than you'd
// like.
let output = match process.spawn() {
Ok(process) => process.wait_with_output()?,
Err(err) => {
bail!("Failed to start shell: {err}");
}
};
let mut text = String::from_utf8_lossy(&output.stdout).into_owned();
if !output.stderr.is_empty() {
log::warn!(
"Shell expansion command `{content}` failed: {}",
String::from_utf8_lossy(&output.stderr)
);
}
// Trim exactly one trailing line ending if it exists.
if text.ends_with('\n') {
text.pop();
if text.ends_with('\r') {
text.pop();
}
}
Ok(Cow::Owned(text))
}
/// Expand a token's contents recursively.
fn expand_inner<'a>(editor: &Editor, content: Cow<'a, str>) -> Result<Cow<'a, str>> {
let mut escaped = String::new();
let mut start = 0;
while let Some(offset) = content[start..].find('%') {
let idx = start + offset;
if content.as_bytes().get(idx + '%'.len_utf8()).copied() == Some(b'%') {
// Treat two percents in a row as an escaped percent.
escaped.push_str(&content[start..=idx]);
// Skip over both percents.
start = idx + ('%'.len_utf8() * 2);
} else {
// Otherwise interpret the percent as an expansion. Push up to (but not
// including) the percent token.
escaped.push_str(&content[start..idx]);
// Then parse the expansion,
let mut tokenizer = Tokenizer::new(&content[idx..], true);
let token = tokenizer
.parse_percent_token()
.unwrap()
.map_err(|err| anyhow!("{err}"))?;
// expand it (this is the recursive part),
let expanded = expand(editor, token)?;
escaped.push_str(expanded.as_ref());
// and move forward to the end of the expansion.
start = idx + tokenizer.pos();
}
}
if escaped.is_empty() {
Ok(content)
} else {
escaped.push_str(&content[start..]);
Ok(Cow::Owned(escaped))
}
}
// Note: the lifetime of the expanded variable (the `Cow`) must not be tied to the lifetime of
// the borrow of `Editor`. That would prevent commands from mutating the `Editor` until the
// command consumed or cloned all arguments - this is poor ergonomics. A sensible thing for this
// function to return then, instead, would normally be a `String`. We can return some statically
// known strings like the scratch buffer name or line ending strings though, so this function
// returns a `Cow<'static, str>` instead.
fn expand_variable(editor: &Editor, variable: Variable) -> Result<Cow<'static, str>> {
let (view, doc) = current_ref!(editor);
let text = doc.text().slice(..);
match variable {
Variable::CursorLine => {
let cursor_line = doc.selection(view.id).primary().cursor_line(text);
Ok(Cow::Owned((cursor_line + 1).to_string()))
}
Variable::CursorColumn => {
let cursor = doc.selection(view.id).primary().cursor(text);
let position = helix_core::coords_at_pos(text, cursor);
Ok(Cow::Owned((position.col + 1).to_string()))
}
Variable::BufferName => {
// Note: usually we would use `Document::display_name` but we can statically borrow
// the scratch buffer name by partially reimplementing `display_name`.
if let Some(path) = doc.relative_path() {
Ok(Cow::Owned(path.to_string_lossy().into_owned()))
} else {
Ok(Cow::Borrowed(crate::document::SCRATCH_BUFFER_NAME))
}
}
Variable::LineEnding => Ok(Cow::Borrowed(doc.line_ending.as_str())),
}
}

1
helix-view/src/lib.rs
View file

@ -7,6 +7,7 @@ pub mod clipboard;
pub mod document;
pub mod editor;
pub mod events;
pub mod expansion;
pub mod graphics;
pub mod gutter;
pub mod handlers;

83
languages.toml
View file

@ -16,7 +16,7 @@ bass = { command = "bass", args = ["--lsp"] }
beancount-language-server = { command = "beancount-language-server" }
bicep-langserver = { command = "bicep-langserver" }
bitbake-language-server = { command = "bitbake-language-server" }
bufls = { command = "bufls", args = ["serve"] }
buf = { command = "buf", args = ["beta", "lsp", "--timeout", "0"] }
cairo-language-server = { command = "cairo-language-server", args = [] }
circom-lsp = { command = "circom-lsp" }
cl-lsp = { command = "cl-lsp" }
@ -47,6 +47,7 @@ fsharp-ls = { command = "fsautocomplete", config = { AutomaticWorkspaceInit = tr
gleam = { command = "gleam", args = ["lsp"] }
glsl_analyzer = { command = "glsl_analyzer" }
graphql-language-service = { command = "graphql-lsp", args = ["server", "-m", "stream"] }
harper-ls = { command = "harper-ls", args = ["--stdio"] }
haskell-language-server = { command = "haskell-language-server-wrapper", args = ["--lsp"] }
hyprls = { command = "hyprls" }
idris2-lsp = { command = "idris2-lsp" }
@ -83,10 +84,12 @@ pasls = { command = "pasls", args = [] }
pbkit = { command = "pb", args = [ "lsp" ] }
perlnavigator = { command = "perlnavigator", args= ["--stdio"] }
pest-language-server = { command = "pest-language-server" }
pkl-lsp = { command = "pkl-lsp" }
prisma-language-server = { command = "prisma-language-server", args = ["--stdio"] }
purescript-language-server = { command = "purescript-language-server", args = ["--stdio"] }
pylsp = { command = "pylsp" }
pyright = { command = "pyright-langserver", args = ["--stdio"], config = {} }
protols = { command = "protols", args = [] }
basedpyright = { command = "basedpyright-langserver", args = ["--stdio"], config = {} }
pylyzer = { command = "pylyzer", args = ["--server"] }
qmlls = { command = "qmlls" }
@ -104,6 +107,7 @@ solargraph = { command = "solargraph", args = ["stdio"] }
solc = { command = "solc", args = ["--lsp"] }
sourcekit-lsp = { command = "sourcekit-lsp" }
spade-language-server = {command = "spade-language-server"}
starpls = {command = "starpls"}
svlangserver = { command = "svlangserver", args = [] }
swipl = { command = "swipl", args = [ "-g", "use_module(library(lsp_server))", "-g", "lsp_server:main", "-t", "halt", "--", "stdio" ] }
superhtml = { command = "superhtml", args = ["lsp"]}
@ -121,7 +125,7 @@ vscode-css-language-server = { command = "vscode-css-language-server", args = ["
vscode-html-language-server = { command = "vscode-html-language-server", args = ["--stdio"], config = { provideFormatter = true } }
vscode-json-language-server = { command = "vscode-json-language-server", args = ["--stdio"], config = { provideFormatter = true, json = { validate = { enable = true } } } }
vuels = { command = "vue-language-server", args = ["--stdio"], config = { typescript = { tsdk = "node_modules/typescript/lib/" } } }
wgsl_analyzer = { command = "wgsl_analyzer" }
wgsl-analyzer = { command = "wgsl-analyzer" }
yaml-language-server = { command = "yaml-language-server", args = ["--stdio"] }
yls = { command = "yls", args = ["-vv"] }
zls = { command = "zls" }
@ -133,11 +137,17 @@ helm_ls = { command = "helm_ls", args = ["serve"] }
ember-language-server = { command = "ember-language-server", args = ["--stdio"] }
teal-language-server = { command = "teal-language-server" }
wasm-language-tools = { command = "wat_server" }
sourcepawn-studio = { command = "sourcepawn-studio" }
[language-server.ansible-language-server]
command = "ansible-language-server"
args = ["--stdio"]
[language-server.astro-ls]
command = "astro-ls"
args = [ "--stdio" ]
config = { typescript = { tsdk = "node_modules/typescript/lib" } }
[language-server.lua-language-server]
command = "lua-language-server"
@ -348,7 +358,7 @@ name = "protobuf"
scope = "source.proto"
injection-regex = "proto"
file-types = ["proto"]
language-servers = [ "bufls", "pbkit" ]
language-servers = [ "buf", "pbkit", "protols" ]
comment-token = "//"
block-comment-tokens = { start = "/*", end = "*/" }
indent = { tab-width = 2, unit = " " }
@ -643,7 +653,7 @@ args = { processId = "{0}" }
[[grammar]]
name = "c-sharp"
source = { git = "https://github.com/tree-sitter/tree-sitter-c-sharp", rev = "5b60f99545fea00a33bbfae5be956f684c4c69e2" }
source = { git = "https://github.com/tree-sitter/tree-sitter-c-sharp", rev = "b5eb5742f6a7e9438bee22ce8026d6b927be2cd7" }
[[language]]
name = "cel"
@ -903,7 +913,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-html", rev = "29f53
name = "python"
scope = "source.python"
injection-regex = "py(thon)?"
file-types = ["py", "pyi", "py3", "pyw", "ptl", "rpy", "cpy", "ipy", "pyt", { glob = ".python_history" }, { glob = ".pythonstartup" }, { glob = ".pythonrc" }, { glob = "SConstruct" }, { glob = "SConscript" }]
file-types = ["py", "pyi", "py3", "pyw", "ptl", "rpy", "cpy", "ipy", "pyt", { glob = ".python_history" }, { glob = ".pythonstartup" }, { glob = ".pythonrc" }, { glob = "*SConstruct" }, { glob = "*SConscript" }, { glob = "*sconstruct" }]
shebangs = ["python", "uv"]
roots = ["pyproject.toml", "setup.py", "poetry.lock", "pyrightconfig.json"]
comment-token = "#"
@ -1616,7 +1626,7 @@ scope = "source.wgsl"
file-types = ["wgsl"]
comment-token = "//"
block-comment-tokens = { start = "/*", end = "*/" }
language-servers = [ "wgsl_analyzer" ]
language-servers = [ "wgsl-analyzer" ]
indent = { tab-width = 4, unit = " " }
[[grammar]]
@ -1670,6 +1680,16 @@ injection-regex = "tablegen"
name = "tablegen"
source = { git = "https://github.com/Flakebi/tree-sitter-tablegen", rev = "3e9c4822ab5cdcccf4f8aa9dcd42117f736d51d9" }
[[language]]
name = "mail"
scope = "text.mail"
file-types = ["eml"]
injection-regex = "mail|eml|email"
[[grammar]]
name = "mail"
source = { git = "https://github.com/ficcdaf/tree-sitter-mail", rev = "8e60f38efbae1cc5f22833ae13c5500dd0f3b12f" }
[[language]]
name = "markdown"
scope = "source.md"
@ -2394,7 +2414,7 @@ indent = { tab-width = 2, unit = "\t" }
[[grammar]]
name = "openscad"
source = { git = "https://github.com/bollian/tree-sitter-openscad", rev = "5c3ce93df0ac1da7197cf6ae125aade26d6b8972" }
source = { git = "https://github.com/openscad/tree-sitter-openscad", rev = "acc196e969a169cadd8b7f8d9f81ff2d30e3e253" }
[[language]]
name = "prisma"
@ -2431,6 +2451,7 @@ injection-regex = "(starlark|bzl|bazel)"
file-types = ["bzl", "bazel", "star", { glob = "BUILD" }, { glob = "BUILD.*" }, { glob = "Tiltfile" }, { glob = "WORKSPACE" }, { glob = "WORKSPACE.bzlmod" }]
comment-token = "#"
indent = { tab-width = 4, unit = " " }
language-servers = [ "starpls" ]
grammar = "python"
[[language]]
@ -2631,6 +2652,7 @@ injection-regex = "astro"
file-types = ["astro"]
block-comment-tokens = { start = "<!--", end = "-->" }
indent = { tab-width = 2, unit = " " }
language-servers = [ "astro-ls" ]
[[grammar]]
name = "astro"
@ -2706,6 +2728,7 @@ file-types = ["kdl"]
comment-token = "//"
block-comment-tokens = { start = "/*", end = "*/" }
injection-regex = "kdl"
formatter = { command = "kdlfmt", args = ["format", "-"] }
[[grammar]]
name = "kdl"
@ -2881,7 +2904,7 @@ indent = { tab-width = 4, unit = "\t" }
[[grammar]]
name = "ini"
source = { git = "https://github.com/justinmk/tree-sitter-ini", rev = "1b0498a89a1a4c0a3705846699f0b0bad887dd04" }
source = { git = "https://github.com/justinmk/tree-sitter-ini", rev = "32b31863f222bf22eb43b07d4e9be8017e36fb31" }
[[language]]
name = "inko"
@ -3154,7 +3177,7 @@ injection-regex = "vhdl"
[[grammar]]
name = "vhdl"
source = { git = "https://github.com/teburd/tree-sitter-vhdl", rev = "c57313adee2231100db0a7880033f6865deeadb2" }
source = { git = "https://github.com/jpt13653903/tree-sitter-vhdl", rev = "32d3e3daa745bf9f1665676f323be968444619e1" }
[[language]]
name = "rego"
@ -3596,6 +3619,7 @@ scope = "source.pkl"
injection-regex = "pkl"
file-types = ["pkl", "pcf"]
comment-token = "//"
language-servers = ["pkl-lsp"]
indent = { tab-width = 2, unit = " " }
[[grammar]]
@ -4008,12 +4032,12 @@ block-comment-tokens = [
language-servers = [ "spade-language-server" ]
indent = { tab-width = 4, unit = " " }
[language.auto-pairs]
'(' = ')'
'{' = '}'
'[' = ']'
'"' = '"'
'<' = '>'
[language.auto-pairs]
'(' = ')'
'{' = '}'
'[' = ']'
'"' = '"'
'<' = '>'
[[grammar]]
name = "spade"
@ -4077,7 +4101,7 @@ file-types = [
{ glob = "sites-available/*.conf" },
{ glob = "sites-enabled/*.conf" },
{ glob = "nginx.conf" },
{ glob = "conf.d/*.conf" }
{ glob = "conf.d/*.conf" }
]
roots = ["nginx.conf"]
comment-token = "#"
@ -4190,3 +4214,30 @@ soft-wrap = { enable = true }
[[grammar]]
name = "ink"
source = { git = "https://github.com/rhizoome/tree-sitter-ink", rev = "8486e9b1627b0bc6b2deb9ee8102277a7c1281ac" }
[[language]]
name = "sourcepawn"
scope = "source.sourcepawn"
file-types = ["sp", "inc"]
comment-token = "//"
indent = {tab-width = 4, unit = " "}
language-servers = ["sourcepawn-studio"]
[[grammar]]
name = "sourcepawn"
source = { git = "https://github.com/nilshelmig/tree-sitter-sourcepawn", rev = "f2af8d0dc14c6790130cceb2a20027eb41a8297c" }
[[language]]
name = "tlaplus"
scope = "scope.tlaplus"
injection-regex = "tla"
file-types = ["tla"]
comment-tokens = "\\*"
block-comment-tokens = {start = "(*", end="*)"}
indent = {tab-width = 4, unit = " "}
formatter = {command = "tlafmt", args = ["--stdin"]}
[[grammar]]
name = "tlaplus"
source = { git = "https://github.com/tlaplus-community/tree-sitter-tlaplus", rev = "4ba91b07b97741a67f61221d0d50e6d962e4987e"}

380
runtime/queries/c-sharp/highlights.scm
View file

@ -1,116 +1,63 @@
(identifier) @variable
;; Methods
(method_declaration
name: (identifier) @function)
(method_declaration
type: [(identifier) (qualified_name)] @type)
(invocation_expression
(member_access_expression
name: (identifier) @function))
(invocation_expression
function: (conditional_access_expression
(member_binding_expression
name: (identifier) @function)))
(invocation_expression
[(identifier) (qualified_name)] @function)
(local_function_statement
name: (identifier) @function)
; Generic Method invocation with generic type
(invocation_expression
function: (generic_name
. (identifier) @function))
;; Namespaces
(namespace_declaration
name: [(identifier) (qualified_name)] @namespace)
(method_declaration name: (identifier) @function)
(local_function_statement name: (identifier) @function)
;; Types
(interface_declaration name: (identifier) @type)
(class_declaration name: (identifier) @type)
(enum_declaration name: (identifier) @type)
(struct_declaration (identifier) @type)
(record_declaration (identifier) @type)
(namespace_declaration name: (identifier) @type)
(using_directive (_) @namespace)
(constructor_declaration name: (identifier) @type)
(destructor_declaration name: (identifier) @type)
(object_creation_expression [(identifier) (qualified_name)] @type)
(type_parameter_list (type_parameter) @type)
(array_type (identifier) @type)
(for_each_statement type: (identifier) @type)
(namespace_declaration name: (identifier) @namespace)
[
(implicit_type)
(nullable_type)
(pointer_type)
(function_pointer_type)
(predefined_type)
] @type.builtin
(generic_name (identifier) @type)
(type_parameter (identifier) @type.parameter)
(parameter type: (identifier) @type)
(type_argument_list (identifier) @type)
(as_expression right: (identifier) @type)
(is_expression right: (identifier) @type)
;; Generic Types
(type_of_expression
(generic_name
(identifier) @type))
(constructor_declaration name: (identifier) @constructor)
(destructor_declaration name: (identifier) @constructor)
(base_list
(generic_name
(identifier) @type))
(_ type: (identifier) @type)
(type_constraint
(generic_name
(identifier) @type))
(base_list (identifier) @type)
(object_creation_expression
(generic_name
(identifier) @type))
(property_declaration
(generic_name
(identifier) @type))
(_
type: (generic_name
(identifier) @type))
(predefined_type) @type.builtin
;; Enum
(enum_member_declaration (identifier) @variable.other.member)
(enum_member_declaration (identifier) @type.enum.variant)
;; Literals
[
(real_literal)
(integer_literal)
] @constant.numeric.integer
(real_literal) @constant.numeric.float
(integer_literal) @constant.numeric.integer
(character_literal) @constant.character
[
(string_literal)
(raw_string_literal)
(verbatim_string_literal)
(interpolated_string_text)
(interpolated_verbatim_string_text)
(interpolation_format_clause)
"\""
"$\""
"@$\""
"$@\""
(interpolated_string_expression)
(interpolation_start)
(interpolation_quote)
] @string
(escape_sequence) @constant.character.escape
(boolean_literal) @constant.builtin.boolean
[
(null_literal)
(void_keyword)
] @constant.builtin
(null_literal) @constant.builtin
;; Comments
(comment) @comment
;; Tokens
(type_argument_list ["<" ">"] @punctuation.bracket)
(type_parameter_list ["<" ">"] @punctuation.bracket)
[
";"
@ -123,6 +70,7 @@
"-"
"-="
"&"
"&="
"&&"
"+"
"++"
@ -140,11 +88,14 @@
">="
">>"
">>="
">>>"
">>>="
"|"
"||"
"|="
"||"
"?"
"??"
"??="
"^"
"^="
"~"
@ -155,224 +106,103 @@
"%"
"%="
":"
"::"
".."
"&="
"->"
"??="
] @operator
["(" ")" "[" "]" "{" "}"] @punctuation.bracket
[
"("
")"
"["
"]"
"{"
"}"
(interpolation_brace)
] @punctuation.bracket
;; Keywords
(modifier) @keyword.storage.modifier
(this_expression) @keyword
(escape_sequence) @constant.character.escape
[
"as"
"await"
"base"
"checked"
"from"
"get"
"in"
"init"
"is"
"let"
"lock"
"new"
"operator"
"out"
"params"
"ref"
"select"
"set"
"sizeof"
"stackalloc"
"typeof"
"unchecked"
"using"
"when"
"where"
"with"
"yield"
(modifier)
"this"
(implicit_type)
] @keyword
[
"add"
"alias"
"as"
"base"
"break"
"case"
"catch"
"checked"
"class"
"continue"
"default"
"delegate"
"do"
"else"
"enum"
"event"
"interface"
"namespace"
"struct"
"record"
] @keyword.storage.type
[
"explicit"
"implicit"
"static"
] @keyword.storage.modifier
[
"break"
"continue"
"goto"
] @keyword.control
[
"catch"
"extern"
"finally"
"throw"
"try"
] @keyword.control.exception
[
"do"
"for"
"foreach"
"while"
] @keyword.control.repeat
[
"case"
"default"
"else"
"global"
"goto"
"if"
"implicit"
"interface"
"is"
"lock"
"namespace"
"notnull"
"operator"
"params"
"return"
"remove"
"sizeof"
"stackalloc"
"static"
"struct"
"switch"
] @keyword.control.conditional
"return" @keyword.control.return
[
(nullable_directive)
(define_directive)
(undef_directive)
(if_directive)
(else_directive)
(elif_directive)
(endif_directive)
(region_directive)
(endregion_directive)
(error_directive)
(warning_directive)
(line_directive)
(pragma_directive)
] @keyword.directive
;; Linq
(from_clause (identifier) @variable)
(group_clause)
(order_by_clause)
(select_clause (identifier) @variable)
(query_continuation (identifier) @variable) @keyword
;; Record
(with_expression
(with_initializer_expression
(simple_assignment_expression
(identifier) @variable)))
;; Exprs
(binary_expression [(identifier) (qualified_name)] @variable [(identifier) (qualified_name)] @variable)
(binary_expression [(identifier) (qualified_name)]* @variable)
(conditional_expression [(identifier) (qualified_name)] @variable)
(conditional_access_expression [(identifier) (qualified_name)] @variable)
(prefix_unary_expression [(identifier) (qualified_name)] @variable)
(postfix_unary_expression [(identifier) (qualified_name)]* @variable)
(assignment_expression [(identifier) (qualified_name)] @variable)
(cast_expression [(identifier) (qualified_name)] @type [(identifier) (qualified_name)] @variable)
(element_access_expression (identifier) @variable)
(member_access_expression
expression: ([(identifier) (qualified_name)] @type
(#match? @type "^[A-Z]")))
(member_access_expression [(identifier) (qualified_name)] @variable)
;; Class
(base_list (identifier) @type)
(property_declaration (generic_name))
(property_declaration
type: (nullable_type) @type
name: (identifier) @variable)
(property_declaration
type: (predefined_type) @type
name: (identifier) @variable)
(property_declaration
type: (identifier) @type
name: (identifier) @variable)
;; Delegate
(delegate_declaration (identifier) @type)
;; Lambda
(lambda_expression) @variable
"throw"
"try"
"typeof"
"unchecked"
"using"
"while"
"new"
"await"
"in"
"yield"
"get"
"set"
"when"
"out"
"ref"
"from"
"where"
"select"
"record"
"init"
"with"
"let"
] @keyword
;; Attribute
(attribute) @type
;; Parameter
(attribute name: (identifier) @attribute)
;; Parameters
(parameter
type: (identifier) @type
name: (identifier) @variable.parameter)
(parameter (identifier) @variable.parameter)
(parameter_modifier) @keyword
(parameter_list
(parameter
name: (identifier) @parameter))
(parameter_list
(parameter
type: [(identifier) (qualified_name)] @type))
;; Typeof
(type_of_expression [(identifier) (qualified_name)] @type)
;; Variable
(variable_declaration [(identifier) (qualified_name)] @type)
(variable_declarator [(identifier) (qualified_name)] @variable)
;; Return
(return_statement (identifier) @variable)
(yield_statement (identifier) @variable)
;; Type
(generic_name (identifier) @type)
(type_parameter [(identifier) (qualified_name)] @type)
(type_argument_list [(identifier) (qualified_name)] @type)
;; Type constraints
(type_parameter_constraints_clause (identifier) @variable.parameter)
(type_constraint (identifier) @type)
;; Exception
(catch_declaration (identifier) @type (identifier) @variable)
(catch_declaration (identifier) @type)
(type_parameter_constraints_clause (identifier) @type.parameter)
;; Switch
(switch_statement (identifier) @variable)
(switch_expression (identifier) @variable)
;; Method calls
;; Lock statement
(lock_statement (identifier) @variable)
;; Declaration expression
(declaration_expression
type: (identifier) @type
name: (identifier) @variable)
;; Rest
(argument (identifier) @variable)
(name_colon (identifier) @variable)
(if_statement (identifier) @variable)
(for_statement (identifier) @variable)
(for_each_statement (identifier) @variable)
(expression_statement (identifier) @variable)
(array_rank_specifier (identifier) @variable)
(equals_value_clause (identifier) @variable)
(interpolation (identifier) @variable)
(cast_expression (identifier) @variable)
((identifier) @comment.unused
(#eq? @comment.unused "_"))
(invocation_expression (member_access_expression name: (identifier) @function))

23
runtime/queries/c-sharp/tags.scm Normal file
View file

@ -0,0 +1,23 @@
(class_declaration name: (identifier) @name) @definition.class
(class_declaration (base_list (_) @name)) @reference.class
(interface_declaration name: (identifier) @name) @definition.interface
(interface_declaration (base_list (_) @name)) @reference.interface
(method_declaration name: (identifier) @name) @definition.method
(object_creation_expression type: (identifier) @name) @reference.class
(type_parameter_constraints_clause (identifier) @name) @reference.class
(type_parameter_constraint (type type: (identifier) @name)) @reference.class
(variable_declaration type: (identifier) @name) @reference.class
(invocation_expression function: (member_access_expression name: (identifier) @name)) @reference.send
(namespace_declaration name: (identifier) @name) @definition.module
(namespace_declaration name: (identifier) @name) @module

1
runtime/queries/c-sharp/textobjects.scm
View file

@ -5,7 +5,6 @@
(enum_declaration body: (_) @class.inside)
(delegate_declaration)
(record_declaration body: (_) @class.inside)
(record_struct_declaration body: (_) @class.inside)
] @class.around
(constructor_declaration body: (_) @function.inside) @function.around

3
runtime/queries/css/highlights.scm
View file

@ -54,6 +54,9 @@
(from)
(important)
(to)
(keyword_query)
(keyframes_name)
(unit)
] @keyword
[

31
runtime/queries/erlang/highlights.scm
View file

@ -5,9 +5,9 @@
; Basic types
(variable) @variable
(atom) @string.special.symbol
((atom) @constant.builtin.boolean
(#match? @constant.builtin.boolean "^(true|false)$"))
(atom) @string.special.symbol
[(string) (sigil)] @string
(character) @constant.character
(escape_sequence) @constant.character.escape
@ -20,6 +20,10 @@
["(" ")" "#" "{" "}" "[" "]" "<<" ">>"] @punctuation.bracket
; Operators
(binary_operator operator: _ @operator)
(unary_operator operator: _ @operator)
["/" ":" "->"] @operator
(binary_operator
left: (atom) @function
operator: "/"
@ -30,10 +34,13 @@
((unary_operator operator: _ @keyword.operator)
(#match? @keyword.operator "^\\w+$"))
(binary_operator operator: _ @operator)
(unary_operator operator: _ @operator)
["/" ":" "->"] @operator
; Functions
(function_clause name: (atom) @function)
(call module: (atom) @namespace)
(call function: (atom) @function)
(stab_clause name: (atom) @function)
(function_capture module: (atom) @namespace)
(function_capture function: (atom) @function)
; Keywords
(attribute name: (atom) @keyword)
@ -107,13 +114,9 @@
] @comment.block.documentation)
(#any-of? @keyword "doc" "moduledoc"))
; Functions
(function_clause name: (atom) @function)
(call module: (atom) @namespace)
(call function: (atom) @function)
(stab_clause name: (atom) @function)
(function_capture module: (atom) @namespace)
(function_capture function: (atom) @function)
; Ignored variables
((variable) @comment.discard
(#match? @comment.discard "^_"))
; Macros
(macro
@ -125,10 +128,6 @@
"?"+ @keyword.directive
name: (_) @keyword.directive)
; Ignored variables
((variable) @comment.discard
(#match? @comment.discard "^_"))
; Parameters
; specs
((attribute

6
runtime/queries/json/highlights.scm
View file

@ -5,12 +5,12 @@
(null) @constant.builtin
(number) @constant.numeric
(pair
key: (_) @variable.other.member)
(string) @string
(escape_sequence) @constant.character.escape
(pair
key: (_) @variable.other.member)
"," @punctuation.delimiter
[
"["

6
runtime/queries/json5/highlights.scm
View file

@ -5,12 +5,12 @@
(null) @constant.builtin
(number) @constant.numeric
(member
name: (_) @variable.other.member)
(string) @string
(comment) @comment
(member
name: (_) @variable.other.member)
"," @punctuation.delimiter
[
"["

28
runtime/queries/mail/highlights.scm Normal file
View file

@ -0,0 +1,28 @@
; header fields
[
(header_field_email)
(header_field_subject)
(header_field)
] @keyword
; delimited punctuation
(header_separator) @punctuation.delimiter
(email_delimiter) @punctuation.delimiter
; email subject contents
(header_subject
(subject) @markup.bold)
; extra metadata headers
(header_other
(header_unstructured) @comment)
; Addressee Name (Firstname, Lastname, etc.)
(atom) @variable
; Email Address
(email) @string
; Quoted Reply
(quote_marker) @punctuation.special
(quote_contents) @markup.quote

13
runtime/queries/mail/textobjects.scm Normal file
View file

@ -0,0 +1,13 @@
(atom_block
(atom) @entry.inside) @entry.around
(email_address) @entry.around
(header_other
(header_unstructured) @entry.around)
(quoted_block)+ @comment.around
(body_block)+ @function.around
(header_subject
(subject) @function.around)

154
runtime/queries/openscad/highlights.scm
View file

@ -1,40 +1,68 @@
(number) @constant.numeric
(string) @string
(boolean) @constant.builtin.boolean
(include_path) @string.special.path
; Includes
(identifier) @variable
(parameters_declaration (identifier) @variable.parameter)
(function_declaration name: (identifier) @function)
"include" @keyword.control.import
(function_call function: (identifier) @function)
(module_call name: (identifier) @function)
(include_path) @string.special.path
; Functions
(function_item
(identifier) @function
)
(function_item
parameters: (parameters (parameter (assignment value: (_) @constant)))
)
(function_call name: (identifier) @function)
(function_call
arguments: (arguments (assignment name: _ @variable.parameter))
)
; for the puroposes of distintion since modules are "coloured" impure functions, we will treat them as methods
(module_item (identifier) @function.method)
(module_item
parameters: (parameters (parameter (assignment value: (_) @constant)))
)
(module_call name: (identifier) @function.method)
(module_call
arguments: (arguments (assignment name: _ @variable.parameter))
)
; assertion statements/expression arguments behave similar to function calls
(assert_expression
arguments: (arguments (assignment name: _ @variable.parameter))
)
(assert_statement
arguments: (arguments (assignment name: _ @variable.parameter))
)
(echo_expression
arguments: (arguments (assignment name: _ @variable.parameter))
)
(echo_expression "echo" @function.builtin)
; Variables
(parameter
[_ @variable.parameter (assignment name: _ @variable.parameter)]
)
(special_variable) @variable.builtin
(undef) @constant.builtin
; Types/Properties/
(dot_index_expression index: (_) @variable.other.member)
; Keywords
[
"module"
"function"
"let"
"assign"
"use"
"each"
(assert_statement "assert")
(assert_expression "assert")
] @keyword
[
"for"
"each"
"intersection_for"
] @keyword.control.repeat
[
"if"
] @keyword.control.conditional
[
"module"
"use"
"include"
] @keyword.control.import
; Operators
[
"||"
"&&"
@ -50,15 +78,87 @@
"/"
"%"
"^"
"?"
"!"
":"
"="
] @operator
; Builtin modules
(module_call
name: (identifier) @function.builtin
(#any-of? @function.builtin
"circle"
"color"
"cube"
"cylinder"
"difference"
"hull"
"intersection"
"linear_extrude"
"minkowski"
"mirror"
"multmatrix"
"offset"
"polygon"
"polyhedron"
"projection"
"resize"
"rotate"
"rotate_extrude"
"scale"
"sphere"
"square"
"surface"
"text"
"translate"
"union"
"echo"
)
)
(
(identifier) @identifier
(#eq? @identifier "PI")
) @constant.builtin
; Conditionals
[
"if"
"else"
] @keyword.control.conditional
(ternary_expression
["?" ":"] @keyword.control.conditional
)
; Repeats
[
"for"
"intersection_for"
] @keyword.control.repeat
; Literals
(integer) @constant.numeric.integer
(float) @constant.numeric.float
(string) @string
(escape_sequence) @constant.character.escape
(boolean) @constant.builtin.boolean
; Misc
(modifier
[
"*"
"!"
"#"
"%"
] @keyword.storage.modifier
)
["{" "}"] @punctuation.bracket
["(" ")"] @punctuation.bracket
["[" "]"] @punctuation.bracket
[
";"
","
"."
] @punctuation.delimiter
(comment) @comment
; Comments
[(line_comment) (block_comment)] @comment

119
runtime/queries/ruby/highlights.scm
View file

@ -39,19 +39,60 @@
"%i("
] @punctuation.bracket
; Literals
[
(string)
(bare_string)
(subshell)
(heredoc_body)
(heredoc_beginning)
] @string
[
(simple_symbol)
(delimited_symbol)
(bare_symbol)
] @string.special.symbol
(pair key: ((_)":" @string.special.symbol) @string.special.symbol)
(regex) @string.regexp
(escape_sequence) @constant.character.escape
[
(integer)
(float)
] @constant.numeric.integer
[
(nil)
(true)
(false)
] @constant.builtin
(interpolation
"#{" @punctuation.special
"}" @punctuation.special) @embedded
(comment) @comment
; Identifiers
((identifier) @function.method
(#is-not? local))
[
(identifier)
] @variable
((identifier) @function.method
(#is-not? local))
[
(class_variable)
(instance_variable)
] @variable.other.member
(constant) @constructor
((identifier) @constant.builtin
(#match? @constant.builtin "^(__FILE__|__LINE__|__ENCODING__)$"))
@ -61,8 +102,6 @@
((constant) @constant
(#match? @constant "^[A-Z\\d_]+$"))
(constant) @constructor
(self) @variable.builtin
(super) @function.builtin
@ -76,6 +115,23 @@
(block_parameter (identifier) @variable.parameter)
(block_parameters (identifier) @variable.parameter)
; Function definitions
(alias (identifier) @function.method)
(setter (identifier) @function.method)
(method name: [(identifier) (constant)] @function.method)
(singleton_method name: [(identifier) (constant)] @function.method)
; Function calls
(call
method: [(identifier) (constant)] @function.method)
((identifier) @function.builtin
(#match? @function.builtin "^(attr|attr_accessor|attr_reader|attr_writer|include|prepend|refine|private|protected|public)$"))
"defined?" @function.builtin
; Keywords
[
@ -133,58 +189,3 @@
((identifier) @keyword.control.exception
(#match? @keyword.control.exception "^(raise|fail)$"))
; Function calls
((identifier) @function.builtin
(#match? @function.builtin "^(attr|attr_accessor|attr_reader|attr_writer|include|prepend|refine|private|protected|public)$"))
"defined?" @function.builtin
(call
method: [(identifier) (constant)] @function.method)
; Function definitions
(alias (identifier) @function.method)
(setter (identifier) @function.method)
(method name: [(identifier) (constant)] @function.method)
(singleton_method name: [(identifier) (constant)] @function.method)
; Literals
[
(string)
(bare_string)
(subshell)
(heredoc_body)
(heredoc_beginning)
] @string
[
(simple_symbol)
(delimited_symbol)
(bare_symbol)
] @string.special.symbol
(pair key: ((_)":" @string.special.symbol) @string.special.symbol)
(regex) @string.regexp
(escape_sequence) @constant.character.escape
[
(integer)
(float)
] @constant.numeric.integer
[
(nil)
(true)
(false)
] @constant.builtin
(interpolation
"#{" @punctuation.special
"}" @punctuation.special) @embedded
(comment) @comment

30
runtime/queries/rust/injections.scm
View file

@ -35,18 +35,30 @@
(#set! injection.language "rust")
(#set! injection.include-children))
((macro_invocation
macro:
[
(scoped_identifier name: (_) @_macro_name)
(identifier) @_macro_name
]
(token_tree
(token_tree . "{" "}" .) @injection.content))
(#eq? @_macro_name "json")
(#set! injection.language "json")
(#set! injection.include-children))
(call_expression
function: (scoped_identifier
path: (identifier) @_regex (#eq? @_regex "Regex")
path: (identifier) @_regex (#any-of? @_regex "Regex" "RegexBuilder")
name: (identifier) @_new (#eq? @_new "new"))
arguments: (arguments (raw_string_literal) @injection.content)
arguments: (arguments (raw_string_literal (string_content) @injection.content))
(#set! injection.language "regex"))
(call_expression
function: (scoped_identifier
path: (scoped_identifier (identifier) @_regex (#eq? @_regex "Regex") .)
path: (scoped_identifier (identifier) @_regex (#any-of? @_regex "Regex" "RegexBuilder") .)
name: (identifier) @_new (#eq? @_new "new"))
arguments: (arguments (raw_string_literal) @injection.content)
arguments: (arguments (raw_string_literal (string_content) @injection.content))
(#set! injection.language "regex"))
; Highlight SQL in `sqlx::query!()`, `sqlx::query_scalar!()`, and `sqlx::query_scalar_unchecked!()`
@ -57,7 +69,10 @@
(token_tree
; Only the first argument is SQL
.
[(string_literal) (raw_string_literal)] @injection.content
[
(string_literal (string_content) @injection.content)
(raw_string_literal (string_content) @injection.content)
]
)
(#set! injection.language "sql"))
@ -72,6 +87,9 @@
; Allow anything as the first argument in case the user has lower case type
; names for some reason
(_)
[(string_literal) (raw_string_literal)] @injection.content
[
(string_literal (string_content) @injection.content)
(raw_string_literal (string_content) @injection.content)
]
)
(#set! injection.language "sql"))

255
runtime/queries/sourcepawn/highlights.scm Normal file
View file

@ -0,0 +1,255 @@
; Assume all-caps names are constants
((identifier) @constant
(#match? @constant "^[A-Z][A-Z\\d_]+$'"))
; Function definitions/declarations
(function_definition
name: (identifier) @function)
(function_declaration
name: (identifier) @function)
(parameter_declaration
name: (identifier) @variable.parameter)
; Methods / Properties
(field_access
field: (identifier) @variable.other.member)
; Function calls
(call_expression
function: (identifier) @function)
(call_expression
function: (field_access
field: (identifier) @function))
; Types
(builtin_type) @type.builtin
(type (identifier) @type)
(any_type) @type
; Variables
(variable_storage_class) @keyword.storage
(variable_declaration
name: (identifier) @variable)
(old_variable_declaration
name: (identifier) @variable)
; Preprocessor
(preproc_include) @keyword.control.import
(preproc_tryinclude) @keyword.control.import
(system_lib_string) @string
(string_literal) @string
(preproc_assert) @keyword.directive
(preproc_pragma) @keyword.directive
(preproc_arg) @constant
(preproc_macro) @function.macro
(macro_param) @variable.parameter
(preproc_if) @keyword.directive
(preproc_else) @keyword.directive
(preproc_elseif) @keyword.directive
(preproc_endif) @keyword.directive
(preproc_endinput) @keyword.directive
(preproc_define) @keyword.directive
(preproc_define
name: (identifier) @constant)
(preproc_undefine) @keyword.directive
(preproc_undefine
name: (identifier) @constant)
(preproc_error) @function.macro ; Wrong color?
(preproc_warning) @function.macro ; Wrong color?
; Statements
(for_statement) @keyword.control.repeat
(condition_statement) @keyword.control.conditional
(while_statement) @keyword.control.repeat
(do_while_statement) @keyword.control.repeat
(switch_statement) @keyword.control.conditional
(switch_case) @keyword.control.conditional
(ternary_expression) @conditional.ternary
; Expressions
(view_as) @function.builtin
(sizeof_expression) @function.macro
(this) @variable.builtin
; https://github.com/alliedmodders/sourcemod/blob/5c0ae11a4619e9cba93478683c7737253ea93ba6/plugins/include/handles.inc#L78
(hardcoded_symbol) @variable.builtin
; Comments
(comment) @comment
; General
(parameter_declaration
defaultValue: (identifier) @constant)
(fixed_dimension) @punctuation.bracket ; the [3] in var[3]
(dimension) @punctuation.bracket
(array_indexed_access) @punctuation.bracket
(escape_sequence) @constant.character.escape
; Constructors
(new_expression
class: (identifier) @type
arguments: (call_arguments) @constructor)
; Methodmaps
(methodmap) @type.definition
(methodmap
name: (identifier) @type)
(methodmap
inherits: (identifier) @type)
(methodmap_method_constructor
name: (identifier) @constructor)
(methodmap_method
name: (identifier) @function.method)
(methodmap_native
name: (identifier) @function.method)
(methodmap_property
name: (identifier) @variable.other.member)
(methodmap_property_getter) @function.method
(methodmap_property_setter) @function.method
; Enum structs
(enum_struct) @type.enum.variant
(enum_struct
name: (identifier) @type)
(enum_struct_field
name: (identifier) @variable.other.member)
(enum_struct_method
name: (identifier) @function.method)
; Non-type Keywords
(variable_storage_class) @keyword.storage
(visibility) @keyword.storage
(visibility) @keyword.storage
(assertion) @function.builtin
(function_declaration_kind) @keyword.function
[
"new"
"delete"
] @keyword.operator
[
"."
","
] @punctuation.delimiter
; Operators
[
"+"
"-"
"..."
"*"
"/"
"%"
"++"
"--"
"="
"+="
"-="
"*="
"/="
"=="
"!="
"<"
">"
">="
"<="
"!"
"&&"
"||"
"&"
"|"
"~"
"^"
"<<"
">>"
">>>"
"|="
"&="
"^="
"~="
"<<="
">>="
] @operator
(ignore_argument) @operator
(scope_access) @operator
(rest_operator) @operator
; public Plugin myinfo
(struct_declaration
name: (identifier) @variable.builtin)
; Typedef/Typedef
(typeset) @type.builtin
(typedef) @type.builtin
(functag) @type.builtin
(funcenum) @type.builtin
(typedef_expression) @keyword.function ; function void(int x)
; Enums
(enum) @type.enum
(enum
name: (identifier) @type)
(enum_entry
name: (identifier) @constant)
(enum_entry
value: (_) @constant)
; Literals
(int_literal) @constant.numeric.integer
(char_literal) @constant.character
(float_literal) @constant.numeric.float
(string_literal) @string
(array_literal) @punctuation.bracket
[
(bool_literal)
(null)
] @constant.builtin
((identifier) @constant
(#match? @constant "INVALID_HANDLE"))
; Comment specialisations (must be after comment)
; These might be unnecessary and/or used incorrectly, since they're intended
; for markup languages
((comment) @diff.plus
(#match? @diff.plus "^\/[\/\*][\t ]TODO"))
((comment) @diff.plus
(#match? @diff.plus "^\/[\/\*][\t ]NOTE"))
((comment) @diff.minus
(#match? @diff.minus "^\/[\/\*][\t ]WARNING"))
; Keywords
[
"__nullable__"
"break"
"case"
"const"
"continue"
"default"
"delete"
"do"
"else"
"enum"
"for"
"forward"
"funcenum"
"functag"
"get"
"if"
"methodmap"
"native"
"new"
"property"
"public"
"return"
"set"
"static"
"stock"
"struct"
"switch"
"typedef"
"typeset"
"void"
"while"
] @keyword
(identifier) @variable

4
runtime/queries/sourcepawn/injections.scm Normal file
View file

@ -0,0 +1,4 @@
; Parse JSDoc annotations in comments
((comment) @injection.content
(#set! injection.language "jsdoc"))

29
runtime/queries/sourcepawn/textobjects.scm Normal file
View file

@ -0,0 +1,29 @@
(function_definition
body: (_) @function.inside) @function.around
(alias_declaration
body: (_) @function.inside) @function.around
(enum_struct_method
body: (_) @function.inside) @function.around
(methodmap_method
body: (_) @function.inside) @function.around
(methodmap_method_constructor
body: (_) @function.inside) @function.around
(methodmap_method_destructor
body: (_) @function.inside) @function.around
(methodmap_property_method
body: (_) @function.inside) @function.around
(enum_struct) @class.around
(methodmap) @class.around
(parameter_declarations
((parameter_declaration) @parameter.inside . ","? @parameter.around) @parameter.around)
(comment) @comment.around

225
runtime/queries/tlaplus/highlights.scm Normal file
View file

@ -0,0 +1,225 @@
; ; Intended for consumption by GitHub and the tree-sitter highlight command
; ; Default capture names found here:
; ; https://github.com/tree-sitter/tree-sitter/blob/f5d1c0b8609f8697861eab352ead44916c068c74/cli/src/highlight.rs#L150-L171
; ; In this file, captures defined earlier take precedence over captures defined later.
; TLA⁺ Keywords
[
"ACTION"
"ASSUME"
"ASSUMPTION"
"AXIOM"
"BY"
"CASE"
"CHOOSE"
"CONSTANT"
"CONSTANTS"
"COROLLARY"
"DEF"
"DEFINE"
"DEFS"
"ELSE"
"EXCEPT"
"EXTENDS"
"HAVE"
"HIDE"
"IF"
"IN"
"INSTANCE"
"LAMBDA"
"LEMMA"
"LET"
"LOCAL"
"MODULE"
"NEW"
"OBVIOUS"
"OMITTED"
"ONLY"
"OTHER"
"PICK"
"PROOF"
"PROPOSITION"
"PROVE"
"QED"
"RECURSIVE"
"SF_"
"STATE"
"SUFFICES"
"TAKE"
"TEMPORAL"
"THEN"
"THEOREM"
"USE"
"VARIABLE"
"VARIABLES"
"WF_"
"WITH"
"WITNESS"
(address)
(all_map_to)
(assign)
(case_arrow)
(case_box)
(def_eq)
(exists)
(forall)
(gets)
(label_as)
(maps_to)
(set_in)
(temporal_exists)
(temporal_forall)
] @keyword
; PlusCal keywords
[
"algorithm"
"assert"
"await"
"begin"
"call"
"define"
"either"
"else"
"elsif"
"end"
"fair"
"goto"
"if"
"macro"
"or"
"print"
"procedure"
"process"
"variable"
"variables"
"when"
"with"
"then"
(pcal_algorithm_start)
(pcal_end_either)
(pcal_end_if)
(pcal_return)
(pcal_skip)
(pcal_process ("="))
(pcal_with ("="))
] @keyword
; Literals
(binary_number (format) @keyword)
(binary_number (value) @constant.numeric)
(boolean) @constant.builtin.boolean
(boolean_set) @type
(hex_number (format) @keyword)
(hex_number (value) @constant.numeric)
(int_number_set) @type
(nat_number) @constant.numeric.integer
(nat_number_set) @type
(octal_number (format) @keyword)
(octal_number (value) @constant.numeric)
(real_number) @constant.numeric.integer
(real_number_set) @type
(string) @string
(escape_char) @string.special.symbol
(string_set) @type
; Namespaces and includes
(extends (identifier_ref) @namespace)
(instance (identifier_ref) @namespace)
(module name: (_) @namespace)
(pcal_algorithm name: (identifier) @namespace)
; Constants and variables
(constant_declaration (identifier) @constant)
(constant_declaration (operator_declaration name: (_) @constant))
(pcal_var_decl (identifier) @variable.builtin)
(pcal_with (identifier) @variable.parameter)
((".") . (identifier) @attribute)
(record_literal (identifier) @attribute)
(set_of_records (identifier) @attribute)
(variable_declaration (identifier) @variable.builtin)
; Parameters
(choose (identifier) @variable.parameter)
(choose (tuple_of_identifiers (identifier) @variable.parameter))
(lambda (identifier) @variable.parameter)
(module_definition (operator_declaration name: (_) @variable.parameter))
(module_definition parameter: (identifier) @variable.parameter)
(operator_definition (operator_declaration name: (_) @variable.parameter))
(operator_definition parameter: (identifier) @variable.parameter)
(pcal_macro_decl parameter: (identifier) @variable.parameter)
(pcal_proc_var_decl (identifier) @variable.parameter)
(quantifier_bound (identifier) @variable.parameter)
(quantifier_bound (tuple_of_identifiers (identifier) @variable.parameter))
(unbounded_quantification (identifier) @variable.parameter)
; Operators, functions, and macros
(function_definition name: (identifier) @function)
(module_definition name: (_) @namespace)
(operator_definition name: (_) @operator)
(pcal_macro_decl name: (identifier) @function)
(pcal_macro_call name: (identifier) @function)
(pcal_proc_decl name: (identifier) @function)
(pcal_process name: (identifier) @function)
(recursive_declaration (identifier) @operator)
(recursive_declaration (operator_declaration name: (_) @operator))
; Delimiters
[
(langle_bracket)
(rangle_bracket)
(rangle_bracket_sub)
"{"
"}"
"["
"]"
"]_"
"("
")"
] @punctuation.bracket
[
","
":"
"."
"!"
";"
(bullet_conj)
(bullet_disj)
(prev_func_val)
(placeholder)
] @punctuation.delimiter
; Proofs
(assume_prove (new (identifier) @variable.parameter))
(assume_prove (new (operator_declaration name: (_) @variable.parameter)))
(assumption name: (identifier) @constant)
(pick_proof_step (identifier) @variable.parameter)
(proof_step_id "<" @punctuation.bracket)
(proof_step_id (level) @tag)
(proof_step_id (name) @tag)
(proof_step_id ">" @punctuation.bracket)
(proof_step_ref "<" @punctuation.bracket)
(proof_step_ref (level) @tag)
(proof_step_ref (name) @tag)
(proof_step_ref ">" @punctuation.bracket)
(take_proof_step (identifier) @variable.parameter)
(theorem name: (identifier) @constant)
; Comments and tags
(block_comment "(*" @comment.block)
(block_comment "*)" @comment.block)
(block_comment_text) @comment.block
(comment) @comment
(single_line) @comment
(_ label: (identifier) @tag)
(label name: (_) @tag)
(pcal_goto statement: (identifier) @tag)
; Put these last so they are overridden by everything else
(bound_infix_op symbol: (_) @function.builtin)
(bound_nonfix_op symbol: (_) @function.builtin)
(bound_postfix_op symbol: (_) @function.builtin)
(bound_prefix_op symbol: (_) @function.builtin)
((prefix_op_symbol) @function.builtin)
((infix_op_symbol) @function.builtin)
((postfix_op_symbol) @function.builtin)

70
runtime/queries/tlaplus/locals.scm Normal file
View file

@ -0,0 +1,70 @@
; TLA⁺ scopes and definitions
[
(bounded_quantification)
(choose)
(function_definition)
(function_literal)
(lambda)
(let_in)
(module)
(module_definition)
(operator_definition)
(set_filter)
(set_map)
(unbounded_quantification)
] @local.scope
; Definitions
(choose (identifier) @local.definition)
(choose (tuple_of_identifiers (identifier) @local.definition))
(constant_declaration (identifier) @local.definition)
(constant_declaration (operator_declaration name: (_) @local.definition))
(function_definition name: (identifier) @local.definition)
(lambda (identifier) @local.definition)
(module_definition name: (_) @local.definition)
(module_definition parameter: (identifier) @local.definition)
(module_definition parameter: (operator_declaration name: (_) @local.definition))
(operator_definition name: (_) @local.definition)
(operator_definition parameter: (identifier) @local.definition)
(operator_definition parameter: (operator_declaration name: (_) @local.definition))
(quantifier_bound (identifier) @local.definition)
(quantifier_bound (tuple_of_identifiers (identifier) @local.definition))
(unbounded_quantification (identifier) @local.definition)
(variable_declaration (identifier) @local.definition)
; Proof scopes and definitions
[
(non_terminal_proof)
(suffices_proof_step)
(theorem)
] @local.scope
(assume_prove (new (identifier) @local.definition))
(assume_prove (new (operator_declaration name: (_) @local.definition)))
(assumption name: (identifier) @local.definition)
(pick_proof_step (identifier) @local.definition)
(take_proof_step (identifier) @local.definition)
(theorem name: (identifier) @local.definition)
;PlusCal scopes and definitions
[
(pcal_algorithm)
(pcal_macro)
(pcal_procedure)
(pcal_with)
] @local.scope
(pcal_macro_decl parameter: (identifier) @local.definition)
(pcal_proc_var_decl (identifier) @local.definition)
(pcal_var_decl (identifier) @local.definition)
(pcal_with (identifier) @local.definition)
; References
(identifier_ref) @local.reference
((prefix_op_symbol) @local.reference)
(bound_prefix_op symbol: (_) @local.reference)
((infix_op_symbol) @local.reference)
(bound_infix_op symbol: (_) @local.reference)
((postfix_op_symbol) @local.reference)
(bound_postfix_op symbol: (_) @local.reference)
(bound_nonfix_op symbol: (_) @local.reference)

2
runtime/queries/toml/textobjects.scm
View file

@ -3,3 +3,5 @@
(array
(_) @entry.around)
(comment)+ @comment.around

471
runtime/queries/vhdl/highlights.scm
View file

@ -1,134 +1,377 @@
(line_comment) @comment.line
(block_comment) @comment.block
(identifier) @variable
[
"alias" "package" "file" "entity" "architecture" "type" "subtype"
"attribute" "to" "downto" "signal" "variable" "record" "array"
"others" "process" "component" "shared" "constant" "port" "generic"
"generate" "range" "map" "in" "inout" "of" "out" "configuration"
"pure" "impure" "is" "begin" "end" "context" "wait" "until" "after"
"report" "open" "exit" "assert" "next" "null" "force" "property"
"release" "sequence" "transport" "unaffected" "select" "severity"
"register" "reject" "postponed" "on" "new" "literal" "linkage"
"inertial" "guarded" "group" "disconnect" "bus" "buffer" "body"
"all" "block" "access"
"access"
"after"
"alias"
"architecture"
"array"
"attribute"
"block"
"body"
"component"
"configuration"
"context"
"disconnect"
"entity"
"file"
"force"
"generate"
"generic"
"group"
"label"
"literal"
"map"
"new"
"package"
"parameter"
"port"
"property"
"range"
"reject"
"release"
"sequence"
"transport"
"unaffected"
"view"
"vunit"
] @keyword
[
"function" "procedure"
(ALL)
(OTHERS)
"<>"
(DEFAULT)
(OPEN)
] @constant.builtin
[
"is"
"begin"
"end"
] @keyword
(parameter_specification
"in" @keyword)
[
"process"
"wait"
"on"
"until"
] @keyword
(timeout_clause
"for" @keyword)
[
"function"
"procedure"
] @keyword.function
[
"return"
] @keyword.control.return
[
"for" "loop" "while"
] @keyword.control.repeat
[
"if" "elsif" "else" "case" "then" "when"
] @keyword.control.conditional
[
"library" "use"
] @keyword.control.import
(comment) @comment
(type_mark) @type
[
"(" ")" "[" "]"
] @punctuation.bracket
[
"." ";" "," ":"
] @punctuation.delimiter
[
"=>" "<=" "+" ":=" "=" "/=" "<" ">" "-" "*"
"**" "/" "?>" "?<" "?<=" "?>=" "?=" "?/="
; "?/" errors, maybe due to escape character
(attribute_name "'")
(index_subtype_definition (any))
] @operator
[
"not" "xor" "xnor" "and" "nand" "or" "nor" "mod" "rem"
(attribute_name "'")
(index_subtype_definition (any))
"to"
"downto"
"of"
] @keyword.operator
[
(real_decimal)
(integer_decimal)
] @constant.numeric
"library"
"use"
] @keyword.control.import
[
"subtype"
"type"
"record"
"units"
"constant"
"signal"
"variable"
] @keyword.storage.type
[
"protected"
"private"
"pure"
"impure"
"inertial"
"postponed"
"guarded"
"out"
"inout"
"linkage"
"buffer"
"register"
"bus"
"shared"
] @keyword.storage.modifier
(mode
"in" @keyword.storage.modifier)
(force_mode
"in" @keyword.storage.modifier)
[
"while"
"loop"
"next"
"exit"
] @keyword.control.repeat
(for_loop
"for" @keyword.control.repeat)
(block_configuration
"for" @keyword)
(configuration_specification
"for" @keyword)
(component_configuration
"for" @keyword)
(end_for
"for" @keyword)
"return" @keyword.control.return
[
"assert"
"report"
"severity"
] @keyword
[
"if"
"then"
"elsif"
"case"
] @keyword.control.conditional
(when_element
"when" @keyword.control.conditional)
(case_generate_alternative
"when" @keyword.control.conditional)
(else_statement
"else" @keyword.control.conditional)
(else_generate
"else" @keyword.control.conditional)
[
"with"
"select"
] @keyword.control.conditional
(when_expression
"when" @keyword.control.conditional)
(else_expression
"else" @keyword.control.conditional)
(else_waveform
"else" @keyword.control.conditional)
(else_expression_or_unaffected
"else" @keyword.control.conditional)
"null" @constant.builtin
(user_directive) @keyword.directive
(protect_directive) @keyword.directive
(warning_directive) @keyword.directive
(error_directive) @keyword.directive
(if_conditional_analysis
"if" @keyword.directive)
(if_conditional_analysis
"then" @keyword.directive)
(elsif_conditional_analysis
"elsif" @keyword.directive)
(else_conditional_analysis
"else" @keyword.directive)
(end_conditional_analysis
"end" @keyword.directive)
(end_conditional_analysis
"if" @keyword.directive)
(directive_body) @keyword.directive
(directive_constant_builtin) @constant.builtin
(directive_error) @keyword.directive
(directive_protect) @keyword.directive
(directive_warning) @keyword.directive
[
(condition_conversion)
(relational_operator)
(sign)
(adding_operator)
(exponentiate)
(variable_assignment)
(signal_assignment)
"*"
"/"
":"
"=>"
] @operator
[
(unary_operator)
(logical_operator)
(shift_operator)
"mod"
"not"
"rem"
] @keyword.operator
[
"'"
","
"."
";"
] @punctuation.delimiters
[
"("
")"
"["
"]"
"<<"
">>"
] @punctuation.bracket
"@" @punctuation.special
[
(decimal_integer)
(string_literal_std_logic)
] @constant.numeric.integer
(decimal_float) @constant.numeric.float
(bit_string_length) @type.parameter
(bit_string_base) @type.builtin
(bit_string_value) @constant.numeric.integer
(based_literal
(based_base) @type.builtin
(based_integer) @constant.numeric.integer)
(based_literal
(based_base) @type.builtin
(based_float) @constant.numeric.float)
(string_literal) @string
(character_literal) @constant.character
[
(string_literal)
(bit_string_literal)
] @string
(library_constant_std_logic) @constant.builtin
(physical_literal
unit: (simple_name) @attribute)
(library_constant) @constant.builtin
(attribute_name
prefix: (_) @variable
designator: (_) @attribute)
(library_function) @function.builtin
((simple_name) @variable.builtin (#any-of? @variable.builtin
"true" "false" "now"))
(library_constant_boolean) @constant.builtin.boolean
(severity_expression) @constant.builtin
(library_constant_character) @constant.character
(procedure_call_statement
procedure: (simple_name) @function)
(unit) @keyword.storage.modifier
(ambiguous_name
prefix: (simple_name) @function.builtin (#any-of? @function.builtin
"rising_edge" "falling_edge" "find_rightmost" "find_leftmost"
"maximum" "minimum" "shift_left" "shift_right" "rotate_left"
"rotate_right" "sll" "srl" "rol" "ror" "sla" "sra" "resize"
"mod" "rem" "abs" "saturate"
"to_sfixed" "to_ufixed" "to_signed" "to_unsigned" "to_real"
"to_integer" "sfixed_low" "ufixed_low" "sfixed_high"
"ufixed_high" "to_slv" "to_stdulogicvector" "to_sulv"
"to_float" "std_logic" "std_logic_vector" "integer" "signed"
"unsigned" "real" "std_ulogic_vector"
"std_ulogic" "x01" "x01z" "ux01" "ux01Z"
;math_real
"sign" "ceil" "floor" "round" "fmax" "fmin" "uniform" "srand"
"rand" "get_rand_max" "sqrt" "cbrt" "exp" "log" "log2" "log10"
"sin" "cos" "tan" "asin" "acos" "atan" "atan2" "sinh" "cosh"
"tanh" "asinh" "acosh" "atanh" "realmax" "realmin" "trunc"
"conj" "arg" "polar_to_complex" "complex_to_polar"
"get_principal_value" "cmplx"
;std_textio
"read" "write" "hread" "hwrite" "to_hstring" "to_string"
"from_hstring" "from_string"
"justify" "readline" "sread" "string_read" " bread"
"binary_read" "oread" "octal_read" "hex_read"
"writeline" "swrite" "string_write" "bwrite"
"binary_write" "owrite" "octal_write" "hex_write"
"synthesis_return"
;std_logic_1164
"resolved" "logic_type_encoding" "is_signed" "to_bit"
"to_bitvector" "to_stdulogic" "to_stdlogicvector"
"to_bit_vector" "to_bv" "to_std_logic_vector"
"to_std_ulogic_vector" "to_01" "to_x01" "to_x01z" "to_ux01"
"is_x" "to_bstring" "to_binary_string" "to_ostring"
"to_octal_string" "to_hex_string"
;float_pkg
"add" "subtract" "multiply" "divide" "remainder" "modulo"
"reciprocal" "dividebyp2" "mac" "eq" "ne" "lt" "gt" "le" "ge"
"to_float32" "to_float64" "to_float128" "realtobits" "bitstoreal"
"break_number" "normalize" "copysign" "scalb" "logb" "nextafter"
"unordered" "finite" "isnan" "zerofp" "nanfp" "qnanfp"
"pos_inffp" "neg_inffp" "neg_zerofp" "from_bstring"
"from_binary_string" "from_ostring" "from_octal_string"
"from_hex_string"
;fixed_pkg
"add_carry" "to_ufix" "to_sfix" "ufix_high"
"ufix_low" "sfix_high" "sfix_low"
))
(library_constant_unit) @keyword.storage.modifier
(label) @label
(generic_map_aspect
"generic" @constructor
"map" @constructor)
(port_map_aspect
"port" @constructor
"map" @constructor)
(selection
(identifier) @variable.other.member)
(_
view: (_) @type)
(_
type: (_) @type)
(_
library: (_) @namespace)
(_
package: (_) @namespace)
(_
entity: (_) @namespace)
(_
component: (_) @namespace)
(_
configuration: (_) @type.parameter)
(_
architecture: (_) @type.parameter)
(_
function: (_) @function)
(_
procedure: (_) @function.method)
(_
attribute: (_) @attribute)
(_
constant: (_) @constant)
(_
generic: (_) @variable.parameter)
(_
view: (name
(_)) @type)
(_
type: (name
(_)) @type)
(_
entity: (name
(_)) @namespace)
(_
component: (name
(_)) @namespace)
(_
configuration: (name
(_)) @namespace)
(library_type) @type.builtin

2
runtime/themes/base16_transparent.toml
View file

@ -8,7 +8,7 @@
"ui.menu" = { fg = "white" }
"ui.menu.selected" = { modifiers = ["reversed"] }
"ui.menu.scroll" = { fg = "light-gray" }
"ui.linenr" = { fg = "light-gray" }
"ui.linenr" = { modifiers = ["dim"] }
"ui.linenr.selected" = { fg = "white", modifiers = ["bold"] }
"ui.popup" = { fg = "white" }
"ui.window" = { fg = "gray" }

134
runtime/themes/beans.toml Normal file
View file

@ -0,0 +1,134 @@
# Beans
# A slightly modified Jellybeans with better support for multi-cursor and multiple selections
#
# Original repository: nanotech/jellybeans.vim
# Contributors:
# @cemalokten
# @gnur
"attribute" = "green"
"type" = "light_blue"
"type.enum.variant" = "purple"
"constructor" = "yellow"
"constant" = "dark_orange"
"constant.builtin.boolean" = "yellow"
"constant.character" = "yellow"
"constant.character.escape" = "red_error"
"constant.numeric" = "dark_orange"
"string" = "dark_green"
"string.regexp" = "light_purple"
"string.special" = { fg = "yellow", modifiers = ["underlined"] }
"comment" = "light_gray"
"variable" = "light_yellow"
"variable.builtin" = { fg = "dark_green", modifiers = ["underlined"] }
"variable.parameter" = "yellow"
"variable.other.member" = "light_purple"
"label" = "yellow"
"punctuation" = "mid_blue"
"keyword" = "mid_blue"
"keyword.control.exception" = "purple"
"operator" = "light_purple"
"function" = "yellow"
"function.macro" = "green"
"function.builtin" = "green"
"function.special" = "green"
"function.method" = "yellow"
"tag" = "light_blue"
"special" = "green"
"namespace" = "light_purple"
"markup.bold" = { fg = "white", modifiers = ["bold"] }
"markup.italic" = { modifiers = ["italic"] }
"markup.strikethrough" = { modifiers = ["crossed_out"] }
"markup.heading" = { fg = "mid_blue", modifiers = ["bold"] }
"markup.list" = "dark_green"
"markup.list.numbered" = "mid_blue"
"markup.list.unnumbered" = "mid_blue"
"markup.link.url" = { fg = "dark_green", modifiers = ['italic', 'underlined'] }
"markup.link.text" = "mid_blue"
"markup.link.label" = "purple"
"markup.quote" = "dark_green"
"markup.raw" = "dark_green"
"markup.raw.inline" = "mid_blue"
"markup.raw.block" = "dark_green"
"diff.plus" = "diff_plus"
"diff.minus" = "red_accent"
"diff.delta" = "blue_accent"
# ui specific
"ui.background" = { bg = "background" }
"ui.cursor" = { bg = "purple", fg = "selectionfg" }
"ui.cursor.primary" = { bg = "dark_blue", fg = "white" }
"ui.cursor.normal" = { bg = "purple", fg = "selectionfg" }
"ui.cursor.insert" = { bg = "light_yellow", fg = "background" }
"ui.cursor.match" = { fg = "background", bg = "dark_orange" }
"ui.cursorline" = { bg = "darker" }
"ui.linenr" = "dark_gray"
"ui.linenr.selected" = { fg = "light_yellow", bg = "darker" }
"ui.statusline" = { fg = "light_yellow", bg = "darker" }
"ui.statusline.inactive" = { fg = "dark", bg = "darker" }
"ui.statusline.normal" = { fg = "light_yellow", bg = "darker" }
"ui.statusline.insert" = { fg = "darker", bg = "purple" }
"ui.statusline.select" = { fg = "selectionfg", bg = "selection" }
"ui.popup" = { fg = "light_yellow", bg = "darkest" }
"ui.window" = { fg = "dark", bg = "darkest" }
"ui.help" = { fg = "light_yellow", bg = "darkest" }
"ui.text" = "light_yellow"
"ui.text.focus" = { fg = "white", bg = "dark_blue" }
"ui.virtual" = "dark"
"ui.virtual.ruler" = { bg = "darker" }
"ui.virtual.jump-label" = { bg = "light_blue", fg = "darkest", modifiers = ["bold"] }
"ui.menu" = { fg = "light_purple", bg = "darkest" }
"ui.menu.selected" = { fg = "white", bg = "dark_blue" }
"ui.selection.primary" = { bg = "light_purple", fg = "darkest" }
"ui.selection" = { bg = "light_blue", fg = "darkest" }
"hint" = "blue"
"info" = "yellow_accent"
"warning" = "orange_accent"
"error" = "red_error"
"diagnostic" = { modifiers = [] }
"diagnostic.hint" = { underline = { color = "white", style = "line" } }
"diagnostic.info" = { underline = { color = "blue_accent", style = "line" } }
"diagnostic.warning" = { underline = { color = "yellow_accent", style = "line" } }
"diagnostic.error" = { underline = { color = "red_error", style = "line" } }
[palette]
background = "#111111"
darkest = "#1c1c1c"
darker = "#292929"
dark = "#898989"
white = "#ffffff"
dark_gray = "#535353"
light_gray = "#6d6d6d"
purple = "#833c9f"
light_purple = "#be67e1"
blue = "#048ac7"
light_blue = "#48c6ff"
mid_blue = "#8197bf"
dark_blue = "#0ac1cd"
blue_accent = "#63e7f0"
green = "#ccff00"
dark_green = "#cee318"
red = "#cc7c8a"
red_error = "#902020"
red_accent = "#f44747"
orange = "#ff9f00"
dark_orange = "#ff005b"
orange_accent = "#ee7f25"
yellow = "#fad07a"
light_yellow = "#ebebd8"
yellow_accent = "#dea407"
diff_plus = "#5a9f81"
selection = "#37232d"
selectionfg = "#e5e5e5"

104
runtime/themes/kanagawa.toml
View file

@ -9,14 +9,14 @@
## User interface
"ui.selection" = { bg = "waveBlue2" }
"ui.selection.primary" = { bg = "waveBlue2" }
"ui.background" = { fg = "fujiWhite", bg = "sumiInk1" }
"ui.background" = { fg = "fujiWhite", bg = "sumiInk3" }
"ui.linenr" = { fg = "sumiInk6" }
"ui.linenr.selected" = { fg = "roninYellow", modifiers = ["bold"] }
"ui.gutter" = { fg = "sumiInk6", bg = "sumiInk4" }
"ui.virtual" = "sumiInk6"
"ui.virtual.ruler" = { bg = "sumiInk2" }
"ui.virtual.ruler" = { bg = "sumiInk4" }
"ui.virtual.inlay-hint" = "sumiInk6"
"ui.virtual.jump-label" = { fg = "peachRed", modifiers = ["bold"] }
@ -25,8 +25,6 @@
"ui.statusline.normal" = { fg = "sumiInk0", bg = "crystalBlue", modifiers = ["bold"] }
"ui.statusline.insert" = { fg = "sumiInk0", bg = "autumnGreen", modifiers = ["bold"] }
"ui.statusline.select" = { fg = "sumiInk0", bg = "oniViolet", modifiers = ["bold"] }
# Malformed ANSI: "". See 'https://github.com/helix-editor/helix/issues/5709'
# "ui.statusline.separator" = { fg = "", bg = "" }
"ui.bufferline" = { fg = "fujiGray", bg = "sumiInk0" }
"ui.bufferline.active" = { fg = "oldWhite", bg = "sumiInk0" }
@ -46,8 +44,8 @@
"ui.menu.selected" = { fg = "fujiWhite", bg = "waveBlue2", modifiers = ["bold"] }
"ui.menu.scroll" = { fg = "oldWhite", bg = "waveBlue1" }
"ui.cursorline.primary" = { bg = "sumiInk3" }
"ui.cursorcolumn.primary" = { bg = "sumiInk3" }
"ui.cursorline.primary" = { bg = "sumiInk5" }
"ui.cursorcolumn.primary" = { bg = "sumiInk5" }
"ui.debug.breakpoint" = "springBlue"
"ui.debug.active" = "winterRed"
@ -101,56 +99,62 @@ hint = "waveAqua1"
"special" = "peachRed"
## Markup modifiers
"markup.heading" = { fg = "springViolet2", modifiers = ["bold"] }
"markup.heading.marker" = "springViolet2"
"markup.heading" = { fg = "crystalBlue", modifiers = ["bold"] }
"markup.list" = "oniViolet"
"markup.heading.1" = { fg = "carpYellow", modifiers = ["bold"] }
"markup.heading.2" = { fg = "crystalBlue", modifiers = ["bold"] }
"markup.heading.3" = { fg = "waveAqua2", modifiers = ["bold"] }
"markup.list" = "sakuraPink"
"markup.bold" = { modifiers = ["bold"] }
"markup.italic" = { modifiers = ["italic"] }
"markup.strikethrough" = { modifiers = ["crossed_out"] }
"markup.link.text" = { fg = "springBlue" }
"markup.link.url" = { fg = "sakuraPink" }
"markup.link.url" = { fg = "lightBlue" }
"markup.link.label" = "surimiOrange"
"markup.quote" = "springViolet1"
"markup.quote" = "oniViolet2"
"markup.raw" = "springGreen"
[palette]
seaFoam = "#C7CCD1" # custom lighter foreground
fujiWhite = "#DCD7BA" # default foreground
oldWhite = "#C8C093" # dark foreground, e.g. statuslines
sumiInk0 = "#16161D" # dark background, e.g. statuslines, floating windows
sumiInk1 = "#1F1F28" # default background
sumiInk2 = "#2A2A37" # lighter background, e.g. colorcolumns, folds
sumiInk3 = "#363646" # lighter background, e.g. cursorline
sumiInk4 = "#2A2A37" # darker foreground, e.g. linenumbers, fold column
sumiInk6 = "#54546D" # inlay hints
waveBlue1 = "#223249" # popup background, visual selection background
waveBlue2 = "#2D4F67" # popup selection background, search background
winterGreen = "#2B3328" # diff add background
winterYellow = "#49443C" # diff change background
winterRed = "#43242B" # diff deleted background
winterBlue = "#252535" # diff line background
autumnGreen = "#76946A" # git add
autumnRed = "#C34043" # git delete
autumnYellow = "#DCA561" # git change
samuraiRed = "#E82424" # diagnostic error
roninYellow = "#FF9E3B" # diagnostic warning
waveAqua1 = "#6A9589" # diagnostic info
dragonBlue = "#658594" # diagnostic hint
fujiGray = "#727169" # comments
springViolet1 = "#938AA9" # light foreground
oniViolet = "#957FB8" # statements and keywords
oniViolet2 = "#B8B4D0" # parameters
crystalBlue = "#7E9CD8" # functions and titles
springViolet2 = "#9CABCA" # brackets and punctuation
springBlue = "#7FB4CA" # specials and builtins
lightBlue = "#A3D4D5" # not used!
waveAqua2 = "#7AA89F" # types
springGreen = "#98BB6C" # strings
boatYellow1 = "#938056" # not used
boatYellow2 = "#C0A36E" # operators, regex
carpYellow = "#E6C384" # identifiers
sakuraPink = "#D27E99" # numbers
waveRed = "#E46876" # standout specials 1, e.g. builtin variables
peachRed = "#FF5D62" # standout specials 2, e.g. exception handling, returns
surimiOrange = "#FFA066" # constants, imports, booleans
katanaGray = "#717C7C" # deprecated
oldWhite = "#C8C093" # dark foreground, e.g. statuslines
fujiWhite = "#DCD7BA" # default foreground
fujiGray = "#727169" # comments
sumiInk0 = "#16161D" # dark background, e.g. statuslines, floating windows
sumiInk1 = "#181820" # unused
sumiInk2 = "#1A1A22" # unused
sumiInk3 = "#1F1F28" # default background
sumiInk4 = "#2A2A37" # lighter background, e.g. colorcolumns, folds
sumiInk5 = "#363646" # lighter background, e.g. cursorline
sumiInk6 = "#54546D" # inlay hints
waveBlue1 = "#223249" # popup background, visual selection background
waveBlue2 = "#2D4F67" # popup selection background, search background
winterGreen = "#2B3328" # diff add background
winterYellow = "#49443C" # diff change background
winterRed = "#43242B" # diff delete background
winterBlue = "#252535" # diff line background
autumnGreen = "#76946A" # git add
autumnRed = "#C34043" # git delete
autumnYellow = "#DCA561" # git change
samuraiRed = "#E82424" # diagnostic error
roninYellow = "#FF9E3B" # diagnostic warning
waveAqua1 = "#6A9589" # diagnostic info
dragonBlue = "#658594" # diagnostic hint
oniViolet = "#957FB8" # statements and keywords
oniViolet2 = "#B8B4D0" # parameters
crystalBlue = "#7E9CD8" # functions and titles
springViolet1 = "#938AA9" # unused
springViolet2 = "#9CABCA" # brackets and punctuation
springBlue = "#7FB4CA" # specials and builtins
lightBlue = "#A3D4D5" # URLs
waveAqua2 = "#7AA89F" # types
waveAqua3 = "#68AD99" # unused
waveAqua4 = "#7AA880" # unused
waveAqua5 = "#6CAF95" # unused
springGreen = "#98BB6C" # strings
boatYellow1 = "#938056" # unused
boatYellow2 = "#C0A36E" # operators, regex
carpYellow = "#E6C384" # identifiers
sakuraPink = "#D27E99" # numbers
waveRed = "#E46876" # standout specials 1, e.g. builtin variables
peachRed = "#FF5D62" # standout specials 2, e.g. exception handling, returns
surimiOrange = "#FFA066" # constants, imports, booleans
katanaGray = "#717C7C" # unused

65
runtime/themes/sunset.toml
View file

@ -4,21 +4,20 @@
# Syntax highlighting
# ----------------------------------------------------------------
attribute = "rose"
attribute = "mud"
type = "rose"
"type.builtin" = { fg = "rose", modifiers = ["italic"] }
type = "mud"
"type.builtin" = { fg = "mud", modifiers = ["italic"] }
constructor = "wood"
constant = "fire"
"constant.builtin" = { fg = "fire", modifiers = ["italic"] }
"constant.character" = "wood"
"constant.character.escape" = "pink"
"constant.numeric" = "wood"
string = "grass"
"string.regexp" = "pink"
"string.regexp" = "mud"
"string.special" = "rose"
"string.special.symbol" = "fire"
@ -26,9 +25,9 @@ comment = { fg = "cmnt", modifiers = ["italic"] }
"comment.block.documentation" = "grass"
variable = "text"
"variable.builtin" = { fg = "sky", modifiers = ["italic"] }
# TODO: variable.parameter
"variable.other.member" = "mud"
"variable.builtin" = { fg = "sky", modifiers = ["italic"] }
"variable.parameter" = "rose"
"variable.other.member" = "pink"
label = "sky"
@ -44,23 +43,23 @@ operator = "wine"
function = "peach"
"function.builtin" = { fg = "peach", modifiers = ["italic"] }
"function.macro" = "pink"
"function.macro" = "sky"
tag = "peach"
namespace = { fg = "pink", modifiers = ["italic"] }
namespace = { fg = "text", modifiers = ["italic"] }
special = "sky"
special = "wine"
# Editor interface
# ----------------------------------------------------------------
"markup.heading.marker" = "sun"
"markup.heading.1" = "attn"
"markup.heading.2" = "fire"
"markup.heading.1" = "fire"
"markup.heading.2" = "wine"
"markup.heading.3" = "rose"
"markup.heading.4" = "peach"
"markup.heading.5" = "wine"
"markup.heading.6" = "grass"
"markup.heading.5" = "grass"
"markup.heading.6" = "wood"
"markup.list" = "wood"
@ -69,12 +68,12 @@ special = "sky"
"markup.strikethrough" = { modifiers = ["crossed_out"] }
"markup.link.url" = { fg = "sky", underline.style = "line" }
"markup.link.label" = { fg = "sky", modifiers = ["italic"] }
"markup.link.label" = "sky"
"markup.link.text" = "mud"
"markup.quote" = "grass"
"markup.quote" = "mud"
"markup.raw" = "pink"
"markup.raw" = "pink"
"diff.plus" = "grass"
"diff.minus" = "attn"
@ -84,7 +83,10 @@ special = "sky"
# ----------------------------------------------------------------
"ui.background" = { fg = "text", bg = "base" }
"ui.cursor" = { modifiers = ["reversed"] }
"ui.cursor" = { fg = "base", bg = "cmnt" }
"ui.cursor.primary.normal" = { fg = "base", bg = "text" }
"ui.cursor.primary.insert" = { fg = "base", bg = "grass" }
"ui.cursor.primary.select" = { fg = "base", bg = "sky" }
"ui.cursor.match" = { fg = "attn", modifiers = ["bold"] }
# TODO: ui.debug
@ -94,34 +96,35 @@ special = "sky"
"ui.statusline" = { bg = "block" }
"ui.statusline.inactive" = { fg = "cmnt" }
"ui.statusline.normal" = { fg = "block", bg = "sun", modifiers = ["bold"] }
"ui.statusline.normal" = { fg = "block", bg = "text", modifiers = ["bold"] }
"ui.statusline.insert" = { fg = "block", bg = "grass", modifiers = ["bold"] }
"ui.statusline.select" = { fg = "block", bg = "wine", modifiers = ["bold"] }
"ui.statusline.select" = { fg = "block", bg = "sky", modifiers = ["bold"] }
"ui.bufferline" = { fg = "cmnt", bg = "block" }
"ui.bufferline.active" = "sun"
"ui.bufferline.active" = "fire"
"ui.popup" = { fg = "text", bg = "base" }
"ui.popup.info" = { fg = "text", bg = "block" }
"ui.picker.header" = { underline.style = "line" }
"ui.window" = { fg = "block", modifiers = ["bold"] }
"ui.help" = { fg = "text", bg = "block" }
"ui.text" = { fg = "text", bg = "base" }
"ui.text.directory" = "sky"
"ui.text" = "text"
"ui.text.focus" = "sun"
"ui.text.inactive" = { fg = "cmnt", modifiers = ["italic"] }
"ui.text.info" = { bg = "block" }
"ui.text.directory" = "sky"
"ui.virtual" = { fg = "block" }
"ui.virtual.ruler" = { bg = "block" }
"ui.virtual.indent-guide" = "sel"
"ui.virtual.jump-label" = { fg = "attn", modifiers = ["bold"] }
"ui.menu" = { fg = "text", bg = "base" }
"ui.menu.selected" = { bg = "sel" }
"ui.menu.scroll" = "sel"
"ui.menu.scroll" = "block"
"ui.selection" = { bg = "sel" }
@ -129,8 +132,8 @@ special = "sky"
error = "attn"
warning = "fire"
info = "pink"
hint = "sky"
info = "sky"
hint = "mud"
diagnostic = { underline.style = "line" }
@ -144,12 +147,12 @@ wood = "#997755"
# Greenish
grass = "#66CC33"
mud = "#BBCC77"
mud = "#AACC77"
sun = "#EEEE11"
# Bluish
sky = "#77AAAA"
wine = "#775599"
sky = "#77AAAA"
wine = "#775599"
# Ui
base = "#111111"