mirror of
https://github.com/helix-editor/helix.git
synced 2025-10-06 08:23:27 +02:00
Compare commits
11 Commits
default-in
...
rainbow
| Author | SHA1 | Date | |
|---|---|---|---|
|
ac7bd40eea | ||
|
|
a8614c5aa8 | ||
|
|
4418e338e8 | ||
|
|
6c71fc00b2 | ||
|
|
727758e068 | ||
|
|
63eb1b870c | ||
|
|
2d5826d194 | ||
|
|
9f4ef2fc3d | ||
|
fd8aacc1a4 | ||
|
2ee11a0a9d | ||
|
9512cb9472 |
7
.github/workflows/release.yml
vendored
7
.github/workflows/release.yml
vendored
@@ -61,12 +61,15 @@ jobs:
|
||||
build: [x86_64-linux, aarch64-linux, x86_64-macos, x86_64-windows] #, x86_64-win-gnu, win32-msvc
|
||||
include:
|
||||
- build: x86_64-linux
|
||||
os: ubuntu-24.04
|
||||
# WARN: When changing this to a newer version, make sure that the GLIBC isnt too new, as this can cause issues
|
||||
# with portablity on older systems that dont follow ubuntus more rapid release cadence.
|
||||
os: ubuntu-22.04
|
||||
rust: stable
|
||||
target: x86_64-unknown-linux-gnu
|
||||
cross: false
|
||||
- build: aarch64-linux
|
||||
os: ubuntu-24.04-arm
|
||||
# Version should be kept in lockstep with the x86_64 version
|
||||
os: ubuntu-22.04-arm
|
||||
rust: stable
|
||||
target: aarch64-unknown-linux-gnu
|
||||
cross: false
|
||||
|
||||
@@ -20,6 +20,10 @@ Updated languages and queries:
|
||||
Packaging:
|
||||
-->
|
||||
|
||||
# 25.07.1 (2025-07-18)
|
||||
|
||||
This is a patch release which lowers the GLIBC requirements of the release artifacts published to GitHub ([#13983](https://github.com/helix-editor/helix/pull/13983))
|
||||
|
||||
# 25.07 (2025-07-15)
|
||||
|
||||
As always, a big thank you to all of the contributors! This release saw changes from 195 contributors.
|
||||
|
||||
26
Cargo.lock
generated
26
Cargo.lock
generated
@@ -1397,7 +1397,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "helix-core"
|
||||
version = "25.7.0"
|
||||
version = "25.7.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"arc-swap",
|
||||
@@ -1435,7 +1435,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "helix-dap"
|
||||
version = "25.7.0"
|
||||
version = "25.7.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"fern",
|
||||
@@ -1454,7 +1454,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "helix-event"
|
||||
version = "25.7.0"
|
||||
version = "25.7.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"foldhash",
|
||||
@@ -1468,7 +1468,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "helix-loader"
|
||||
version = "25.7.0"
|
||||
version = "25.7.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"cc",
|
||||
@@ -1485,7 +1485,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "helix-lsp"
|
||||
version = "25.7.0"
|
||||
version = "25.7.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"arc-swap",
|
||||
@@ -1518,11 +1518,11 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "helix-parsec"
|
||||
version = "25.7.0"
|
||||
version = "25.7.1"
|
||||
|
||||
[[package]]
|
||||
name = "helix-stdx"
|
||||
version = "25.7.0"
|
||||
version = "25.7.1"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"dunce",
|
||||
@@ -1540,13 +1540,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "helix-term"
|
||||
version = "25.7.0"
|
||||
version = "25.7.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"arc-swap",
|
||||
"chrono",
|
||||
"content_inspector",
|
||||
"crossterm",
|
||||
"dashmap",
|
||||
"fern",
|
||||
"futures-util",
|
||||
"grep-regex",
|
||||
@@ -1586,7 +1587,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "helix-tui"
|
||||
version = "25.7.0"
|
||||
version = "25.7.1"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cassowary",
|
||||
@@ -1601,7 +1602,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "helix-vcs"
|
||||
version = "25.7.0"
|
||||
version = "25.7.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"arc-swap",
|
||||
@@ -1617,7 +1618,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "helix-view"
|
||||
version = "25.7.0"
|
||||
version = "25.7.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"arc-swap",
|
||||
@@ -1634,6 +1635,7 @@ dependencies = [
|
||||
"helix-stdx",
|
||||
"helix-tui",
|
||||
"helix-vcs",
|
||||
"kstring",
|
||||
"libc",
|
||||
"log",
|
||||
"once_cell",
|
||||
@@ -3279,7 +3281,7 @@ checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
|
||||
|
||||
[[package]]
|
||||
name = "xtask"
|
||||
version = "25.7.0"
|
||||
version = "25.7.1"
|
||||
dependencies = [
|
||||
"helix-core",
|
||||
"helix-loader",
|
||||
|
||||
@@ -53,7 +53,7 @@ tokio-stream = "0.1.17"
|
||||
toml = "0.9"
|
||||
|
||||
[workspace.package]
|
||||
version = "25.7.0"
|
||||
version = "25.7.1"
|
||||
edition = "2021"
|
||||
authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
|
||||
categories = ["editor"]
|
||||
|
||||
@@ -28,3 +28,5 @@
|
||||
- [Adding textobject queries](./guides/textobject.md)
|
||||
- [Adding indent queries](./guides/indent.md)
|
||||
- [Adding injection queries](./guides/injection.md)
|
||||
- [Adding tags queries](./guides/tags.md)
|
||||
- [Adding rainbow bracket queries](./guides/rainbow_bracket_queries.md)
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
- [`[editor.soft-wrap]` Section](#editorsoft-wrap-section)
|
||||
- [`[editor.smart-tab]` Section](#editorsmart-tab-section)
|
||||
- [`[editor.inline-diagnostics]` Section](#editorinline-diagnostics-section)
|
||||
- [`[editor.word-completion]` Section](#editorword-completion-section)
|
||||
|
||||
### `[editor]` Section
|
||||
|
||||
@@ -62,6 +63,7 @@
|
||||
| `end-of-line-diagnostics` | Minimum severity of diagnostics to render at the end of the line. Set to `disable` to disable entirely. Refer to the setting about `inline-diagnostics` for more details | "disable"
|
||||
| `clipboard-provider` | Which API to use for clipboard interaction. One of `pasteboard` (MacOS), `wayland`, `x-clip`, `x-sel`, `win-32-yank`, `termux`, `tmux`, `windows`, `termcode`, `none`, or a custom command set. | Platform and environment specific. |
|
||||
| `editor-config` | Whether to read settings from [EditorConfig](https://editorconfig.org) files | `true` |
|
||||
| `rainbow-brackets` | Whether to render rainbow colors for matching brackets. Requires tree-sitter `rainbows.scm` queries for the language. | `false` |
|
||||
|
||||
### `[editor.clipboard-provider]` Section
|
||||
|
||||
@@ -477,3 +479,21 @@ end-of-line-diagnostics = "hint"
|
||||
[editor.inline-diagnostics]
|
||||
cursor-line = "warning" # show warnings and errors on the cursorline inline
|
||||
```
|
||||
|
||||
### `[editor.word-completion]` Section
|
||||
|
||||
Options for controlling completion of words from open buffers.
|
||||
|
||||
| Key | Description | Default |
|
||||
| --- | --- | --- |
|
||||
| `enable` | Whether word completion is enabled | `true` |
|
||||
| `trigger-length` | Number of word characters to type before triggering completion | `7` |
|
||||
|
||||
Example:
|
||||
|
||||
```toml
|
||||
[editor.word-completion]
|
||||
enable = true
|
||||
# Set the trigger length lower so that words are completed more often
|
||||
trigger-length = 4
|
||||
```
|
||||
|
||||
@@ -1,282 +1,282 @@
|
||||
| Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Default language servers |
|
||||
| --- | --- | --- | --- | --- |
|
||||
| ada | ✓ | ✓ | | `ada_language_server` |
|
||||
| adl | ✓ | ✓ | ✓ | |
|
||||
| agda | ✓ | | | |
|
||||
| alloy | ✓ | | | |
|
||||
| amber | ✓ | | | `amber-lsp` |
|
||||
| astro | ✓ | | | `astro-ls` |
|
||||
| awk | ✓ | ✓ | | `awk-language-server` |
|
||||
| bash | ✓ | ✓ | ✓ | `bash-language-server` |
|
||||
| bass | ✓ | | | `bass` |
|
||||
| beancount | ✓ | | | `beancount-language-server` |
|
||||
| bibtex | ✓ | | | `texlab` |
|
||||
| bicep | ✓ | | | `bicep-langserver` |
|
||||
| bitbake | ✓ | | | `bitbake-language-server` |
|
||||
| blade | ✓ | | | |
|
||||
| blueprint | ✓ | | | `blueprint-compiler` |
|
||||
| c | ✓ | ✓ | ✓ | `clangd` |
|
||||
| c-sharp | ✓ | ✓ | | `OmniSharp` |
|
||||
| cabal | | | | `haskell-language-server-wrapper` |
|
||||
| caddyfile | ✓ | ✓ | ✓ | |
|
||||
| cairo | ✓ | ✓ | ✓ | `cairo-language-server` |
|
||||
| capnp | ✓ | | ✓ | |
|
||||
| cel | ✓ | | | |
|
||||
| circom | ✓ | | | `circom-lsp` |
|
||||
| clarity | ✓ | | | `clarinet` |
|
||||
| clojure | ✓ | | | `clojure-lsp` |
|
||||
| cmake | ✓ | ✓ | ✓ | `neocmakelsp`, `cmake-language-server` |
|
||||
| codeql | ✓ | ✓ | | `codeql` |
|
||||
| comment | ✓ | | | |
|
||||
| common-lisp | ✓ | | ✓ | `cl-lsp` |
|
||||
| cpon | ✓ | | ✓ | |
|
||||
| cpp | ✓ | ✓ | ✓ | `clangd` |
|
||||
| crystal | ✓ | ✓ | ✓ | `crystalline`, `ameba-ls` |
|
||||
| css | ✓ | | ✓ | `vscode-css-language-server` |
|
||||
| csv | ✓ | | | |
|
||||
| cue | ✓ | | | `cuelsp` |
|
||||
| cylc | ✓ | ✓ | ✓ | |
|
||||
| d | ✓ | ✓ | ✓ | `serve-d` |
|
||||
| dart | ✓ | ✓ | ✓ | `dart` |
|
||||
| dbml | ✓ | | | |
|
||||
| debian | ✓ | | | |
|
||||
| devicetree | ✓ | | | `dts-lsp` |
|
||||
| dhall | ✓ | ✓ | | `dhall-lsp-server` |
|
||||
| diff | ✓ | | | |
|
||||
| djot | ✓ | | | |
|
||||
| docker-compose | ✓ | ✓ | ✓ | `docker-compose-langserver`, `yaml-language-server` |
|
||||
| dockerfile | ✓ | ✓ | | `docker-langserver` |
|
||||
| dot | ✓ | | | `dot-language-server` |
|
||||
| dtd | ✓ | | | |
|
||||
| dune | ✓ | | | |
|
||||
| dunstrc | ✓ | | | |
|
||||
| earthfile | ✓ | ✓ | ✓ | `earthlyls` |
|
||||
| edoc | ✓ | | | |
|
||||
| eex | ✓ | | | |
|
||||
| ejs | ✓ | | | |
|
||||
| elisp | ✓ | | | |
|
||||
| elixir | ✓ | ✓ | ✓ | `elixir-ls` |
|
||||
| elm | ✓ | ✓ | | `elm-language-server` |
|
||||
| elvish | ✓ | | | `elvish` |
|
||||
| env | ✓ | ✓ | | |
|
||||
| erb | ✓ | | | |
|
||||
| erlang | ✓ | ✓ | | `erlang_ls`, `elp` |
|
||||
| esdl | ✓ | | | |
|
||||
| fennel | ✓ | | | `fennel-ls` |
|
||||
| fga | ✓ | ✓ | ✓ | |
|
||||
| fidl | ✓ | | | |
|
||||
| fish | ✓ | ✓ | ✓ | `fish-lsp` |
|
||||
| forth | ✓ | | | `forth-lsp` |
|
||||
| fortran | ✓ | | ✓ | `fortls` |
|
||||
| fsharp | ✓ | | | `fsautocomplete` |
|
||||
| gas | ✓ | ✓ | | `asm-lsp` |
|
||||
| gdscript | ✓ | ✓ | ✓ | |
|
||||
| gemini | ✓ | | | |
|
||||
| gherkin | ✓ | | | |
|
||||
| ghostty | ✓ | | | |
|
||||
| git-attributes | ✓ | | | |
|
||||
| git-commit | ✓ | ✓ | | |
|
||||
| git-config | ✓ | ✓ | | |
|
||||
| git-ignore | ✓ | | | |
|
||||
| git-notes | ✓ | | | |
|
||||
| git-rebase | ✓ | | | |
|
||||
| gjs | ✓ | ✓ | ✓ | `typescript-language-server`, `vscode-eslint-language-server`, `ember-language-server` |
|
||||
| gleam | ✓ | ✓ | | `gleam` |
|
||||
| glimmer | ✓ | | | `ember-language-server` |
|
||||
| glsl | ✓ | ✓ | ✓ | `glsl_analyzer` |
|
||||
| gn | ✓ | | | |
|
||||
| go | ✓ | ✓ | ✓ | `gopls`, `golangci-lint-langserver` |
|
||||
| godot-resource | ✓ | ✓ | | |
|
||||
| gomod | ✓ | | | `gopls` |
|
||||
| gotmpl | ✓ | | | `gopls` |
|
||||
| gowork | ✓ | | | `gopls` |
|
||||
| gpr | ✓ | | | `ada_language_server` |
|
||||
| graphql | ✓ | ✓ | | `graphql-lsp` |
|
||||
| gren | ✓ | ✓ | | |
|
||||
| groovy | ✓ | | | |
|
||||
| gts | ✓ | ✓ | ✓ | `typescript-language-server`, `vscode-eslint-language-server`, `ember-language-server` |
|
||||
| hare | ✓ | | | |
|
||||
| haskell | ✓ | ✓ | | `haskell-language-server-wrapper` |
|
||||
| haskell-persistent | ✓ | | | |
|
||||
| hcl | ✓ | ✓ | ✓ | `terraform-ls` |
|
||||
| heex | ✓ | ✓ | | `elixir-ls` |
|
||||
| helm | ✓ | | | `helm_ls` |
|
||||
| hocon | ✓ | ✓ | ✓ | |
|
||||
| hoon | ✓ | | | |
|
||||
| hosts | ✓ | | | |
|
||||
| html | ✓ | | | `vscode-html-language-server`, `superhtml` |
|
||||
| htmldjango | ✓ | | | `djlsp`, `vscode-html-language-server`, `superhtml` |
|
||||
| hurl | ✓ | ✓ | ✓ | |
|
||||
| hyprlang | ✓ | | ✓ | `hyprls` |
|
||||
| idris | | | | `idris2-lsp` |
|
||||
| iex | ✓ | | | |
|
||||
| ini | ✓ | | | |
|
||||
| ink | ✓ | | | |
|
||||
| inko | ✓ | ✓ | ✓ | |
|
||||
| janet | ✓ | | | |
|
||||
| java | ✓ | ✓ | ✓ | `jdtls` |
|
||||
| javascript | ✓ | ✓ | ✓ | `typescript-language-server` |
|
||||
| jinja | ✓ | | | |
|
||||
| jjconfig | ✓ | ✓ | ✓ | `taplo`, `tombi` |
|
||||
| jjdescription | ✓ | | | |
|
||||
| jjrevset | ✓ | | | |
|
||||
| jjtemplate | ✓ | | | |
|
||||
| jq | ✓ | ✓ | | `jq-lsp` |
|
||||
| jsdoc | ✓ | | | |
|
||||
| json | ✓ | ✓ | ✓ | `vscode-json-language-server` |
|
||||
| json-ld | ✓ | ✓ | ✓ | `vscode-json-language-server` |
|
||||
| json5 | ✓ | | | |
|
||||
| jsonc | ✓ | | ✓ | `vscode-json-language-server` |
|
||||
| jsonnet | ✓ | | | `jsonnet-language-server` |
|
||||
| jsx | ✓ | ✓ | ✓ | `typescript-language-server` |
|
||||
| julia | ✓ | ✓ | ✓ | `julia` |
|
||||
| just | ✓ | ✓ | ✓ | `just-lsp` |
|
||||
| kdl | ✓ | ✓ | ✓ | |
|
||||
| koka | ✓ | | ✓ | `koka` |
|
||||
| kotlin | ✓ | ✓ | ✓ | `kotlin-language-server` |
|
||||
| koto | ✓ | ✓ | ✓ | `koto-ls` |
|
||||
| latex | ✓ | ✓ | | `texlab` |
|
||||
| ld | ✓ | | ✓ | |
|
||||
| ldif | ✓ | | | |
|
||||
| lean | ✓ | | | `lean` |
|
||||
| ledger | ✓ | | | |
|
||||
| llvm | ✓ | ✓ | ✓ | |
|
||||
| llvm-mir | ✓ | ✓ | ✓ | |
|
||||
| llvm-mir-yaml | ✓ | | ✓ | |
|
||||
| log | ✓ | | | |
|
||||
| lpf | ✓ | | | |
|
||||
| lua | ✓ | ✓ | ✓ | `lua-language-server` |
|
||||
| luau | ✓ | ✓ | ✓ | `luau-lsp` |
|
||||
| mail | ✓ | ✓ | | |
|
||||
| make | ✓ | | ✓ | |
|
||||
| markdoc | ✓ | | | `markdoc-ls` |
|
||||
| markdown | ✓ | | | `marksman`, `markdown-oxide` |
|
||||
| markdown-rustdoc | ✓ | | | |
|
||||
| markdown.inline | ✓ | | | |
|
||||
| matlab | ✓ | ✓ | ✓ | |
|
||||
| mermaid | ✓ | | | |
|
||||
| meson | ✓ | | ✓ | `mesonlsp` |
|
||||
| mint | | | | `mint` |
|
||||
| mojo | ✓ | ✓ | ✓ | `pixi` |
|
||||
| move | ✓ | | | |
|
||||
| msbuild | ✓ | | ✓ | |
|
||||
| nasm | ✓ | ✓ | | `asm-lsp` |
|
||||
| nestedtext | ✓ | ✓ | ✓ | |
|
||||
| nginx | ✓ | | | |
|
||||
| nickel | ✓ | | ✓ | `nls` |
|
||||
| nim | ✓ | ✓ | ✓ | `nimlangserver` |
|
||||
| nix | ✓ | ✓ | ✓ | `nil`, `nixd` |
|
||||
| nu | ✓ | | | `nu` |
|
||||
| nunjucks | ✓ | | | |
|
||||
| ocaml | ✓ | | ✓ | `ocamllsp` |
|
||||
| ocaml-interface | ✓ | | | `ocamllsp` |
|
||||
| odin | ✓ | ✓ | ✓ | `ols` |
|
||||
| ohm | ✓ | ✓ | ✓ | |
|
||||
| opencl | ✓ | ✓ | ✓ | `clangd` |
|
||||
| openscad | ✓ | | | `openscad-lsp` |
|
||||
| org | ✓ | | | |
|
||||
| pascal | ✓ | ✓ | | `pasls` |
|
||||
| passwd | ✓ | | | |
|
||||
| pem | ✓ | | | |
|
||||
| perl | ✓ | ✓ | ✓ | `perlnavigator` |
|
||||
| pest | ✓ | ✓ | ✓ | `pest-language-server` |
|
||||
| php | ✓ | ✓ | ✓ | `intelephense` |
|
||||
| php-only | ✓ | | | |
|
||||
| pkgbuild | ✓ | ✓ | ✓ | `termux-language-server`, `bash-language-server` |
|
||||
| pkl | ✓ | | ✓ | `pkl-lsp` |
|
||||
| po | ✓ | ✓ | | |
|
||||
| pod | ✓ | | | |
|
||||
| ponylang | ✓ | ✓ | ✓ | |
|
||||
| powershell | ✓ | | | |
|
||||
| prisma | ✓ | ✓ | | `prisma-language-server` |
|
||||
| prolog | ✓ | | ✓ | `swipl` |
|
||||
| properties | ✓ | ✓ | | |
|
||||
| protobuf | ✓ | ✓ | ✓ | `buf`, `pb`, `protols` |
|
||||
| prql | ✓ | | | |
|
||||
| pug | ✓ | | | |
|
||||
| purescript | ✓ | ✓ | | `purescript-language-server` |
|
||||
| python | ✓ | ✓ | ✓ | `ty`, `ruff`, `jedi-language-server`, `pylsp` |
|
||||
| qml | ✓ | ✓ | ✓ | `qmlls` |
|
||||
| quarto | ✓ | | ✓ | |
|
||||
| quint | ✓ | | | `quint-language-server` |
|
||||
| r | ✓ | | | `R` |
|
||||
| racket | ✓ | | ✓ | `racket` |
|
||||
| regex | ✓ | | | |
|
||||
| rego | ✓ | | | `regols` |
|
||||
| rescript | ✓ | ✓ | | `rescript-language-server` |
|
||||
| rmarkdown | ✓ | | ✓ | `R` |
|
||||
| robot | ✓ | | | `robotframework_ls` |
|
||||
| ron | ✓ | | ✓ | |
|
||||
| rst | ✓ | | | |
|
||||
| ruby | ✓ | ✓ | ✓ | `ruby-lsp`, `solargraph` |
|
||||
| rust | ✓ | ✓ | ✓ | `rust-analyzer` |
|
||||
| rust-format-args | ✓ | | | |
|
||||
| rust-format-args-macro | ✓ | ✓ | ✓ | |
|
||||
| sage | ✓ | ✓ | | |
|
||||
| scala | ✓ | ✓ | ✓ | `metals` |
|
||||
| scheme | ✓ | | ✓ | |
|
||||
| scss | ✓ | | | `vscode-css-language-server` |
|
||||
| slang | ✓ | ✓ | ✓ | `slangd` |
|
||||
| slint | ✓ | ✓ | ✓ | `slint-lsp` |
|
||||
| smali | ✓ | | ✓ | |
|
||||
| smithy | ✓ | | | `cs` |
|
||||
| sml | ✓ | | | |
|
||||
| snakemake | ✓ | | ✓ | `pylsp` |
|
||||
| solidity | ✓ | ✓ | | `solc` |
|
||||
| sourcepawn | ✓ | ✓ | | `sourcepawn-studio` |
|
||||
| spade | ✓ | | ✓ | `spade-language-server` |
|
||||
| spicedb | ✓ | | | |
|
||||
| sql | ✓ | ✓ | | |
|
||||
| sshclientconfig | ✓ | | | |
|
||||
| starlark | ✓ | ✓ | ✓ | `starpls` |
|
||||
| strace | ✓ | | | |
|
||||
| supercollider | ✓ | | | |
|
||||
| svelte | ✓ | | ✓ | `svelteserver` |
|
||||
| sway | ✓ | ✓ | ✓ | `forc` |
|
||||
| swift | ✓ | ✓ | | `sourcekit-lsp` |
|
||||
| systemd | ✓ | | | `systemd-lsp` |
|
||||
| t32 | ✓ | | | |
|
||||
| tablegen | ✓ | ✓ | ✓ | |
|
||||
| tact | ✓ | ✓ | ✓ | |
|
||||
| task | ✓ | | | |
|
||||
| tcl | ✓ | | ✓ | |
|
||||
| teal | ✓ | | | `teal-language-server` |
|
||||
| templ | ✓ | | | `templ` |
|
||||
| tera | ✓ | | | |
|
||||
| textproto | ✓ | ✓ | ✓ | |
|
||||
| tfvars | ✓ | | ✓ | `terraform-ls` |
|
||||
| thrift | ✓ | | | |
|
||||
| tlaplus | ✓ | | | |
|
||||
| todotxt | ✓ | | | |
|
||||
| toml | ✓ | ✓ | | `taplo`, `tombi` |
|
||||
| tsq | ✓ | | | `ts_query_ls` |
|
||||
| tsx | ✓ | ✓ | ✓ | `typescript-language-server` |
|
||||
| twig | ✓ | | | |
|
||||
| typescript | ✓ | ✓ | ✓ | `typescript-language-server` |
|
||||
| typespec | ✓ | ✓ | ✓ | `tsp-server` |
|
||||
| typst | ✓ | | | `tinymist` |
|
||||
| ungrammar | ✓ | | | |
|
||||
| unison | ✓ | ✓ | ✓ | |
|
||||
| uxntal | ✓ | | | |
|
||||
| v | ✓ | ✓ | ✓ | `v-analyzer` |
|
||||
| vala | ✓ | ✓ | | `vala-language-server` |
|
||||
| vento | ✓ | | | |
|
||||
| verilog | ✓ | ✓ | | `svlangserver` |
|
||||
| vhdl | ✓ | | | `vhdl_ls` |
|
||||
| vhs | ✓ | | | |
|
||||
| vue | ✓ | | | `vue-language-server` |
|
||||
| wast | ✓ | | | |
|
||||
| wat | ✓ | | | `wat_server` |
|
||||
| webc | ✓ | | | |
|
||||
| werk | ✓ | | | |
|
||||
| wesl | ✓ | ✓ | | |
|
||||
| wgsl | ✓ | | | `wgsl-analyzer` |
|
||||
| wit | ✓ | | ✓ | |
|
||||
| wren | ✓ | ✓ | ✓ | |
|
||||
| xit | ✓ | | | |
|
||||
| xml | ✓ | | ✓ | |
|
||||
| xtc | ✓ | | | |
|
||||
| yaml | ✓ | ✓ | ✓ | `yaml-language-server`, `ansible-language-server` |
|
||||
| yara | ✓ | | | `yls` |
|
||||
| yuck | ✓ | | | |
|
||||
| zig | ✓ | ✓ | ✓ | `zls` |
|
||||
| Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Code Navigation Tags | Rainbow Brackets | Default language servers |
|
||||
| --- | --- | --- | --- | --- | --- | --- |
|
||||
| ada | ✓ | ✓ | | | | `ada_language_server` |
|
||||
| adl | ✓ | ✓ | ✓ | | | |
|
||||
| agda | ✓ | | | | | |
|
||||
| alloy | ✓ | | | | | |
|
||||
| amber | ✓ | | | | | `amber-lsp` |
|
||||
| astro | ✓ | | | | | `astro-ls` |
|
||||
| awk | ✓ | ✓ | | | | `awk-language-server` |
|
||||
| bash | ✓ | ✓ | ✓ | | ✓ | `bash-language-server` |
|
||||
| bass | ✓ | | | | | `bass` |
|
||||
| beancount | ✓ | | | | | `beancount-language-server` |
|
||||
| bibtex | ✓ | | | | | `texlab` |
|
||||
| bicep | ✓ | | | | | `bicep-langserver` |
|
||||
| bitbake | ✓ | | | | | `bitbake-language-server` |
|
||||
| blade | ✓ | | | | | |
|
||||
| blueprint | ✓ | | | | | `blueprint-compiler` |
|
||||
| c | ✓ | ✓ | ✓ | ✓ | ✓ | `clangd` |
|
||||
| c-sharp | ✓ | ✓ | | ✓ | | `OmniSharp` |
|
||||
| cabal | | | | | | `haskell-language-server-wrapper` |
|
||||
| caddyfile | ✓ | ✓ | ✓ | | | |
|
||||
| cairo | ✓ | ✓ | ✓ | | | `cairo-language-server` |
|
||||
| capnp | ✓ | | ✓ | | | |
|
||||
| cel | ✓ | | | | | |
|
||||
| circom | ✓ | | | | | `circom-lsp` |
|
||||
| clarity | ✓ | | | | | `clarinet` |
|
||||
| clojure | ✓ | | | | ✓ | `clojure-lsp` |
|
||||
| cmake | ✓ | ✓ | ✓ | | | `neocmakelsp`, `cmake-language-server` |
|
||||
| codeql | ✓ | ✓ | | | | `codeql` |
|
||||
| comment | ✓ | | | | | |
|
||||
| common-lisp | ✓ | | ✓ | | ✓ | `cl-lsp` |
|
||||
| cpon | ✓ | | ✓ | | | |
|
||||
| cpp | ✓ | ✓ | ✓ | ✓ | ✓ | `clangd` |
|
||||
| crystal | ✓ | ✓ | ✓ | ✓ | | `crystalline`, `ameba-ls` |
|
||||
| css | ✓ | | ✓ | | ✓ | `vscode-css-language-server` |
|
||||
| csv | ✓ | | | | | |
|
||||
| cue | ✓ | | | | | `cuelsp` |
|
||||
| cylc | ✓ | ✓ | ✓ | | | |
|
||||
| d | ✓ | ✓ | ✓ | | | `serve-d` |
|
||||
| dart | ✓ | ✓ | ✓ | | | `dart` |
|
||||
| dbml | ✓ | | | | | |
|
||||
| debian | ✓ | | | | | |
|
||||
| devicetree | ✓ | | | | | `dts-lsp` |
|
||||
| dhall | ✓ | ✓ | | | | `dhall-lsp-server` |
|
||||
| diff | ✓ | | | | | |
|
||||
| djot | ✓ | | | | | |
|
||||
| docker-compose | ✓ | ✓ | ✓ | | | `docker-compose-langserver`, `yaml-language-server` |
|
||||
| dockerfile | ✓ | ✓ | | | | `docker-langserver` |
|
||||
| dot | ✓ | | | | | `dot-language-server` |
|
||||
| dtd | ✓ | | | | | |
|
||||
| dune | ✓ | | | | | |
|
||||
| dunstrc | ✓ | | | | | |
|
||||
| earthfile | ✓ | ✓ | ✓ | | | `earthlyls` |
|
||||
| edoc | ✓ | | | | | |
|
||||
| eex | ✓ | | | | | |
|
||||
| ejs | ✓ | | | | | |
|
||||
| elisp | ✓ | | | ✓ | | |
|
||||
| elixir | ✓ | ✓ | ✓ | ✓ | ✓ | `elixir-ls` |
|
||||
| elm | ✓ | ✓ | | ✓ | | `elm-language-server` |
|
||||
| elvish | ✓ | | | | | `elvish` |
|
||||
| env | ✓ | ✓ | | | | |
|
||||
| erb | ✓ | | | | | |
|
||||
| erlang | ✓ | ✓ | | ✓ | ✓ | `erlang_ls`, `elp` |
|
||||
| esdl | ✓ | | | | | |
|
||||
| fennel | ✓ | | | | | `fennel-ls` |
|
||||
| fga | ✓ | ✓ | ✓ | | | |
|
||||
| fidl | ✓ | | | | | |
|
||||
| fish | ✓ | ✓ | ✓ | | | `fish-lsp` |
|
||||
| forth | ✓ | | | | | `forth-lsp` |
|
||||
| fortran | ✓ | | ✓ | | | `fortls` |
|
||||
| fsharp | ✓ | | | | | `fsautocomplete` |
|
||||
| gas | ✓ | ✓ | | | | `asm-lsp` |
|
||||
| gdscript | ✓ | ✓ | ✓ | ✓ | | |
|
||||
| gemini | ✓ | | | | | |
|
||||
| gherkin | ✓ | | | | | |
|
||||
| ghostty | ✓ | | | | | |
|
||||
| git-attributes | ✓ | | | | | |
|
||||
| git-commit | ✓ | ✓ | | | | |
|
||||
| git-config | ✓ | ✓ | | | | |
|
||||
| git-ignore | ✓ | | | | | |
|
||||
| git-notes | ✓ | | | | | |
|
||||
| git-rebase | ✓ | | | | | |
|
||||
| gjs | ✓ | ✓ | ✓ | ✓ | | `typescript-language-server`, `vscode-eslint-language-server`, `ember-language-server` |
|
||||
| gleam | ✓ | ✓ | | | ✓ | `gleam` |
|
||||
| glimmer | ✓ | | | | | `ember-language-server` |
|
||||
| glsl | ✓ | ✓ | ✓ | | | `glsl_analyzer` |
|
||||
| gn | ✓ | | | | | |
|
||||
| go | ✓ | ✓ | ✓ | ✓ | ✓ | `gopls`, `golangci-lint-langserver` |
|
||||
| godot-resource | ✓ | ✓ | | | | |
|
||||
| gomod | ✓ | | | | | `gopls` |
|
||||
| gotmpl | ✓ | | | | | `gopls` |
|
||||
| gowork | ✓ | | | | | `gopls` |
|
||||
| gpr | ✓ | | | | | `ada_language_server` |
|
||||
| graphql | ✓ | ✓ | | | | `graphql-lsp` |
|
||||
| gren | ✓ | ✓ | | | | |
|
||||
| groovy | ✓ | | | | | |
|
||||
| gts | ✓ | ✓ | ✓ | ✓ | | `typescript-language-server`, `vscode-eslint-language-server`, `ember-language-server` |
|
||||
| hare | ✓ | | | | | |
|
||||
| haskell | ✓ | ✓ | | | | `haskell-language-server-wrapper` |
|
||||
| haskell-persistent | ✓ | | | | | |
|
||||
| hcl | ✓ | ✓ | ✓ | | | `terraform-ls` |
|
||||
| heex | ✓ | ✓ | | | | `elixir-ls` |
|
||||
| helm | ✓ | | | | | `helm_ls` |
|
||||
| hocon | ✓ | ✓ | ✓ | | | |
|
||||
| hoon | ✓ | | | | | |
|
||||
| hosts | ✓ | | | | | |
|
||||
| html | ✓ | ✓ | | | ✓ | `vscode-html-language-server`, `superhtml` |
|
||||
| htmldjango | ✓ | | | | | `djlsp`, `vscode-html-language-server`, `superhtml` |
|
||||
| hurl | ✓ | ✓ | ✓ | | | |
|
||||
| hyprlang | ✓ | | ✓ | | | `hyprls` |
|
||||
| idris | | | | | | `idris2-lsp` |
|
||||
| iex | ✓ | | | | | |
|
||||
| ini | ✓ | | | | | |
|
||||
| ink | ✓ | | | | | |
|
||||
| inko | ✓ | ✓ | ✓ | | | |
|
||||
| janet | ✓ | | | | | |
|
||||
| java | ✓ | ✓ | ✓ | | ✓ | `jdtls` |
|
||||
| javascript | ✓ | ✓ | ✓ | ✓ | ✓ | `typescript-language-server` |
|
||||
| jinja | ✓ | | | | | |
|
||||
| jjconfig | ✓ | ✓ | ✓ | | | `taplo`, `tombi` |
|
||||
| jjdescription | ✓ | | | | | |
|
||||
| jjrevset | ✓ | | | | | |
|
||||
| jjtemplate | ✓ | | | | | |
|
||||
| jq | ✓ | ✓ | | | | `jq-lsp` |
|
||||
| jsdoc | ✓ | | | | | |
|
||||
| json | ✓ | ✓ | ✓ | | ✓ | `vscode-json-language-server` |
|
||||
| json-ld | ✓ | ✓ | ✓ | | | `vscode-json-language-server` |
|
||||
| json5 | ✓ | | | | | |
|
||||
| jsonc | ✓ | | ✓ | | | `vscode-json-language-server` |
|
||||
| jsonnet | ✓ | | | | | `jsonnet-language-server` |
|
||||
| jsx | ✓ | ✓ | ✓ | ✓ | ✓ | `typescript-language-server` |
|
||||
| julia | ✓ | ✓ | ✓ | | | `julia` |
|
||||
| just | ✓ | ✓ | ✓ | | | `just-lsp` |
|
||||
| kdl | ✓ | ✓ | ✓ | | | |
|
||||
| koka | ✓ | | ✓ | | | `koka` |
|
||||
| kotlin | ✓ | ✓ | ✓ | | | `kotlin-language-server` |
|
||||
| koto | ✓ | ✓ | ✓ | | | `koto-ls` |
|
||||
| latex | ✓ | ✓ | | | | `texlab` |
|
||||
| ld | ✓ | | ✓ | | | |
|
||||
| ldif | ✓ | | | | | |
|
||||
| lean | ✓ | | | | | `lean` |
|
||||
| ledger | ✓ | | | | | |
|
||||
| llvm | ✓ | ✓ | ✓ | | | |
|
||||
| llvm-mir | ✓ | ✓ | ✓ | | | |
|
||||
| llvm-mir-yaml | ✓ | | ✓ | | | |
|
||||
| log | ✓ | | | | | |
|
||||
| lpf | ✓ | | | | | |
|
||||
| lua | ✓ | ✓ | ✓ | | | `lua-language-server` |
|
||||
| luau | ✓ | ✓ | ✓ | | | `luau-lsp` |
|
||||
| mail | ✓ | ✓ | | | | |
|
||||
| make | ✓ | | ✓ | | | |
|
||||
| markdoc | ✓ | | | | | `markdoc-ls` |
|
||||
| markdown | ✓ | | | ✓ | | `marksman`, `markdown-oxide` |
|
||||
| markdown-rustdoc | ✓ | | | | | |
|
||||
| markdown.inline | ✓ | | | | | |
|
||||
| matlab | ✓ | ✓ | ✓ | | | |
|
||||
| mermaid | ✓ | | | | | |
|
||||
| meson | ✓ | | ✓ | | | `mesonlsp` |
|
||||
| mint | | | | | | `mint` |
|
||||
| mojo | ✓ | ✓ | ✓ | | | `pixi` |
|
||||
| move | ✓ | | | | | |
|
||||
| msbuild | ✓ | | ✓ | | | |
|
||||
| nasm | ✓ | ✓ | | | | `asm-lsp` |
|
||||
| nestedtext | ✓ | ✓ | ✓ | | | |
|
||||
| nginx | ✓ | | | | | |
|
||||
| nickel | ✓ | | ✓ | | | `nls` |
|
||||
| nim | ✓ | ✓ | ✓ | | | `nimlangserver` |
|
||||
| nix | ✓ | ✓ | ✓ | | ✓ | `nil`, `nixd` |
|
||||
| nu | ✓ | | | | | `nu` |
|
||||
| nunjucks | ✓ | | | | | |
|
||||
| ocaml | ✓ | | ✓ | | | `ocamllsp` |
|
||||
| ocaml-interface | ✓ | | | | | `ocamllsp` |
|
||||
| odin | ✓ | ✓ | ✓ | | | `ols` |
|
||||
| ohm | ✓ | ✓ | ✓ | | | |
|
||||
| opencl | ✓ | ✓ | ✓ | | | `clangd` |
|
||||
| openscad | ✓ | | | | | `openscad-lsp` |
|
||||
| org | ✓ | | | | | |
|
||||
| pascal | ✓ | ✓ | | | | `pasls` |
|
||||
| passwd | ✓ | | | | | |
|
||||
| pem | ✓ | | | | | |
|
||||
| perl | ✓ | ✓ | ✓ | | | `perlnavigator` |
|
||||
| pest | ✓ | ✓ | ✓ | | | `pest-language-server` |
|
||||
| php | ✓ | ✓ | ✓ | ✓ | | `intelephense` |
|
||||
| php-only | ✓ | | | ✓ | | |
|
||||
| pkgbuild | ✓ | ✓ | ✓ | | | `termux-language-server`, `bash-language-server` |
|
||||
| pkl | ✓ | | ✓ | | | `pkl-lsp` |
|
||||
| po | ✓ | ✓ | | | | |
|
||||
| pod | ✓ | | | | | |
|
||||
| ponylang | ✓ | ✓ | ✓ | | | |
|
||||
| powershell | ✓ | | | | | |
|
||||
| prisma | ✓ | ✓ | | | | `prisma-language-server` |
|
||||
| prolog | ✓ | | ✓ | | | `swipl` |
|
||||
| properties | ✓ | ✓ | | | | |
|
||||
| protobuf | ✓ | ✓ | ✓ | | | `buf`, `pb`, `protols` |
|
||||
| prql | ✓ | | | | | |
|
||||
| pug | ✓ | | | | | |
|
||||
| purescript | ✓ | ✓ | | | | `purescript-language-server` |
|
||||
| python | ✓ | ✓ | ✓ | ✓ | ✓ | `ty`, `ruff`, `jedi-language-server`, `pylsp` |
|
||||
| qml | ✓ | ✓ | ✓ | | | `qmlls` |
|
||||
| quarto | ✓ | | ✓ | | | |
|
||||
| quint | ✓ | | | | | `quint-language-server` |
|
||||
| r | ✓ | | | | | `R` |
|
||||
| racket | ✓ | | ✓ | | ✓ | `racket` |
|
||||
| regex | ✓ | | | | ✓ | |
|
||||
| rego | ✓ | | | | | `regols` |
|
||||
| rescript | ✓ | ✓ | | | | `rescript-language-server` |
|
||||
| rmarkdown | ✓ | | ✓ | | | `R` |
|
||||
| robot | ✓ | | | | | `robotframework_ls` |
|
||||
| ron | ✓ | | ✓ | | | |
|
||||
| rst | ✓ | | | | | |
|
||||
| ruby | ✓ | ✓ | ✓ | ✓ | ✓ | `ruby-lsp`, `solargraph` |
|
||||
| rust | ✓ | ✓ | ✓ | ✓ | ✓ | `rust-analyzer` |
|
||||
| rust-format-args | ✓ | | | | | |
|
||||
| rust-format-args-macro | ✓ | ✓ | ✓ | | | |
|
||||
| sage | ✓ | ✓ | | | | |
|
||||
| scala | ✓ | ✓ | ✓ | | | `metals` |
|
||||
| scheme | ✓ | | ✓ | | ✓ | |
|
||||
| scss | ✓ | | | | ✓ | `vscode-css-language-server` |
|
||||
| slang | ✓ | ✓ | ✓ | | | `slangd` |
|
||||
| slint | ✓ | ✓ | ✓ | | | `slint-lsp` |
|
||||
| smali | ✓ | | ✓ | | | |
|
||||
| smithy | ✓ | | | | | `cs` |
|
||||
| sml | ✓ | | | | | |
|
||||
| snakemake | ✓ | | ✓ | | | `pylsp` |
|
||||
| solidity | ✓ | ✓ | | | | `solc` |
|
||||
| sourcepawn | ✓ | ✓ | | | | `sourcepawn-studio` |
|
||||
| spade | ✓ | | ✓ | | | `spade-language-server` |
|
||||
| spicedb | ✓ | | | ✓ | | |
|
||||
| sql | ✓ | ✓ | | | | |
|
||||
| sshclientconfig | ✓ | | | | | |
|
||||
| starlark | ✓ | ✓ | ✓ | | ✓ | `starpls` |
|
||||
| strace | ✓ | | | | | |
|
||||
| supercollider | ✓ | | | | | |
|
||||
| svelte | ✓ | | ✓ | | | `svelteserver` |
|
||||
| sway | ✓ | ✓ | ✓ | | | `forc` |
|
||||
| swift | ✓ | ✓ | | | | `sourcekit-lsp` |
|
||||
| systemd | ✓ | | | | | `systemd-lsp` |
|
||||
| t32 | ✓ | | | | | |
|
||||
| tablegen | ✓ | ✓ | ✓ | | | |
|
||||
| tact | ✓ | ✓ | ✓ | | | |
|
||||
| task | ✓ | | | | | |
|
||||
| tcl | ✓ | | ✓ | | | |
|
||||
| teal | ✓ | | | | | `teal-language-server` |
|
||||
| templ | ✓ | | | | | `templ` |
|
||||
| tera | ✓ | | | | | |
|
||||
| textproto | ✓ | ✓ | ✓ | | | |
|
||||
| tfvars | ✓ | | ✓ | | | `terraform-ls` |
|
||||
| thrift | ✓ | | | | | |
|
||||
| tlaplus | ✓ | | | | | |
|
||||
| todotxt | ✓ | | | | | |
|
||||
| toml | ✓ | ✓ | | | ✓ | `taplo`, `tombi` |
|
||||
| tsq | ✓ | | | | | `ts_query_ls` |
|
||||
| tsx | ✓ | ✓ | ✓ | ✓ | ✓ | `typescript-language-server` |
|
||||
| twig | ✓ | | | | | |
|
||||
| typescript | ✓ | ✓ | ✓ | ✓ | ✓ | `typescript-language-server` |
|
||||
| typespec | ✓ | ✓ | ✓ | | | `tsp-server` |
|
||||
| typst | ✓ | | | ✓ | | `tinymist` |
|
||||
| ungrammar | ✓ | | | | | |
|
||||
| unison | ✓ | ✓ | ✓ | | | |
|
||||
| uxntal | ✓ | | | | | |
|
||||
| v | ✓ | ✓ | ✓ | | | `v-analyzer` |
|
||||
| vala | ✓ | ✓ | | | | `vala-language-server` |
|
||||
| vento | ✓ | | | | | |
|
||||
| verilog | ✓ | ✓ | | | | `svlangserver` |
|
||||
| vhdl | ✓ | | | | | `vhdl_ls` |
|
||||
| vhs | ✓ | | | | | |
|
||||
| vue | ✓ | | | | | `vue-language-server` |
|
||||
| wast | ✓ | | | | | |
|
||||
| wat | ✓ | | | | | `wat_server` |
|
||||
| webc | ✓ | | | | | |
|
||||
| werk | ✓ | | | | | |
|
||||
| wesl | ✓ | ✓ | | | | |
|
||||
| wgsl | ✓ | | | | | `wgsl-analyzer` |
|
||||
| wit | ✓ | | ✓ | | | |
|
||||
| wren | ✓ | ✓ | ✓ | | | |
|
||||
| xit | ✓ | | | | | |
|
||||
| xml | ✓ | ✓ | ✓ | | ✓ | |
|
||||
| xtc | ✓ | | | | | |
|
||||
| yaml | ✓ | ✓ | ✓ | | ✓ | `yaml-language-server`, `ansible-language-server` |
|
||||
| yara | ✓ | | | | | `yls` |
|
||||
| yuck | ✓ | | | | | |
|
||||
| zig | ✓ | ✓ | ✓ | | | `zls` |
|
||||
|
||||
@@ -106,10 +106,14 @@
|
||||
| `code_action` | Perform code action | normal: `` <space>a ``, select: `` <space>a `` |
|
||||
| `buffer_picker` | Open buffer picker | normal: `` <space>b ``, select: `` <space>b `` |
|
||||
| `jumplist_picker` | Open jumplist picker | normal: `` <space>j ``, select: `` <space>j `` |
|
||||
| `symbol_picker` | Open symbol picker | normal: `` <space>s ``, select: `` <space>s `` |
|
||||
| `symbol_picker` | Open symbol picker | |
|
||||
| `syntax_symbol_picker` | Open symbol picker from syntax information | |
|
||||
| `lsp_or_syntax_symbol_picker` | Open symbol picker from LSP or syntax information | normal: `` <space>s ``, select: `` <space>s `` |
|
||||
| `changed_file_picker` | Open changed file picker | normal: `` <space>g ``, select: `` <space>g `` |
|
||||
| `select_references_to_symbol_under_cursor` | Select symbol references | normal: `` <space>h ``, select: `` <space>h `` |
|
||||
| `workspace_symbol_picker` | Open workspace symbol picker | normal: `` <space>S ``, select: `` <space>S `` |
|
||||
| `workspace_symbol_picker` | Open workspace symbol picker | |
|
||||
| `syntax_workspace_symbol_picker` | Open workspace symbol picker from syntax information | |
|
||||
| `lsp_or_syntax_workspace_symbol_picker` | Open workspace symbol picker from LSP or syntax information | normal: `` <space>S ``, select: `` <space>S `` |
|
||||
| `diagnostics_picker` | Open diagnostic picker | normal: `` <space>d ``, select: `` <space>d `` |
|
||||
| `workspace_diagnostics_picker` | Open workspace diagnostic picker | normal: `` <space>D ``, select: `` <space>D `` |
|
||||
| `last_picker` | Open last picker | normal: `` <space>' ``, select: `` <space>' `` |
|
||||
@@ -267,6 +271,8 @@
|
||||
| `goto_prev_comment` | Goto previous comment | normal: `` [c ``, select: `` [c `` |
|
||||
| `goto_next_test` | Goto next test | normal: `` ]T ``, select: `` ]T `` |
|
||||
| `goto_prev_test` | Goto previous test | normal: `` [T ``, select: `` [T `` |
|
||||
| `goto_next_xml_element` | Goto next (X)HTML element | normal: `` ]x ``, select: `` ]x `` |
|
||||
| `goto_prev_xml_element` | Goto previous (X)HTML element | normal: `` [x ``, select: `` [x `` |
|
||||
| `goto_next_entry` | Goto next pairing | normal: `` ]e ``, select: `` ]e `` |
|
||||
| `goto_prev_entry` | Goto previous pairing | normal: `` [e ``, select: `` [e `` |
|
||||
| `goto_next_paragraph` | Goto next paragraph | normal: `` ]p ``, select: `` ]p `` |
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Guides
|
||||
|
||||
This section contains guides for adding new language server configurations,
|
||||
tree-sitter grammars, textobject queries, and other similar items.
|
||||
tree-sitter grammars, textobject and rainbow bracket queries, and other similar items.
|
||||
|
||||
132
book/src/guides/rainbow_bracket_queries.md
Normal file
132
book/src/guides/rainbow_bracket_queries.md
Normal file
@@ -0,0 +1,132 @@
|
||||
# Adding Rainbow Bracket Queries
|
||||
|
||||
Helix uses `rainbows.scm` tree-sitter query files to provide rainbow bracket
|
||||
functionality.
|
||||
|
||||
Tree-sitter queries are documented in the tree-sitter online documentation.
|
||||
If you're writing queries for the first time, be sure to check out the section
|
||||
on [syntax highlighting queries] and on [query syntax].
|
||||
|
||||
Rainbow queries have two captures: `@rainbow.scope` and `@rainbow.bracket`.
|
||||
`@rainbow.scope` should capture any node that increases the nesting level
|
||||
while `@rainbow.bracket` should capture any bracket nodes. Put another way:
|
||||
`@rainbow.scope` switches to the next rainbow color for all nodes in the tree
|
||||
under it while `@rainbow.bracket` paints captured nodes with the current
|
||||
rainbow color.
|
||||
|
||||
For an example, let's add rainbow queries for the tree-sitter query (TSQ)
|
||||
language itself. These queries will go into a
|
||||
`runtime/queries/tsq/rainbows.scm` file in the repository root.
|
||||
|
||||
First we'll add the `@rainbow.bracket` captures. TSQ only has parentheses and
|
||||
square brackets:
|
||||
|
||||
```tsq
|
||||
["(" ")" "[" "]"] @rainbow.bracket
|
||||
```
|
||||
|
||||
The ordering of the nodes within the alternation (square brackets) is not
|
||||
taken into consideration.
|
||||
|
||||
> Note: Why are these nodes quoted? Most syntax highlights capture text
|
||||
> surrounded by parentheses. These are _named nodes_ and correspond to the
|
||||
> names of rules in the grammar. Brackets are usually written in tree-sitter
|
||||
> grammars as literal strings, for example:
|
||||
>
|
||||
> ```js
|
||||
> {
|
||||
> // ...
|
||||
> arguments: seq("(", repeat($.argument), ")"),
|
||||
> // ...
|
||||
> }
|
||||
> ```
|
||||
>
|
||||
> Nodes written as literal strings in tree-sitter grammars may be captured
|
||||
> in queries with those same literal strings.
|
||||
|
||||
Then we'll add `@rainbow.scope` captures. The easiest way to do this is to
|
||||
view the `grammar.js` file in the tree-sitter grammar's repository. For TSQ,
|
||||
that file is [here][tsq grammar.js]. As we scroll down the `grammar.js`, we
|
||||
see that the `(alternation)`, (L36) `(group)` (L57), `(named_node)` (L59),
|
||||
`(predicate)` (L87) and `(wildcard_node)` (L97) nodes all contain literal
|
||||
parentheses or square brackets in their definitions. These nodes are all
|
||||
direct parents of brackets and happen to also be the nodes we want to change
|
||||
to the next rainbow color, so we capture them as `@rainbow.scope`.
|
||||
|
||||
```tsq
|
||||
[
|
||||
(group)
|
||||
(named_node)
|
||||
(wildcard_node)
|
||||
(predicate)
|
||||
(alternation)
|
||||
] @rainbow.scope
|
||||
```
|
||||
|
||||
This strategy works as a rule of thumb for most programming and configuration
|
||||
languages. Markup languages can be trickier and may take additional
|
||||
experimentation to find the correct nodes to use for scopes and brackets.
|
||||
|
||||
The `:tree-sitter-subtree` command shows the syntax tree under the primary
|
||||
selection in S-expression format and can be a useful tool for determining how
|
||||
to write a query.
|
||||
|
||||
### Properties
|
||||
|
||||
The `rainbow.include-children` property may be applied to `@rainbow.scope`
|
||||
captures. By default, all `@rainbow.bracket` captures must be direct descendant
|
||||
of a node captured with `@rainbow.scope` in a syntax tree in order to be
|
||||
highlighted. The `rainbow.include-children` property disables that check and
|
||||
allows `@rainbow.bracket` captures to be highlighted if they are direct or
|
||||
indirect descendants of some node captured with `@rainbow.scope`.
|
||||
|
||||
For example, this property is used in the HTML rainbow queries.
|
||||
|
||||
For a document like `<a>link</a>`, the syntax tree is:
|
||||
|
||||
```tsq
|
||||
(element ; <a>link</a>
|
||||
(start_tag ; <a>
|
||||
(tag_name)) ; a
|
||||
(text) ; link
|
||||
(end_tag ; </a>
|
||||
(tag_name))) ; a
|
||||
```
|
||||
|
||||
If we want to highlight the `<`, `>` and `</` nodes with rainbow colors, we
|
||||
capture them as `@rainbow.bracket`:
|
||||
|
||||
```tsq
|
||||
["<" ">" "</"] @rainbow.bracket
|
||||
```
|
||||
|
||||
And we capture `(element)` as `@rainbow.scope` because `(element)` nodes nest
|
||||
within each other: they increment the nesting level and switch to the next
|
||||
color in the rainbow.
|
||||
|
||||
```tsq
|
||||
(element) @rainbow.scope
|
||||
```
|
||||
|
||||
But this combination of `@rainbow.scope` and `@rainbow.bracket` will not
|
||||
highlight any nodes. `<`, `>` and `</` are children of the `(start_tag)` and
|
||||
`(end_tag)` nodes. We can't capture `(start_tag)` and `(end_tag)` as
|
||||
`@rainbow.scope` because they don't nest other elements. We can fix this case
|
||||
by removing the requirement that `<`, `>` and `</` are direct descendants of
|
||||
`(element)` using the `rainbow.include-children` property.
|
||||
|
||||
```tsq
|
||||
((element) @rainbow.scope
|
||||
(#set! rainbow.include-children))
|
||||
```
|
||||
|
||||
With this property set, `<`, `>`, and `</` will highlight with rainbow colors
|
||||
even though they aren't direct descendents of the `(element)` node.
|
||||
|
||||
`rainbow.include-children` is not necessary for the vast majority of programming
|
||||
languages. It is only necessary when the node that increments the nesting level
|
||||
(changes rainbow color) is not the direct parent of the bracket node.
|
||||
|
||||
[syntax highlighting queries]: https://tree-sitter.github.io/tree-sitter/syntax-highlighting#highlights
|
||||
[query syntax]: https://tree-sitter.github.io/tree-sitter/using-parsers#pattern-matching-with-queries
|
||||
[tsq grammar.js]: https://github.com/the-mikedavis/tree-sitter-tsq/blob/48b5e9f82ae0a4727201626f33a17f69f8e0ff86/grammar.js
|
||||
34
book/src/guides/tags.md
Normal file
34
book/src/guides/tags.md
Normal file
@@ -0,0 +1,34 @@
|
||||
## Adding tags queries
|
||||
|
||||
See tree-sitter's documentation on [Code Navigation Systems] for more
|
||||
background on tags queries.
|
||||
|
||||
Helix provides LSP-like features such as document and workspace symbol pickers
|
||||
out-of-the-box for languages with `tags.scm` queries based on syntax trees. To
|
||||
be analyzed a language must have a tree-sitter grammar and a `tags.scm` query
|
||||
file which pattern matches interesting nodes from syntax trees.
|
||||
|
||||
Query files should be placed in `runtime/queries/{language}/tags.scm`
|
||||
when contributing to Helix. You may place these under your local runtime
|
||||
directory (`~/.config/helix/runtime` in Linux for example) for the sake of
|
||||
testing.
|
||||
|
||||
The following [captures][tree-sitter-captures] are recognized:
|
||||
|
||||
| Capture name |
|
||||
|--- |
|
||||
| `definition.class` |
|
||||
| `definition.constant` |
|
||||
| `definition.function` |
|
||||
| `definition.interface` |
|
||||
| `definition.macro` |
|
||||
| `definition.module` |
|
||||
| `definition.struct` |
|
||||
| `definition.type` |
|
||||
|
||||
[Example query files][example-queries] can be found in the Helix GitHub
|
||||
repository.
|
||||
|
||||
[Code Navigation Systems]: https://tree-sitter.github.io/tree-sitter/4-code-navigation.html
|
||||
[tree-sitter-captures]: https://tree-sitter.github.io/tree-sitter/using-parsers/queries/index.html
|
||||
[example-queries]: https://github.com/search?q=repo%3Ahelix-editor%2Fhelix+path%3A%2A%2A/tags.scm&type=Code
|
||||
@@ -28,6 +28,8 @@ The following [captures][tree-sitter-captures] are recognized:
|
||||
| `comment.around` |
|
||||
| `entry.inside` |
|
||||
| `entry.around` |
|
||||
| `xml-element.inside` |
|
||||
| `xml-element.around` |
|
||||
|
||||
[Example query files][textobject-examples] can be found in the helix GitHub repository.
|
||||
|
||||
|
||||
@@ -370,6 +370,8 @@ These mappings are in the style of [vim-unimpaired](https://github.com/tpope/vim
|
||||
| `[g` | Go to previous change | `goto_prev_change` |
|
||||
| `]G` | Go to last change | `goto_last_change` |
|
||||
| `[G` | Go to first change | `goto_first_change` |
|
||||
| `[x` | Go to next (X)HTML element | `goto_next_xml_element` |
|
||||
| `]x` | Go to previous (X)HTML element | `goto_prev_xml_element` |
|
||||
| `]Space` | Add newline below | `add_newline_below` |
|
||||
| `[Space` | Add newline above | `add_newline_above` |
|
||||
|
||||
|
||||
@@ -71,8 +71,10 @@ These configuration keys are available:
|
||||
| `text-width` | Maximum line length. Used for the `:reflow` command and soft-wrapping if `soft-wrap.wrap-at-text-width` is set, defaults to `editor.text-width` |
|
||||
| `rulers` | Overrides the `editor.rulers` config key for the language. |
|
||||
| `path-completion` | Overrides the `editor.path-completion` config key for the language. |
|
||||
| `word-completion` | Overrides the [`editor.word-completion`](./editor.md#editorword-completion-section) configuration for the language. |
|
||||
| `workspace-lsp-roots` | Directories relative to the workspace root that are treated as LSP roots. Should only be set in `.helix/config.toml`. Overwrites the setting of the same name in `config.toml` if set. |
|
||||
| `persistent-diagnostic-sources` | An array of LSP diagnostic sources assumed unchanged when the language server resends the same set of diagnostics. Helix can track the position for these diagnostics internally instead. Useful for diagnostics that are recomputed on save.
|
||||
| `rainbow-brackets` | Overrides the `editor.rainbow-brackets` config key for the language |
|
||||
|
||||
### File-type detection and the `file-types` key
|
||||
|
||||
|
||||
@@ -24,6 +24,7 @@ function or block of code.
|
||||
| `c` | Comment |
|
||||
| `T` | Test |
|
||||
| `g` | Change |
|
||||
| `x` | (X)HTML element |
|
||||
|
||||
> 💡 `f`, `t`, etc. need a tree-sitter grammar active for the current
|
||||
document and a special tree-sitter query file to work properly. [Only
|
||||
|
||||
@@ -130,6 +130,17 @@ inherits = "boo_berry"
|
||||
berry = "#2A2A4D"
|
||||
```
|
||||
|
||||
### Rainbow
|
||||
|
||||
The `rainbow` key is used for rainbow highlight for matching brackets.
|
||||
The key is a list of styles.
|
||||
|
||||
```toml
|
||||
rainbow = ["#ff0000", "#ffa500", "#fff000", { fg = "#00ff00", modifiers = ["bold"] }]
|
||||
```
|
||||
|
||||
Colors from the palette and modifiers may be used.
|
||||
|
||||
### Scopes
|
||||
|
||||
The following is a list of scopes available to use for styling:
|
||||
|
||||
@@ -47,6 +47,9 @@
|
||||
<content_rating type="oars-1.1" />
|
||||
|
||||
<releases>
|
||||
<release version="25.07.1" date="2025-07-18">
|
||||
<url>https://github.com/helix-editor/helix/releases/tag/25.07.1</url>
|
||||
</release>
|
||||
<release version="25.07" date="2025-07-15">
|
||||
<url>https://helix-editor.com/news/release-25-07-highlights/</url>
|
||||
</release>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
# The help message won't be overridden though, so it will still be present here
|
||||
|
||||
def health_categories [] {
|
||||
let languages = ^hx --health languages | detect columns | get Language | filter { $in != null }
|
||||
let languages = ^hx --health languages | detect columns | get Language | where { $in != null }
|
||||
let completions = [ "all", "clipboard", "languages" ] | append $languages
|
||||
return $completions
|
||||
}
|
||||
|
||||
@@ -16,6 +16,7 @@ pub struct CompletionItem {
|
||||
pub enum CompletionProvider {
|
||||
Lsp(LanguageServerId),
|
||||
Path,
|
||||
Word,
|
||||
}
|
||||
|
||||
impl From<LanguageServerId> for CompletionProvider {
|
||||
|
||||
@@ -13,6 +13,7 @@ use std::{
|
||||
use anyhow::{Context, Result};
|
||||
use arc_swap::{ArcSwap, Guard};
|
||||
use config::{Configuration, FileType, LanguageConfiguration, LanguageServerConfiguration};
|
||||
use foldhash::HashSet;
|
||||
use helix_loader::grammar::get_language;
|
||||
use helix_stdx::rope::RopeSliceExt as _;
|
||||
use once_cell::sync::OnceCell;
|
||||
@@ -20,7 +21,10 @@ use ropey::RopeSlice;
|
||||
use tree_house::{
|
||||
highlighter,
|
||||
query_iter::QueryIter,
|
||||
tree_sitter::{Grammar, InactiveQueryCursor, InputEdit, Node, Query, RopeInput, Tree},
|
||||
tree_sitter::{
|
||||
query::{InvalidPredicateError, UserPredicate},
|
||||
Capture, Grammar, InactiveQueryCursor, InputEdit, Node, Pattern, Query, RopeInput, Tree,
|
||||
},
|
||||
Error, InjectionLanguageMarker, LanguageConfig as SyntaxConfig, Layer,
|
||||
};
|
||||
|
||||
@@ -28,6 +32,7 @@ use crate::{indent::IndentQuery, tree_sitter, ChangeSet, Language};
|
||||
|
||||
pub use tree_house::{
|
||||
highlighter::{Highlight, HighlightEvent},
|
||||
query_iter::QueryIterEvent,
|
||||
Error as HighlighterError, LanguageLoader, TreeCursor, TREE_SITTER_MATCH_LIMIT,
|
||||
};
|
||||
|
||||
@@ -37,6 +42,8 @@ pub struct LanguageData {
|
||||
syntax: OnceCell<Option<SyntaxConfig>>,
|
||||
indent_query: OnceCell<Option<IndentQuery>>,
|
||||
textobject_query: OnceCell<Option<TextObjectQuery>>,
|
||||
tag_query: OnceCell<Option<TagQuery>>,
|
||||
rainbow_query: OnceCell<Option<RainbowQuery>>,
|
||||
}
|
||||
|
||||
impl LanguageData {
|
||||
@@ -46,6 +53,8 @@ impl LanguageData {
|
||||
syntax: OnceCell::new(),
|
||||
indent_query: OnceCell::new(),
|
||||
textobject_query: OnceCell::new(),
|
||||
tag_query: OnceCell::new(),
|
||||
rainbow_query: OnceCell::new(),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -154,6 +163,74 @@ impl LanguageData {
|
||||
.as_ref()
|
||||
}
|
||||
|
||||
/// Compiles the tags.scm query for a language.
|
||||
/// This function should only be used by this module or the xtask crate.
|
||||
pub fn compile_tag_query(
|
||||
grammar: Grammar,
|
||||
config: &LanguageConfiguration,
|
||||
) -> Result<Option<TagQuery>> {
|
||||
let name = &config.language_id;
|
||||
let text = read_query(name, "tags.scm");
|
||||
if text.is_empty() {
|
||||
return Ok(None);
|
||||
}
|
||||
let query = Query::new(grammar, &text, |_pattern, predicate| match predicate {
|
||||
// TODO: these predicates are allowed in tags.scm queries but not yet used.
|
||||
UserPredicate::IsPropertySet { key: "local", .. } => Ok(()),
|
||||
UserPredicate::Other(pred) => match pred.name() {
|
||||
"strip!" | "select-adjacent!" => Ok(()),
|
||||
_ => Err(InvalidPredicateError::unknown(predicate)),
|
||||
},
|
||||
_ => Err(InvalidPredicateError::unknown(predicate)),
|
||||
})
|
||||
.with_context(|| format!("Failed to compile tags.scm query for '{name}'"))?;
|
||||
Ok(Some(TagQuery { query }))
|
||||
}
|
||||
|
||||
fn tag_query(&self, loader: &Loader) -> Option<&TagQuery> {
|
||||
self.tag_query
|
||||
.get_or_init(|| {
|
||||
let grammar = self.syntax_config(loader)?.grammar;
|
||||
Self::compile_tag_query(grammar, &self.config)
|
||||
.map_err(|err| {
|
||||
log::error!("{err}");
|
||||
})
|
||||
.ok()
|
||||
.flatten()
|
||||
})
|
||||
.as_ref()
|
||||
}
|
||||
|
||||
/// Compiles the rainbows.scm query for a language.
|
||||
/// This function should only be used by this module or the xtask crate.
|
||||
pub fn compile_rainbow_query(
|
||||
grammar: Grammar,
|
||||
config: &LanguageConfiguration,
|
||||
) -> Result<Option<RainbowQuery>> {
|
||||
let name = &config.language_id;
|
||||
let text = read_query(name, "rainbows.scm");
|
||||
if text.is_empty() {
|
||||
return Ok(None);
|
||||
}
|
||||
let rainbow_query = RainbowQuery::new(grammar, &text)
|
||||
.with_context(|| format!("Failed to compile rainbows.scm query for '{name}'"))?;
|
||||
Ok(Some(rainbow_query))
|
||||
}
|
||||
|
||||
fn rainbow_query(&self, loader: &Loader) -> Option<&RainbowQuery> {
|
||||
self.rainbow_query
|
||||
.get_or_init(|| {
|
||||
let grammar = self.syntax_config(loader)?.grammar;
|
||||
Self::compile_rainbow_query(grammar, &self.config)
|
||||
.map_err(|err| {
|
||||
log::error!("{err}");
|
||||
})
|
||||
.ok()
|
||||
.flatten()
|
||||
})
|
||||
.as_ref()
|
||||
}
|
||||
|
||||
fn reconfigure(&self, scopes: &[String]) {
|
||||
if let Some(Some(config)) = self.syntax.get() {
|
||||
reconfigure_highlights(config, scopes);
|
||||
@@ -339,6 +416,14 @@ impl Loader {
|
||||
self.language(lang).textobject_query(self)
|
||||
}
|
||||
|
||||
pub fn tag_query(&self, lang: Language) -> Option<&TagQuery> {
|
||||
self.language(lang).tag_query(self)
|
||||
}
|
||||
|
||||
fn rainbow_query(&self, lang: Language) -> Option<&RainbowQuery> {
|
||||
self.language(lang).rainbow_query(self)
|
||||
}
|
||||
|
||||
pub fn language_server_configs(&self) -> &HashMap<String, LanguageServerConfiguration> {
|
||||
&self.language_server_configs
|
||||
}
|
||||
@@ -511,6 +596,92 @@ impl Syntax {
|
||||
{
|
||||
QueryIter::new(&self.inner, source, loader, range)
|
||||
}
|
||||
|
||||
pub fn tags<'a>(
|
||||
&'a self,
|
||||
source: RopeSlice<'a>,
|
||||
loader: &'a Loader,
|
||||
range: impl RangeBounds<u32>,
|
||||
) -> QueryIter<'a, 'a, impl FnMut(Language) -> Option<&'a Query> + 'a, ()> {
|
||||
self.query_iter(
|
||||
source,
|
||||
|lang| loader.tag_query(lang).map(|q| &q.query),
|
||||
range,
|
||||
)
|
||||
}
|
||||
|
||||
pub fn rainbow_highlights(
|
||||
&self,
|
||||
source: RopeSlice,
|
||||
rainbow_length: usize,
|
||||
loader: &Loader,
|
||||
range: impl RangeBounds<u32>,
|
||||
) -> OverlayHighlights {
|
||||
struct RainbowScope<'tree> {
|
||||
end: u32,
|
||||
node: Option<Node<'tree>>,
|
||||
highlight: Highlight,
|
||||
}
|
||||
|
||||
let mut scope_stack = Vec::<RainbowScope>::new();
|
||||
let mut highlights = Vec::new();
|
||||
let mut query_iter = self.query_iter::<_, (), _>(
|
||||
source,
|
||||
|lang| loader.rainbow_query(lang).map(|q| &q.query),
|
||||
range,
|
||||
);
|
||||
|
||||
while let Some(event) = query_iter.next() {
|
||||
let QueryIterEvent::Match(mat) = event else {
|
||||
continue;
|
||||
};
|
||||
|
||||
let rainbow_query = loader
|
||||
.rainbow_query(query_iter.current_language())
|
||||
.expect("language must have a rainbow query to emit matches");
|
||||
|
||||
let byte_range = mat.node.byte_range();
|
||||
// Pop any scopes that end before this capture begins.
|
||||
while scope_stack
|
||||
.last()
|
||||
.is_some_and(|scope| byte_range.start >= scope.end)
|
||||
{
|
||||
scope_stack.pop();
|
||||
}
|
||||
|
||||
let capture = Some(mat.capture);
|
||||
if capture == rainbow_query.scope_capture {
|
||||
scope_stack.push(RainbowScope {
|
||||
end: byte_range.end,
|
||||
node: if rainbow_query
|
||||
.include_children_patterns
|
||||
.contains(&mat.pattern)
|
||||
{
|
||||
None
|
||||
} else {
|
||||
Some(mat.node.clone())
|
||||
},
|
||||
highlight: Highlight::new((scope_stack.len() % rainbow_length) as u32),
|
||||
});
|
||||
} else if capture == rainbow_query.bracket_capture {
|
||||
if let Some(scope) = scope_stack.last() {
|
||||
if !scope
|
||||
.node
|
||||
.as_ref()
|
||||
.is_some_and(|node| mat.node.parent().as_ref() != Some(node))
|
||||
{
|
||||
let start = source
|
||||
.byte_to_char(source.floor_char_boundary(byte_range.start as usize));
|
||||
let end =
|
||||
source.byte_to_char(source.ceil_char_boundary(byte_range.end as usize));
|
||||
highlights.push((scope.highlight, start..end));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
OverlayHighlights::Heterogenous { highlights }
|
||||
}
|
||||
}
|
||||
|
||||
pub type Highlighter<'a> = highlighter::Highlighter<'a, 'a, Loader>;
|
||||
@@ -881,6 +1052,11 @@ impl TextObjectQuery {
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct TagQuery {
|
||||
pub query: Query,
|
||||
}
|
||||
|
||||
pub fn pretty_print_tree<W: fmt::Write>(fmt: &mut W, node: Node) -> fmt::Result {
|
||||
if node.child_count() == 0 {
|
||||
if node_is_visible(&node) {
|
||||
@@ -953,6 +1129,57 @@ fn pretty_print_tree_impl<W: fmt::Write>(
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Finds the child of `node` which contains the given byte range.
|
||||
|
||||
pub fn child_for_byte_range<'a>(node: &Node<'a>, range: ops::Range<u32>) -> Option<Node<'a>> {
|
||||
for child in node.children() {
|
||||
let child_range = child.byte_range();
|
||||
|
||||
if range.start >= child_range.start && range.end <= child_range.end {
|
||||
return Some(child);
|
||||
}
|
||||
}
|
||||
|
||||
None
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct RainbowQuery {
|
||||
query: Query,
|
||||
include_children_patterns: HashSet<Pattern>,
|
||||
scope_capture: Option<Capture>,
|
||||
bracket_capture: Option<Capture>,
|
||||
}
|
||||
|
||||
impl RainbowQuery {
|
||||
fn new(grammar: Grammar, source: &str) -> Result<Self, tree_sitter::query::ParseError> {
|
||||
let mut include_children_patterns = HashSet::default();
|
||||
|
||||
let query = Query::new(grammar, source, |pattern, predicate| match predicate {
|
||||
UserPredicate::SetProperty {
|
||||
key: "rainbow.include-children",
|
||||
val,
|
||||
} => {
|
||||
if val.is_some() {
|
||||
return Err(
|
||||
"property 'rainbow.include-children' does not take an argument".into(),
|
||||
);
|
||||
}
|
||||
include_children_patterns.insert(pattern);
|
||||
Ok(())
|
||||
}
|
||||
_ => Err(InvalidPredicateError::unknown(predicate)),
|
||||
})?;
|
||||
|
||||
Ok(Self {
|
||||
include_children_patterns,
|
||||
scope_capture: query.get_capture("rainbow.scope"),
|
||||
bracket_capture: query.get_capture("rainbow.bracket"),
|
||||
query,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
use once_cell::sync::Lazy;
|
||||
|
||||
@@ -7,6 +7,7 @@ use serde::{ser::SerializeSeq as _, Deserialize, Serialize};
|
||||
use std::{
|
||||
collections::{HashMap, HashSet},
|
||||
fmt::{self, Display},
|
||||
num::NonZeroU8,
|
||||
path::PathBuf,
|
||||
str::FromStr,
|
||||
};
|
||||
@@ -60,6 +61,8 @@ pub struct LanguageConfiguration {
|
||||
|
||||
/// If set, overrides `editor.path-completion`.
|
||||
pub path_completion: Option<bool>,
|
||||
/// If set, overrides `editor.word-completion`.
|
||||
pub word_completion: Option<WordCompletion>,
|
||||
|
||||
#[serde(default)]
|
||||
pub diagnostic_severity: Severity,
|
||||
@@ -98,6 +101,8 @@ pub struct LanguageConfiguration {
|
||||
pub workspace_lsp_roots: Option<Vec<PathBuf>>,
|
||||
#[serde(default)]
|
||||
pub persistent_diagnostic_sources: Vec<String>,
|
||||
/// Overrides the `editor.rainbow-brackets` config key for the language.
|
||||
pub rainbow_brackets: Option<bool>,
|
||||
}
|
||||
|
||||
impl LanguageConfiguration {
|
||||
@@ -572,6 +577,13 @@ pub struct SoftWrap {
|
||||
pub wrap_at_text_width: Option<bool>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Serialize, Deserialize)]
|
||||
#[serde(default, rename_all = "kebab-case", deny_unknown_fields)]
|
||||
pub struct WordCompletion {
|
||||
pub enable: Option<bool>,
|
||||
pub trigger_length: Option<NonZeroU8>,
|
||||
}
|
||||
|
||||
fn deserialize_regex<'de, D>(deserializer: D) -> Result<Option<rope::Regex>, D::Error>
|
||||
where
|
||||
D: serde::Deserializer<'de>,
|
||||
|
||||
@@ -19,6 +19,16 @@ pub enum Operation {
|
||||
Insert(Tendril),
|
||||
}
|
||||
|
||||
impl Operation {
|
||||
/// The number of characters affected by the operation.
|
||||
pub fn len_chars(&self) -> usize {
|
||||
match self {
|
||||
Self::Retain(n) | Self::Delete(n) => *n,
|
||||
Self::Insert(s) => s.chars().count(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
|
||||
pub enum Assoc {
|
||||
Before,
|
||||
|
||||
@@ -244,7 +244,12 @@ pub fn merge_toml_values(left: toml::Value, right: toml::Value, merge_depth: usi
|
||||
/// Otherwise (workspace, false) is returned
|
||||
pub fn find_workspace() -> (PathBuf, bool) {
|
||||
let current_dir = current_working_dir();
|
||||
for ancestor in current_dir.ancestors() {
|
||||
find_workspace_in(current_dir)
|
||||
}
|
||||
|
||||
pub fn find_workspace_in(dir: impl AsRef<Path>) -> (PathBuf, bool) {
|
||||
let dir = dir.as_ref();
|
||||
for ancestor in dir.ancestors() {
|
||||
if ancestor.join(".git").exists()
|
||||
|| ancestor.join(".svn").exists()
|
||||
|| ancestor.join(".jj").exists()
|
||||
@@ -254,7 +259,7 @@ pub fn find_workspace() -> (PathBuf, bool) {
|
||||
}
|
||||
}
|
||||
|
||||
(current_dir, true)
|
||||
(dir.to_owned(), true)
|
||||
}
|
||||
|
||||
fn default_config_file() -> PathBuf {
|
||||
|
||||
@@ -91,6 +91,8 @@ serde = { version = "1.0", features = ["derive"] }
|
||||
grep-regex = "0.1.13"
|
||||
grep-searcher = "0.1.14"
|
||||
|
||||
dashmap = "6.0"
|
||||
|
||||
[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.174"
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
pub(crate) mod dap;
|
||||
pub(crate) mod lsp;
|
||||
pub(crate) mod syntax;
|
||||
pub(crate) mod typed;
|
||||
|
||||
pub use dap::*;
|
||||
@@ -11,6 +12,7 @@ use helix_stdx::{
|
||||
};
|
||||
use helix_vcs::{FileChange, Hunk};
|
||||
pub use lsp::*;
|
||||
pub use syntax::*;
|
||||
use tui::{
|
||||
text::{Span, Spans},
|
||||
widgets::Cell,
|
||||
@@ -405,9 +407,13 @@ impl MappableCommand {
|
||||
buffer_picker, "Open buffer picker",
|
||||
jumplist_picker, "Open jumplist picker",
|
||||
symbol_picker, "Open symbol picker",
|
||||
syntax_symbol_picker, "Open symbol picker from syntax information",
|
||||
lsp_or_syntax_symbol_picker, "Open symbol picker from LSP or syntax information",
|
||||
changed_file_picker, "Open changed file picker",
|
||||
select_references_to_symbol_under_cursor, "Select symbol references",
|
||||
workspace_symbol_picker, "Open workspace symbol picker",
|
||||
syntax_workspace_symbol_picker, "Open workspace symbol picker from syntax information",
|
||||
lsp_or_syntax_workspace_symbol_picker, "Open workspace symbol picker from LSP or syntax information",
|
||||
diagnostics_picker, "Open diagnostic picker",
|
||||
workspace_diagnostics_picker, "Open workspace diagnostic picker",
|
||||
last_picker, "Open last picker",
|
||||
@@ -565,6 +571,8 @@ impl MappableCommand {
|
||||
goto_prev_comment, "Goto previous comment",
|
||||
goto_next_test, "Goto next test",
|
||||
goto_prev_test, "Goto previous test",
|
||||
goto_next_xml_element, "Goto next (X)HTML element",
|
||||
goto_prev_xml_element, "Goto previous (X)HTML element",
|
||||
goto_next_entry, "Goto next pairing",
|
||||
goto_prev_entry, "Goto previous pairing",
|
||||
goto_next_paragraph, "Goto next paragraph",
|
||||
@@ -5882,6 +5890,14 @@ fn goto_prev_test(cx: &mut Context) {
|
||||
goto_ts_object_impl(cx, "test", Direction::Backward)
|
||||
}
|
||||
|
||||
fn goto_next_xml_element(cx: &mut Context) {
|
||||
goto_ts_object_impl(cx, "xml-element", Direction::Forward)
|
||||
}
|
||||
|
||||
fn goto_prev_xml_element(cx: &mut Context) {
|
||||
goto_ts_object_impl(cx, "xml-element", Direction::Backward)
|
||||
}
|
||||
|
||||
fn goto_next_entry(cx: &mut Context) {
|
||||
goto_ts_object_impl(cx, "entry", Direction::Forward)
|
||||
}
|
||||
@@ -5949,6 +5965,7 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
|
||||
'c' => textobject_treesitter("comment", range),
|
||||
'T' => textobject_treesitter("test", range),
|
||||
'e' => textobject_treesitter("entry", range),
|
||||
'x' => textobject_treesitter("xml-element", range),
|
||||
'p' => textobject::textobject_paragraph(text, range, objtype, count),
|
||||
'm' => textobject::textobject_pair_surround_closest(
|
||||
doc.syntax(),
|
||||
@@ -5993,6 +6010,7 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
|
||||
("e", "Data structure entry (tree-sitter)"),
|
||||
("m", "Closest surrounding pair (tree-sitter)"),
|
||||
("g", "Change"),
|
||||
("x", "X(HTML) element (tree-sitter)"),
|
||||
(" ", "... or any character acting as a pair"),
|
||||
];
|
||||
|
||||
@@ -6823,3 +6841,34 @@ fn jump_to_word(cx: &mut Context, behaviour: Movement) {
|
||||
}
|
||||
jump_to_label(cx, words, behaviour)
|
||||
}
|
||||
|
||||
fn lsp_or_syntax_symbol_picker(cx: &mut Context) {
|
||||
let doc = doc!(cx.editor);
|
||||
|
||||
if doc
|
||||
.language_servers_with_feature(LanguageServerFeature::DocumentSymbols)
|
||||
.next()
|
||||
.is_some()
|
||||
{
|
||||
lsp::symbol_picker(cx);
|
||||
} else if doc.syntax().is_some() {
|
||||
syntax_symbol_picker(cx);
|
||||
} else {
|
||||
cx.editor
|
||||
.set_error("No language server supporting document symbols or syntax info available");
|
||||
}
|
||||
}
|
||||
|
||||
fn lsp_or_syntax_workspace_symbol_picker(cx: &mut Context) {
|
||||
let doc = doc!(cx.editor);
|
||||
|
||||
if doc
|
||||
.language_servers_with_feature(LanguageServerFeature::WorkspaceSymbols)
|
||||
.next()
|
||||
.is_some()
|
||||
{
|
||||
lsp::workspace_symbol_picker(cx);
|
||||
} else {
|
||||
syntax_workspace_symbol_picker(cx);
|
||||
}
|
||||
}
|
||||
|
||||
446
helix-term/src/commands/syntax.rs
Normal file
446
helix-term/src/commands/syntax.rs
Normal file
@@ -0,0 +1,446 @@
|
||||
use std::{
|
||||
collections::HashSet,
|
||||
iter,
|
||||
path::{Path, PathBuf},
|
||||
sync::Arc,
|
||||
};
|
||||
|
||||
use dashmap::DashMap;
|
||||
use futures_util::FutureExt;
|
||||
use grep_regex::RegexMatcherBuilder;
|
||||
use grep_searcher::{sinks, BinaryDetection, SearcherBuilder};
|
||||
use helix_core::{
|
||||
syntax::{Loader, QueryIterEvent},
|
||||
Rope, RopeSlice, Selection, Syntax, Uri,
|
||||
};
|
||||
use helix_stdx::{
|
||||
path,
|
||||
rope::{self, RopeSliceExt},
|
||||
};
|
||||
use helix_view::{
|
||||
align_view,
|
||||
document::{from_reader, SCRATCH_BUFFER_NAME},
|
||||
Align, Document, DocumentId, Editor,
|
||||
};
|
||||
use ignore::{DirEntry, WalkBuilder, WalkState};
|
||||
|
||||
use crate::{
|
||||
filter_picker_entry,
|
||||
ui::{
|
||||
overlay::overlaid,
|
||||
picker::{Injector, PathOrId},
|
||||
Picker, PickerColumn,
|
||||
},
|
||||
};
|
||||
|
||||
use super::Context;
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
enum TagKind {
|
||||
Class,
|
||||
Constant,
|
||||
Function,
|
||||
Interface,
|
||||
Macro,
|
||||
Module,
|
||||
Struct,
|
||||
Type,
|
||||
}
|
||||
|
||||
impl TagKind {
|
||||
fn as_str(&self) -> &'static str {
|
||||
match self {
|
||||
Self::Class => "class",
|
||||
Self::Constant => "constant",
|
||||
Self::Function => "function",
|
||||
Self::Interface => "interface",
|
||||
Self::Macro => "macro",
|
||||
Self::Module => "module",
|
||||
Self::Struct => "struct",
|
||||
Self::Type => "type",
|
||||
}
|
||||
}
|
||||
|
||||
fn from_name(name: &str) -> Option<Self> {
|
||||
match name {
|
||||
"class" => Some(TagKind::Class),
|
||||
"constant" => Some(TagKind::Constant),
|
||||
"function" => Some(TagKind::Function),
|
||||
"interface" => Some(TagKind::Interface),
|
||||
"macro" => Some(TagKind::Macro),
|
||||
"module" => Some(TagKind::Module),
|
||||
"struct" => Some(TagKind::Struct),
|
||||
"type" => Some(TagKind::Type),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// NOTE: Uri is cheap to clone and DocumentId is Copy
|
||||
#[derive(Debug, Clone)]
|
||||
enum UriOrDocumentId {
|
||||
Uri(Uri),
|
||||
Id(DocumentId),
|
||||
}
|
||||
|
||||
impl UriOrDocumentId {
|
||||
fn path_or_id(&self) -> Option<PathOrId<'_>> {
|
||||
match self {
|
||||
Self::Id(id) => Some(PathOrId::Id(*id)),
|
||||
Self::Uri(uri) => uri.as_path().map(PathOrId::Path),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
struct Tag {
|
||||
kind: TagKind,
|
||||
name: String,
|
||||
start: usize,
|
||||
end: usize,
|
||||
start_line: usize,
|
||||
end_line: usize,
|
||||
doc: UriOrDocumentId,
|
||||
}
|
||||
|
||||
fn tags_iter<'a>(
|
||||
syntax: &'a Syntax,
|
||||
loader: &'a Loader,
|
||||
text: RopeSlice<'a>,
|
||||
doc: UriOrDocumentId,
|
||||
pattern: Option<&'a rope::Regex>,
|
||||
) -> impl Iterator<Item = Tag> + 'a {
|
||||
let mut tags_iter = syntax.tags(text, loader, ..);
|
||||
|
||||
iter::from_fn(move || loop {
|
||||
let QueryIterEvent::Match(mat) = tags_iter.next()? else {
|
||||
continue;
|
||||
};
|
||||
let query = &loader
|
||||
.tag_query(tags_iter.current_language())
|
||||
.expect("must have a tags query to emit matches")
|
||||
.query;
|
||||
let Some(kind) = query
|
||||
.capture_name(mat.capture)
|
||||
.strip_prefix("definition.")
|
||||
.and_then(TagKind::from_name)
|
||||
else {
|
||||
continue;
|
||||
};
|
||||
let range = mat.node.byte_range();
|
||||
if pattern.is_some_and(|pattern| {
|
||||
!pattern.is_match(text.regex_input_at_bytes(range.start as usize..range.end as usize))
|
||||
}) {
|
||||
continue;
|
||||
}
|
||||
let start = text.byte_to_char(range.start as usize);
|
||||
let end = text.byte_to_char(range.end as usize);
|
||||
return Some(Tag {
|
||||
kind,
|
||||
name: text.slice(start..end).to_string(),
|
||||
start,
|
||||
end,
|
||||
start_line: text.char_to_line(start),
|
||||
end_line: text.char_to_line(end),
|
||||
doc: doc.clone(),
|
||||
});
|
||||
})
|
||||
}
|
||||
|
||||
pub fn syntax_symbol_picker(cx: &mut Context) {
|
||||
let doc = doc!(cx.editor);
|
||||
let Some(syntax) = doc.syntax() else {
|
||||
cx.editor
|
||||
.set_error("Syntax tree is not available on this buffer");
|
||||
return;
|
||||
};
|
||||
let doc_id = doc.id();
|
||||
let text = doc.text().slice(..);
|
||||
let loader = cx.editor.syn_loader.load();
|
||||
let tags = tags_iter(syntax, &loader, text, UriOrDocumentId::Id(doc.id()), None);
|
||||
|
||||
let columns = vec![
|
||||
PickerColumn::new("kind", |tag: &Tag, _| tag.kind.as_str().into()),
|
||||
PickerColumn::new("name", |tag: &Tag, _| tag.name.as_str().into()),
|
||||
];
|
||||
|
||||
let picker = Picker::new(
|
||||
columns,
|
||||
1, // name
|
||||
tags,
|
||||
(),
|
||||
move |cx, tag, action| {
|
||||
cx.editor.switch(doc_id, action);
|
||||
let view = view_mut!(cx.editor);
|
||||
let doc = doc_mut!(cx.editor, &doc_id);
|
||||
doc.set_selection(view.id, Selection::single(tag.start, tag.end));
|
||||
if action.align_view(view, doc.id()) {
|
||||
align_view(doc, view, Align::Center)
|
||||
}
|
||||
},
|
||||
)
|
||||
.with_preview(|_editor, tag| {
|
||||
Some((tag.doc.path_or_id()?, Some((tag.start_line, tag.end_line))))
|
||||
})
|
||||
.truncate_start(false);
|
||||
|
||||
cx.push_layer(Box::new(overlaid(picker)));
|
||||
}
|
||||
|
||||
pub fn syntax_workspace_symbol_picker(cx: &mut Context) {
|
||||
#[derive(Debug)]
|
||||
struct SearchState {
|
||||
searcher_builder: SearcherBuilder,
|
||||
walk_builder: WalkBuilder,
|
||||
regex_matcher_builder: RegexMatcherBuilder,
|
||||
rope_regex_builder: rope::RegexBuilder,
|
||||
search_root: PathBuf,
|
||||
/// A cache of files that have been parsed in prior searches.
|
||||
syntax_cache: DashMap<PathBuf, Option<(Rope, Syntax)>>,
|
||||
}
|
||||
|
||||
let mut searcher_builder = SearcherBuilder::new();
|
||||
searcher_builder.binary_detection(BinaryDetection::quit(b'\x00'));
|
||||
|
||||
// Search from the workspace that the currently focused document is within. This behaves like global
|
||||
// search most of the time but helps when you have two projects open in splits.
|
||||
let search_root = if let Some(path) = doc!(cx.editor).path() {
|
||||
helix_loader::find_workspace_in(path).0
|
||||
} else {
|
||||
helix_loader::find_workspace().0
|
||||
};
|
||||
|
||||
let absolute_root = search_root
|
||||
.canonicalize()
|
||||
.unwrap_or_else(|_| search_root.clone());
|
||||
|
||||
let config = cx.editor.config();
|
||||
let dedup_symlinks = config.file_picker.deduplicate_links;
|
||||
|
||||
let mut walk_builder = WalkBuilder::new(&search_root);
|
||||
walk_builder
|
||||
.hidden(config.file_picker.hidden)
|
||||
.parents(config.file_picker.parents)
|
||||
.ignore(config.file_picker.ignore)
|
||||
.follow_links(config.file_picker.follow_symlinks)
|
||||
.git_ignore(config.file_picker.git_ignore)
|
||||
.git_global(config.file_picker.git_global)
|
||||
.git_exclude(config.file_picker.git_exclude)
|
||||
.max_depth(config.file_picker.max_depth)
|
||||
.filter_entry(move |entry| filter_picker_entry(entry, &absolute_root, dedup_symlinks))
|
||||
.add_custom_ignore_filename(helix_loader::config_dir().join("ignore"))
|
||||
.add_custom_ignore_filename(".helix/ignore");
|
||||
|
||||
let mut regex_matcher_builder = RegexMatcherBuilder::new();
|
||||
regex_matcher_builder.case_smart(config.search.smart_case);
|
||||
let mut rope_regex_builder = rope::RegexBuilder::new();
|
||||
rope_regex_builder.syntax(rope::Config::new().case_insensitive(config.search.smart_case));
|
||||
let state = SearchState {
|
||||
searcher_builder,
|
||||
walk_builder,
|
||||
regex_matcher_builder,
|
||||
rope_regex_builder,
|
||||
search_root,
|
||||
syntax_cache: DashMap::default(),
|
||||
};
|
||||
let reg = cx.register.unwrap_or('/');
|
||||
cx.editor.registers.last_search_register = reg;
|
||||
let columns = vec![
|
||||
PickerColumn::new("kind", |tag: &Tag, _| tag.kind.as_str().into()),
|
||||
PickerColumn::new("name", |tag: &Tag, _| tag.name.as_str().into()).without_filtering(),
|
||||
PickerColumn::new("path", |tag: &Tag, state: &SearchState| {
|
||||
match &tag.doc {
|
||||
UriOrDocumentId::Uri(uri) => {
|
||||
if let Some(path) = uri.as_path() {
|
||||
let path = if let Ok(stripped) = path.strip_prefix(&state.search_root) {
|
||||
stripped
|
||||
} else {
|
||||
path
|
||||
};
|
||||
path.to_string_lossy().into()
|
||||
} else {
|
||||
uri.to_string().into()
|
||||
}
|
||||
}
|
||||
// This picker only uses `Id` for scratch buffers for better display.
|
||||
UriOrDocumentId::Id(_) => SCRATCH_BUFFER_NAME.into(),
|
||||
}
|
||||
}),
|
||||
];
|
||||
|
||||
let get_tags = |query: &str,
|
||||
editor: &mut Editor,
|
||||
state: Arc<SearchState>,
|
||||
injector: &Injector<_, _>| {
|
||||
if query.len() < 3 {
|
||||
return async { Ok(()) }.boxed();
|
||||
}
|
||||
// Attempt to find the tag in any open documents.
|
||||
let pattern = match state.rope_regex_builder.build(query) {
|
||||
Ok(pattern) => pattern,
|
||||
Err(err) => return async { Err(anyhow::anyhow!(err)) }.boxed(),
|
||||
};
|
||||
let loader = editor.syn_loader.load();
|
||||
for doc in editor.documents() {
|
||||
let Some(syntax) = doc.syntax() else { continue };
|
||||
let text = doc.text().slice(..);
|
||||
let uri_or_id = doc
|
||||
.uri()
|
||||
.map(UriOrDocumentId::Uri)
|
||||
.unwrap_or_else(|| UriOrDocumentId::Id(doc.id()));
|
||||
for tag in tags_iter(syntax, &loader, text.slice(..), uri_or_id, Some(&pattern)) {
|
||||
if injector.push(tag).is_err() {
|
||||
return async { Ok(()) }.boxed();
|
||||
}
|
||||
}
|
||||
}
|
||||
if !state.search_root.exists() {
|
||||
return async { Err(anyhow::anyhow!("Current working directory does not exist")) }
|
||||
.boxed();
|
||||
}
|
||||
let matcher = match state.regex_matcher_builder.build(query) {
|
||||
Ok(matcher) => {
|
||||
// Clear any "Failed to compile regex" errors out of the statusline.
|
||||
editor.clear_status();
|
||||
matcher
|
||||
}
|
||||
Err(err) => {
|
||||
log::info!(
|
||||
"Failed to compile search pattern in workspace symbol search: {}",
|
||||
err
|
||||
);
|
||||
return async { Err(anyhow::anyhow!("Failed to compile regex")) }.boxed();
|
||||
}
|
||||
};
|
||||
let pattern = Arc::new(pattern);
|
||||
let injector = injector.clone();
|
||||
let loader = editor.syn_loader.load();
|
||||
let documents: HashSet<_> = editor
|
||||
.documents()
|
||||
.filter_map(Document::path)
|
||||
.cloned()
|
||||
.collect();
|
||||
async move {
|
||||
let searcher = state.searcher_builder.build();
|
||||
state.walk_builder.build_parallel().run(|| {
|
||||
let mut searcher = searcher.clone();
|
||||
let matcher = matcher.clone();
|
||||
let injector = injector.clone();
|
||||
let loader = loader.clone();
|
||||
let documents = &documents;
|
||||
let pattern = pattern.clone();
|
||||
let syntax_cache = &state.syntax_cache;
|
||||
Box::new(move |entry: Result<DirEntry, ignore::Error>| -> WalkState {
|
||||
let entry = match entry {
|
||||
Ok(entry) => entry,
|
||||
Err(_) => return WalkState::Continue,
|
||||
};
|
||||
match entry.file_type() {
|
||||
Some(entry) if entry.is_file() => {}
|
||||
// skip everything else
|
||||
_ => return WalkState::Continue,
|
||||
};
|
||||
let path = entry.path();
|
||||
// If this document is open, skip it because we've already processed it above.
|
||||
if documents.contains(path) {
|
||||
return WalkState::Continue;
|
||||
};
|
||||
let mut quit = false;
|
||||
let sink = sinks::UTF8(|_line, _content| {
|
||||
if !syntax_cache.contains_key(path) {
|
||||
// Read the file into a Rope and attempt to recognize the language
|
||||
// and parse it with tree-sitter. Save the Rope and Syntax for future
|
||||
// queries.
|
||||
syntax_cache.insert(path.to_path_buf(), syntax_for_path(path, &loader));
|
||||
};
|
||||
let entry = syntax_cache.get(path).unwrap();
|
||||
let Some((text, syntax)) = entry.value() else {
|
||||
// If the file couldn't be parsed, move on.
|
||||
return Ok(false);
|
||||
};
|
||||
let uri = Uri::from(path::normalize(path));
|
||||
for tag in tags_iter(
|
||||
syntax,
|
||||
&loader,
|
||||
text.slice(..),
|
||||
UriOrDocumentId::Uri(uri),
|
||||
Some(&pattern),
|
||||
) {
|
||||
if injector.push(tag).is_err() {
|
||||
quit = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
// Quit after seeing the first regex match. We only care to find files
|
||||
// that contain the pattern and then we run the tags query within
|
||||
// those. The location and contents of a match are irrelevant - it's
|
||||
// only important _if_ a file matches.
|
||||
Ok(false)
|
||||
});
|
||||
if let Err(err) = searcher.search_path(&matcher, path, sink) {
|
||||
log::info!("Workspace syntax search error: {}, {}", path.display(), err);
|
||||
}
|
||||
if quit {
|
||||
WalkState::Quit
|
||||
} else {
|
||||
WalkState::Continue
|
||||
}
|
||||
})
|
||||
});
|
||||
Ok(())
|
||||
}
|
||||
.boxed()
|
||||
};
|
||||
let picker = Picker::new(
|
||||
columns,
|
||||
1, // name
|
||||
[],
|
||||
state,
|
||||
move |cx, tag, action| {
|
||||
let doc_id = match &tag.doc {
|
||||
UriOrDocumentId::Id(id) => *id,
|
||||
UriOrDocumentId::Uri(uri) => match cx.editor.open(uri.as_path().expect(""), action) {
|
||||
Ok(id) => id,
|
||||
Err(e) => {
|
||||
cx.editor
|
||||
.set_error(format!("Failed to open file '{uri:?}': {e}"));
|
||||
return;
|
||||
}
|
||||
}
|
||||
};
|
||||
let doc = doc_mut!(cx.editor, &doc_id);
|
||||
let view = view_mut!(cx.editor);
|
||||
let len_chars = doc.text().len_chars();
|
||||
if tag.start >= len_chars || tag.end > len_chars {
|
||||
cx.editor.set_error("The location you jumped to does not exist anymore because the file has changed.");
|
||||
return;
|
||||
}
|
||||
doc.set_selection(view.id, Selection::single(tag.start, tag.end));
|
||||
if action.align_view(view, doc.id()) {
|
||||
align_view(doc, view, Align::Center)
|
||||
}
|
||||
},
|
||||
)
|
||||
.with_dynamic_query(get_tags, Some(275))
|
||||
.with_preview(move |_editor, tag| {
|
||||
Some((
|
||||
tag.doc.path_or_id()?,
|
||||
Some((tag.start_line, tag.end_line)),
|
||||
))
|
||||
})
|
||||
.truncate_start(false);
|
||||
cx.push_layer(Box::new(overlaid(picker)));
|
||||
}
|
||||
|
||||
/// Create a Rope and language config for a given existing path without creating a full Document.
|
||||
fn syntax_for_path(path: &Path, loader: &Loader) -> Option<(Rope, Syntax)> {
|
||||
let mut file = std::fs::File::open(path).ok()?;
|
||||
let (rope, _encoding, _has_bom) = from_reader(&mut file, None).ok()?;
|
||||
let text = rope.slice(..);
|
||||
let language = loader
|
||||
.language_for_filename(path)
|
||||
.or_else(|| loader.language_for_shebang(text))?;
|
||||
Syntax::new(text, language, loader)
|
||||
.ok()
|
||||
.map(|syntax| (rope, syntax))
|
||||
}
|
||||
@@ -8,7 +8,7 @@ use crate::events;
|
||||
use crate::handlers::auto_save::AutoSaveHandler;
|
||||
use crate::handlers::signature_help::SignatureHelpHandler;
|
||||
|
||||
pub use helix_view::handlers::Handlers;
|
||||
pub use helix_view::handlers::{word_index, Handlers};
|
||||
|
||||
use self::document_colors::DocumentColorsHandler;
|
||||
|
||||
@@ -26,12 +26,14 @@ pub fn setup(config: Arc<ArcSwap<Config>>) -> Handlers {
|
||||
let signature_hints = SignatureHelpHandler::new().spawn();
|
||||
let auto_save = AutoSaveHandler::new().spawn();
|
||||
let document_colors = DocumentColorsHandler::default().spawn();
|
||||
let word_index = word_index::Handler::spawn();
|
||||
|
||||
let handlers = Handlers {
|
||||
completions: helix_view::handlers::completion::CompletionHandler::new(event_tx),
|
||||
signature_hints,
|
||||
auto_save,
|
||||
document_colors,
|
||||
word_index,
|
||||
};
|
||||
|
||||
helix_view::handlers::register_hooks(&handlers);
|
||||
|
||||
@@ -30,6 +30,7 @@ mod item;
|
||||
mod path;
|
||||
mod request;
|
||||
mod resolve;
|
||||
mod word;
|
||||
|
||||
async fn handle_response(
|
||||
requests: &mut JoinSet<CompletionResponse>,
|
||||
@@ -82,7 +83,7 @@ async fn replace_completions(
|
||||
fn show_completion(
|
||||
editor: &mut Editor,
|
||||
compositor: &mut Compositor,
|
||||
items: Vec<CompletionItem>,
|
||||
mut items: Vec<CompletionItem>,
|
||||
context: HashMap<CompletionProvider, ResponseContext>,
|
||||
trigger: Trigger,
|
||||
) {
|
||||
@@ -101,6 +102,7 @@ fn show_completion(
|
||||
if ui.completion.is_some() {
|
||||
return;
|
||||
}
|
||||
word::retain_valid_completions(trigger, doc, view.id, &mut items);
|
||||
editor.handlers.completions.active_completions = context;
|
||||
|
||||
let completion_area = ui.set_completion(editor, items, trigger.pos, size);
|
||||
|
||||
@@ -28,6 +28,8 @@ use crate::job::{dispatch, dispatch_blocking};
|
||||
use crate::ui;
|
||||
use crate::ui::editor::InsertEvent;
|
||||
|
||||
use super::word;
|
||||
|
||||
#[derive(Debug, PartialEq, Eq, Clone, Copy)]
|
||||
pub(super) enum TriggerKind {
|
||||
Auto,
|
||||
@@ -242,10 +244,15 @@ fn request_completions(
|
||||
doc.selection(view.id).clone(),
|
||||
doc,
|
||||
handle.clone(),
|
||||
savepoint,
|
||||
savepoint.clone(),
|
||||
) {
|
||||
requests.spawn_blocking(path_completion_request);
|
||||
}
|
||||
if let Some(word_completion_request) =
|
||||
word::completion(editor, trigger, handle.clone(), savepoint)
|
||||
{
|
||||
requests.spawn_blocking(word_completion_request);
|
||||
}
|
||||
|
||||
let ui = compositor.find::<ui::EditorView>().unwrap();
|
||||
ui.last_insert.1.push(InsertEvent::RequestCompletion);
|
||||
|
||||
134
helix-term/src/handlers/completion/word.rs
Normal file
134
helix-term/src/handlers/completion/word.rs
Normal file
@@ -0,0 +1,134 @@
|
||||
use std::{borrow::Cow, sync::Arc};
|
||||
|
||||
use helix_core::{
|
||||
self as core, chars::char_is_word, completion::CompletionProvider, movement, Transaction,
|
||||
};
|
||||
use helix_event::TaskHandle;
|
||||
use helix_stdx::rope::RopeSliceExt as _;
|
||||
use helix_view::{
|
||||
document::SavePoint, handlers::completion::ResponseContext, Document, Editor, ViewId,
|
||||
};
|
||||
|
||||
use super::{request::TriggerKind, CompletionItem, CompletionItems, CompletionResponse, Trigger};
|
||||
|
||||
const COMPLETION_KIND: &str = "word";
|
||||
|
||||
pub(super) fn completion(
|
||||
editor: &Editor,
|
||||
trigger: Trigger,
|
||||
handle: TaskHandle,
|
||||
savepoint: Arc<SavePoint>,
|
||||
) -> Option<impl FnOnce() -> CompletionResponse> {
|
||||
if !doc!(editor).word_completion_enabled() {
|
||||
return None;
|
||||
}
|
||||
let config = editor.config().word_completion;
|
||||
let doc_config = doc!(editor)
|
||||
.language_config()
|
||||
.and_then(|config| config.word_completion);
|
||||
let trigger_length = doc_config
|
||||
.and_then(|c| c.trigger_length)
|
||||
.unwrap_or(config.trigger_length)
|
||||
.get() as usize;
|
||||
|
||||
let (view, doc) = current_ref!(editor);
|
||||
let rope = doc.text().clone();
|
||||
let word_index = editor.handlers.word_index().clone();
|
||||
let text = doc.text().slice(..);
|
||||
let selection = doc.selection(view.id).clone();
|
||||
let pos = selection.primary().cursor(text);
|
||||
|
||||
let cursor = movement::move_prev_word_start(text, core::Range::point(pos), 1);
|
||||
if cursor.head == pos {
|
||||
return None;
|
||||
}
|
||||
if trigger.kind != TriggerKind::Manual
|
||||
&& text
|
||||
.slice(cursor.head..)
|
||||
.graphemes()
|
||||
.take(trigger_length)
|
||||
.take_while(|g| g.chars().all(char_is_word))
|
||||
.count()
|
||||
!= trigger_length
|
||||
{
|
||||
return None;
|
||||
}
|
||||
|
||||
let typed_word_range = cursor.head..pos;
|
||||
let typed_word = text.slice(typed_word_range.clone());
|
||||
let edit_diff = if typed_word
|
||||
.char(typed_word.len_chars().saturating_sub(1))
|
||||
.is_whitespace()
|
||||
{
|
||||
0
|
||||
} else {
|
||||
typed_word.len_chars()
|
||||
};
|
||||
|
||||
if handle.is_canceled() {
|
||||
return None;
|
||||
}
|
||||
|
||||
let future = move || {
|
||||
let text = rope.slice(..);
|
||||
let typed_word: Cow<_> = text.slice(typed_word_range).into();
|
||||
let items = word_index
|
||||
.matches(&typed_word)
|
||||
.into_iter()
|
||||
.filter(|word| word.as_str() != typed_word.as_ref())
|
||||
.map(|word| {
|
||||
let transaction = Transaction::change_by_selection(&rope, &selection, |range| {
|
||||
let cursor = range.cursor(text);
|
||||
(cursor - edit_diff, cursor, Some((&word).into()))
|
||||
});
|
||||
CompletionItem::Other(core::CompletionItem {
|
||||
transaction,
|
||||
label: word.into(),
|
||||
kind: Cow::Borrowed(COMPLETION_KIND),
|
||||
documentation: None,
|
||||
provider: CompletionProvider::Word,
|
||||
})
|
||||
})
|
||||
.collect();
|
||||
|
||||
CompletionResponse {
|
||||
items: CompletionItems::Other(items),
|
||||
provider: CompletionProvider::Word,
|
||||
context: ResponseContext {
|
||||
is_incomplete: false,
|
||||
priority: 0,
|
||||
savepoint,
|
||||
},
|
||||
}
|
||||
};
|
||||
|
||||
Some(future)
|
||||
}
|
||||
|
||||
pub(super) fn retain_valid_completions(
|
||||
trigger: Trigger,
|
||||
doc: &Document,
|
||||
view_id: ViewId,
|
||||
items: &mut Vec<CompletionItem>,
|
||||
) {
|
||||
if trigger.kind == TriggerKind::Manual {
|
||||
return;
|
||||
}
|
||||
|
||||
let text = doc.text().slice(..);
|
||||
let cursor = doc.selection(view_id).primary().cursor(text);
|
||||
if text
|
||||
.get_char(cursor.saturating_sub(1))
|
||||
.is_some_and(|ch| ch.is_whitespace())
|
||||
{
|
||||
items.retain(|item| {
|
||||
!matches!(
|
||||
item,
|
||||
CompletionItem::Other(core::CompletionItem {
|
||||
provider: CompletionProvider::Word,
|
||||
..
|
||||
})
|
||||
)
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -12,11 +12,19 @@ pub enum TsFeature {
|
||||
Highlight,
|
||||
TextObject,
|
||||
AutoIndent,
|
||||
Tags,
|
||||
RainbowBracket,
|
||||
}
|
||||
|
||||
impl TsFeature {
|
||||
pub fn all() -> &'static [Self] {
|
||||
&[Self::Highlight, Self::TextObject, Self::AutoIndent]
|
||||
&[
|
||||
Self::Highlight,
|
||||
Self::TextObject,
|
||||
Self::AutoIndent,
|
||||
Self::Tags,
|
||||
Self::RainbowBracket,
|
||||
]
|
||||
}
|
||||
|
||||
pub fn runtime_filename(&self) -> &'static str {
|
||||
@@ -24,6 +32,8 @@ impl TsFeature {
|
||||
Self::Highlight => "highlights.scm",
|
||||
Self::TextObject => "textobjects.scm",
|
||||
Self::AutoIndent => "indents.scm",
|
||||
Self::Tags => "tags.scm",
|
||||
Self::RainbowBracket => "rainbows.scm",
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,6 +42,8 @@ impl TsFeature {
|
||||
Self::Highlight => "Syntax Highlighting",
|
||||
Self::TextObject => "Treesitter Textobjects",
|
||||
Self::AutoIndent => "Auto Indent",
|
||||
Self::Tags => "Code Navigation Tags",
|
||||
Self::RainbowBracket => "Rainbow Brackets",
|
||||
}
|
||||
}
|
||||
|
||||
@@ -40,6 +52,8 @@ impl TsFeature {
|
||||
Self::Highlight => "Highlight",
|
||||
Self::TextObject => "Textobject",
|
||||
Self::AutoIndent => "Indent",
|
||||
Self::Tags => "Tags",
|
||||
Self::RainbowBracket => "Rainbow",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -120,6 +120,7 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
|
||||
"e" => goto_prev_entry,
|
||||
"T" => goto_prev_test,
|
||||
"p" => goto_prev_paragraph,
|
||||
"x" => goto_prev_xml_element,
|
||||
"space" => add_newline_above,
|
||||
},
|
||||
"]" => { "Right bracket"
|
||||
@@ -134,6 +135,7 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
|
||||
"e" => goto_next_entry,
|
||||
"T" => goto_next_test,
|
||||
"p" => goto_next_paragraph,
|
||||
"x" => goto_next_xml_element,
|
||||
"space" => add_newline_below,
|
||||
},
|
||||
|
||||
@@ -227,8 +229,8 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
|
||||
"E" => file_explorer_in_current_buffer_directory,
|
||||
"b" => buffer_picker,
|
||||
"j" => jumplist_picker,
|
||||
"s" => symbol_picker,
|
||||
"S" => workspace_symbol_picker,
|
||||
"s" => lsp_or_syntax_symbol_picker,
|
||||
"S" => lsp_or_syntax_workspace_symbol_picker,
|
||||
"d" => diagnostics_picker,
|
||||
"D" => workspace_diagnostics_picker,
|
||||
"g" => changed_file_picker,
|
||||
|
||||
@@ -127,6 +127,18 @@ impl EditorView {
|
||||
&text_annotations,
|
||||
));
|
||||
|
||||
if doc
|
||||
.language_config()
|
||||
.and_then(|config| config.rainbow_brackets)
|
||||
.unwrap_or(config.rainbow_brackets)
|
||||
{
|
||||
if let Some(overlay) =
|
||||
Self::doc_rainbow_highlights(doc, view_offset.anchor, inner.height, theme, &loader)
|
||||
{
|
||||
overlays.push(overlay);
|
||||
}
|
||||
}
|
||||
|
||||
Self::doc_diagnostics_highlights_into(doc, theme, &mut overlays);
|
||||
|
||||
if is_focused {
|
||||
@@ -304,6 +316,27 @@ impl EditorView {
|
||||
text_annotations.collect_overlay_highlights(range)
|
||||
}
|
||||
|
||||
pub fn doc_rainbow_highlights(
|
||||
doc: &Document,
|
||||
anchor: usize,
|
||||
height: u16,
|
||||
theme: &Theme,
|
||||
loader: &syntax::Loader,
|
||||
) -> Option<OverlayHighlights> {
|
||||
let syntax = doc.syntax()?;
|
||||
let text = doc.text().slice(..);
|
||||
let row = text.char_to_line(anchor.min(text.len_chars()));
|
||||
let visible_range = Self::viewport_byte_range(text, row, height);
|
||||
let start = syntax::child_for_byte_range(
|
||||
&syntax.tree().root_node(),
|
||||
visible_range.start as u32..visible_range.end as u32,
|
||||
)
|
||||
.map_or(visible_range.start as u32, |node| node.start_byte());
|
||||
let range = start..visible_range.end as u32;
|
||||
|
||||
Some(syntax.rainbow_highlights(text, theme.rainbow_length(), loader, range))
|
||||
}
|
||||
|
||||
/// Get highlight spans for document diagnostics
|
||||
pub fn doc_diagnostics_highlights_into(
|
||||
doc: &Document,
|
||||
|
||||
@@ -52,6 +52,8 @@ log = "~0.4"
|
||||
parking_lot.workspace = true
|
||||
thiserror.workspace = true
|
||||
|
||||
kstring = "2.0"
|
||||
|
||||
[target.'cfg(windows)'.dependencies]
|
||||
clipboard-win = { version = "5.4", features = ["std"] }
|
||||
|
||||
|
||||
@@ -1810,6 +1810,12 @@ impl Document {
|
||||
self.version
|
||||
}
|
||||
|
||||
pub fn word_completion_enabled(&self) -> bool {
|
||||
self.language_config()
|
||||
.and_then(|lang_config| lang_config.word_completion.and_then(|c| c.enable))
|
||||
.unwrap_or_else(|| self.config.load().word_completion.enable)
|
||||
}
|
||||
|
||||
pub fn path_completion_enabled(&self) -> bool {
|
||||
self.language_config()
|
||||
.and_then(|lang_config| lang_config.path_completion)
|
||||
|
||||
@@ -278,6 +278,9 @@ pub struct Config {
|
||||
/// either absolute or relative to the current opened document or current working directory (if the buffer is not yet saved).
|
||||
/// Defaults to true.
|
||||
pub path_completion: bool,
|
||||
/// Configures completion of words from open buffers.
|
||||
/// Defaults to enabled with a trigger length of 7.
|
||||
pub word_completion: WordCompletion,
|
||||
/// Automatic formatting on save. Defaults to true.
|
||||
pub auto_format: bool,
|
||||
/// Default register used for yank/paste. Defaults to '"'
|
||||
@@ -376,6 +379,8 @@ pub struct Config {
|
||||
/// Whether to read settings from [EditorConfig](https://editorconfig.org) files. Defaults to
|
||||
/// `true`.
|
||||
pub editor_config: bool,
|
||||
/// Whether to render rainbow colors for matching brackets. Defaults to `false`.
|
||||
pub rainbow_brackets: bool,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, Eq, PartialOrd, Ord)]
|
||||
@@ -974,6 +979,22 @@ pub enum PopupBorderConfig {
|
||||
Menu,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
||||
#[serde(default, rename_all = "kebab-case", deny_unknown_fields)]
|
||||
pub struct WordCompletion {
|
||||
pub enable: bool,
|
||||
pub trigger_length: NonZeroU8,
|
||||
}
|
||||
|
||||
impl Default for WordCompletion {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
enable: true,
|
||||
trigger_length: NonZeroU8::new(7).unwrap(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for Config {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
@@ -993,6 +1014,7 @@ impl Default for Config {
|
||||
auto_pairs: AutoPairConfig::default(),
|
||||
auto_completion: true,
|
||||
path_completion: true,
|
||||
word_completion: WordCompletion::default(),
|
||||
auto_format: true,
|
||||
default_yank_register: '"',
|
||||
auto_save: AutoSave::default(),
|
||||
@@ -1035,6 +1057,7 @@ impl Default for Config {
|
||||
end_of_line_diagnostics: DiagnosticFilter::Disable,
|
||||
clipboard_provider: ClipboardProvider::default(),
|
||||
editor_config: true,
|
||||
rainbow_brackets: false,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,6 +9,7 @@ pub mod completion;
|
||||
pub mod dap;
|
||||
pub mod diagnostics;
|
||||
pub mod lsp;
|
||||
pub mod word_index;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum AutoSaveEvent {
|
||||
@@ -22,6 +23,7 @@ pub struct Handlers {
|
||||
pub signature_hints: Sender<lsp::SignatureHelpEvent>,
|
||||
pub auto_save: Sender<AutoSaveEvent>,
|
||||
pub document_colors: Sender<lsp::DocumentColorsEvent>,
|
||||
pub word_index: word_index::Handler,
|
||||
}
|
||||
|
||||
impl Handlers {
|
||||
@@ -46,8 +48,13 @@ impl Handlers {
|
||||
};
|
||||
send_blocking(&self.signature_hints, event)
|
||||
}
|
||||
|
||||
pub fn word_index(&self) -> &word_index::WordIndex {
|
||||
&self.word_index.index
|
||||
}
|
||||
}
|
||||
|
||||
pub fn register_hooks(handlers: &Handlers) {
|
||||
lsp::register_hooks(handlers);
|
||||
word_index::register_hooks(handlers);
|
||||
}
|
||||
|
||||
509
helix-view/src/handlers/word_index.rs
Normal file
509
helix-view/src/handlers/word_index.rs
Normal file
@@ -0,0 +1,509 @@
|
||||
//! Indexing of words from open buffers.
|
||||
//!
|
||||
//! This provides an eventually consistent set of words used in any open buffers. This set is
|
||||
//! later used for lexical completion.
|
||||
|
||||
use std::{borrow::Cow, collections::HashMap, iter, mem, sync::Arc, time::Duration};
|
||||
|
||||
use helix_core::{
|
||||
chars::char_is_word, fuzzy::fuzzy_match, movement, ChangeSet, Range, Rope, RopeSlice,
|
||||
};
|
||||
use helix_event::{register_hook, AsyncHook};
|
||||
use helix_stdx::rope::RopeSliceExt as _;
|
||||
use parking_lot::RwLock;
|
||||
use tokio::{sync::mpsc, time::Instant};
|
||||
|
||||
use crate::{
|
||||
events::{ConfigDidChange, DocumentDidChange, DocumentDidClose, DocumentDidOpen},
|
||||
DocumentId,
|
||||
};
|
||||
|
||||
use super::Handlers;
|
||||
|
||||
#[derive(Debug)]
|
||||
struct Change {
|
||||
old_text: Rope,
|
||||
text: Rope,
|
||||
changes: ChangeSet,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
enum Event {
|
||||
Insert(Rope),
|
||||
Update(DocumentId, Change),
|
||||
Delete(DocumentId, Rope),
|
||||
/// Clear the entire word index.
|
||||
/// This is used to clear memory when the feature is turned off.
|
||||
Clear,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct Handler {
|
||||
pub(super) index: WordIndex,
|
||||
/// A sender into an async hook which debounces updates to the index.
|
||||
hook: mpsc::Sender<Event>,
|
||||
/// A sender to a tokio task which coordinates the indexing of documents.
|
||||
///
|
||||
/// See [WordIndex::run]. A supervisor-like task is in charge of spawning tasks to update the
|
||||
/// index. This ensures that consecutive edits to a document trigger the correct order of
|
||||
/// insertions and deletions into the word set.
|
||||
coordinator: mpsc::UnboundedSender<Event>,
|
||||
}
|
||||
|
||||
impl Handler {
|
||||
pub fn spawn() -> Self {
|
||||
let index = WordIndex::default();
|
||||
let (tx, rx) = mpsc::unbounded_channel();
|
||||
tokio::spawn(index.clone().run(rx));
|
||||
Self {
|
||||
hook: Hook {
|
||||
changes: HashMap::default(),
|
||||
coordinator: tx.clone(),
|
||||
}
|
||||
.spawn(),
|
||||
index,
|
||||
coordinator: tx,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
struct Hook {
|
||||
changes: HashMap<DocumentId, Change>,
|
||||
coordinator: mpsc::UnboundedSender<Event>,
|
||||
}
|
||||
|
||||
const DEBOUNCE: Duration = Duration::from_secs(1);
|
||||
|
||||
impl AsyncHook for Hook {
|
||||
type Event = Event;
|
||||
|
||||
fn handle_event(&mut self, event: Self::Event, timeout: Option<Instant>) -> Option<Instant> {
|
||||
match event {
|
||||
Event::Insert(_) => unreachable!("inserts are sent to the worker directly"),
|
||||
Event::Update(doc, change) => {
|
||||
if let Some(pending_change) = self.changes.get_mut(&doc) {
|
||||
// If there is already a change waiting for this document, merge the two
|
||||
// changes together by composing the changesets and saving the new `text`.
|
||||
pending_change.changes =
|
||||
mem::take(&mut pending_change.changes).compose(change.changes);
|
||||
pending_change.text = change.text;
|
||||
Some(Instant::now() + DEBOUNCE)
|
||||
} else if !is_changeset_significant(&change.changes) {
|
||||
// If the changeset is fairly large, debounce before updating the index.
|
||||
self.changes.insert(doc, change);
|
||||
Some(Instant::now() + DEBOUNCE)
|
||||
} else {
|
||||
// Otherwise if the change is small, queue the update to the index immediately.
|
||||
self.coordinator.send(Event::Update(doc, change)).unwrap();
|
||||
timeout
|
||||
}
|
||||
}
|
||||
Event::Delete(doc, text) => {
|
||||
// If there are pending changes that haven't been indexed since the last debounce,
|
||||
// forget them and delete the old text.
|
||||
if let Some(change) = self.changes.remove(&doc) {
|
||||
self.coordinator
|
||||
.send(Event::Delete(doc, change.old_text))
|
||||
.unwrap();
|
||||
} else {
|
||||
self.coordinator.send(Event::Delete(doc, text)).unwrap();
|
||||
}
|
||||
timeout
|
||||
}
|
||||
Event::Clear => unreachable!("clear is sent to the worker directly"),
|
||||
}
|
||||
}
|
||||
|
||||
fn finish_debounce(&mut self) {
|
||||
for (doc, change) in self.changes.drain() {
|
||||
self.coordinator.send(Event::Update(doc, change)).unwrap();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Minimum number of grapheme clusters required to include a word in the index
|
||||
const MIN_WORD_GRAPHEMES: usize = 3;
|
||||
/// Maximum word length allowed (in chars)
|
||||
const MAX_WORD_LEN: usize = 50;
|
||||
|
||||
type Word = kstring::KString;
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
struct WordIndexInner {
|
||||
/// Reference counted storage for words.
|
||||
///
|
||||
/// Words are very likely to be reused many times. Instead of storing duplicates we keep a
|
||||
/// reference count of times a word is used. When the reference count drops to zero the word
|
||||
/// is removed from the index.
|
||||
words: HashMap<Word, u32>,
|
||||
}
|
||||
|
||||
impl WordIndexInner {
|
||||
fn words(&self) -> impl Iterator<Item = &Word> {
|
||||
self.words.keys()
|
||||
}
|
||||
|
||||
fn insert(&mut self, word: RopeSlice) {
|
||||
let word: Cow<str> = word.into();
|
||||
if let Some(rc) = self.words.get_mut(word.as_ref()) {
|
||||
*rc = rc.saturating_add(1);
|
||||
} else {
|
||||
let word = match word {
|
||||
Cow::Owned(s) => Word::from_string(s),
|
||||
Cow::Borrowed(s) => Word::from_ref(s),
|
||||
};
|
||||
self.words.insert(word, 1);
|
||||
}
|
||||
}
|
||||
|
||||
fn remove(&mut self, word: RopeSlice) {
|
||||
let word: Cow<str> = word.into();
|
||||
match self.words.get_mut(word.as_ref()) {
|
||||
Some(1) => {
|
||||
self.words.remove(word.as_ref());
|
||||
}
|
||||
Some(n) => *n -= 1,
|
||||
None => (),
|
||||
}
|
||||
}
|
||||
|
||||
fn clear(&mut self) {
|
||||
std::mem::take(&mut self.words);
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Default, Clone)]
|
||||
pub struct WordIndex {
|
||||
inner: Arc<RwLock<WordIndexInner>>,
|
||||
}
|
||||
|
||||
impl WordIndex {
|
||||
pub fn matches(&self, pattern: &str) -> Vec<String> {
|
||||
let inner = self.inner.read();
|
||||
let mut matches = fuzzy_match(pattern, inner.words(), false);
|
||||
matches.sort_unstable_by_key(|(_, score)| *score);
|
||||
matches
|
||||
.into_iter()
|
||||
.map(|(word, _)| word.to_string())
|
||||
.collect()
|
||||
}
|
||||
|
||||
fn add_document(&self, text: &Rope) {
|
||||
let mut inner = self.inner.write();
|
||||
for word in words(text.slice(..)) {
|
||||
inner.insert(word);
|
||||
}
|
||||
}
|
||||
|
||||
fn update_document(&self, old_text: &Rope, text: &Rope, changes: &ChangeSet) {
|
||||
let mut inner = self.inner.write();
|
||||
for (old_window, new_window) in changed_windows(old_text.slice(..), text.slice(..), changes)
|
||||
{
|
||||
for word in words(new_window) {
|
||||
inner.insert(word);
|
||||
}
|
||||
for word in words(old_window) {
|
||||
inner.remove(word);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn remove_document(&self, text: &Rope) {
|
||||
let mut inner = self.inner.write();
|
||||
for word in words(text.slice(..)) {
|
||||
inner.remove(word);
|
||||
}
|
||||
}
|
||||
|
||||
fn clear(&self) {
|
||||
let mut inner = self.inner.write();
|
||||
inner.clear();
|
||||
}
|
||||
|
||||
/// Coordinate the indexing of documents.
|
||||
///
|
||||
/// This task wraps a MPSC queue and spawns blocking tasks which update the index. Updates
|
||||
/// are applied one-by-one to ensure that changes to the index are **serialized**:
|
||||
/// updates to each document must be applied in-order.
|
||||
async fn run(self, mut events: mpsc::UnboundedReceiver<Event>) {
|
||||
while let Some(event) = events.recv().await {
|
||||
let this = self.clone();
|
||||
tokio::task::spawn_blocking(move || match event {
|
||||
Event::Insert(text) => {
|
||||
this.add_document(&text);
|
||||
}
|
||||
Event::Update(
|
||||
_doc,
|
||||
Change {
|
||||
old_text,
|
||||
text,
|
||||
changes,
|
||||
..
|
||||
},
|
||||
) => {
|
||||
this.update_document(&old_text, &text, &changes);
|
||||
}
|
||||
Event::Delete(_doc, text) => {
|
||||
this.remove_document(&text);
|
||||
}
|
||||
Event::Clear => {
|
||||
this.clear();
|
||||
}
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn words(text: RopeSlice) -> impl Iterator<Item = RopeSlice> {
|
||||
let mut cursor = Range::point(0);
|
||||
if text
|
||||
.get_char(cursor.anchor)
|
||||
.is_some_and(|ch| !ch.is_whitespace())
|
||||
{
|
||||
let cursor_word_end = movement::move_next_word_end(text, cursor, 1);
|
||||
if cursor_word_end.anchor == 0 {
|
||||
cursor = cursor_word_end;
|
||||
}
|
||||
}
|
||||
|
||||
iter::from_fn(move || {
|
||||
while cursor.head <= text.len_chars() {
|
||||
let mut word = None;
|
||||
if text
|
||||
.slice(..cursor.head)
|
||||
.graphemes_rev()
|
||||
.take(MIN_WORD_GRAPHEMES)
|
||||
.take_while(|g| g.chars().all(char_is_word))
|
||||
.count()
|
||||
== MIN_WORD_GRAPHEMES
|
||||
{
|
||||
cursor.anchor += text
|
||||
.chars_at(cursor.anchor)
|
||||
.take_while(|&c| !char_is_word(c))
|
||||
.count();
|
||||
let slice = cursor.slice(text);
|
||||
if slice.len_chars() <= MAX_WORD_LEN {
|
||||
word = Some(slice);
|
||||
}
|
||||
}
|
||||
let head = cursor.head;
|
||||
cursor = movement::move_next_word_end(text, cursor, 1);
|
||||
if cursor.head == head {
|
||||
cursor.head = usize::MAX;
|
||||
}
|
||||
if word.is_some() {
|
||||
return word;
|
||||
}
|
||||
}
|
||||
None
|
||||
})
|
||||
}
|
||||
|
||||
/// Finds areas of the old and new texts around each operation in `changes`.
|
||||
///
|
||||
/// The window is larger than the changed area and can encompass multiple insert/delete operations
|
||||
/// if they are grouped closely together.
|
||||
///
|
||||
/// The ranges of the old and new text should usually be of different sizes. For example a
|
||||
/// deletion of "foo" surrounded by large retain sections would give a longer window into the
|
||||
/// `old_text` and shorter window of `new_text`. Vice-versa for an insertion. A full replacement
|
||||
/// of a word though would give two slices of the same size.
|
||||
fn changed_windows<'a>(
|
||||
old_text: RopeSlice<'a>,
|
||||
new_text: RopeSlice<'a>,
|
||||
changes: &'a ChangeSet,
|
||||
) -> impl Iterator<Item = (RopeSlice<'a>, RopeSlice<'a>)> {
|
||||
use helix_core::Operation::*;
|
||||
|
||||
let mut operations = changes.changes().iter().peekable();
|
||||
let mut old_pos = 0;
|
||||
let mut new_pos = 0;
|
||||
iter::from_fn(move || loop {
|
||||
let operation = operations.next()?;
|
||||
let old_start = old_pos;
|
||||
let new_start = new_pos;
|
||||
let len = operation.len_chars();
|
||||
match operation {
|
||||
Retain(_) => {
|
||||
old_pos += len;
|
||||
new_pos += len;
|
||||
continue;
|
||||
}
|
||||
Insert(_) => new_pos += len,
|
||||
Delete(_) => old_pos += len,
|
||||
}
|
||||
|
||||
// Scan ahead until a `Retain` is found which would end a window.
|
||||
while let Some(o) = operations.next_if(|op| !matches!(op, Retain(n) if *n > MAX_WORD_LEN)) {
|
||||
let len = o.len_chars();
|
||||
match o {
|
||||
Retain(_) => {
|
||||
old_pos += len;
|
||||
new_pos += len;
|
||||
}
|
||||
Delete(_) => old_pos += len,
|
||||
Insert(_) => new_pos += len,
|
||||
}
|
||||
}
|
||||
|
||||
let old_window = old_start.saturating_sub(MAX_WORD_LEN)
|
||||
..(old_pos + MAX_WORD_LEN).min(old_text.len_chars());
|
||||
let new_window = new_start.saturating_sub(MAX_WORD_LEN)
|
||||
..(new_pos + MAX_WORD_LEN).min(new_text.len_chars());
|
||||
|
||||
return Some((old_text.slice(old_window), new_text.slice(new_window)));
|
||||
})
|
||||
}
|
||||
|
||||
/// Estimates whether a changeset is significant or small.
|
||||
fn is_changeset_significant(changes: &ChangeSet) -> bool {
|
||||
use helix_core::Operation::*;
|
||||
|
||||
let mut diff = 0;
|
||||
for operation in changes.changes() {
|
||||
match operation {
|
||||
Retain(_) => continue,
|
||||
Delete(_) | Insert(_) => diff += operation.len_chars(),
|
||||
}
|
||||
}
|
||||
|
||||
// This is arbitrary and could be tuned further:
|
||||
diff > 1_000
|
||||
}
|
||||
|
||||
pub(crate) fn register_hooks(handlers: &Handlers) {
|
||||
let coordinator = handlers.word_index.coordinator.clone();
|
||||
register_hook!(move |event: &mut DocumentDidOpen<'_>| {
|
||||
let doc = doc!(event.editor, &event.doc);
|
||||
if doc.word_completion_enabled() {
|
||||
coordinator.send(Event::Insert(doc.text().clone())).unwrap();
|
||||
}
|
||||
Ok(())
|
||||
});
|
||||
|
||||
let tx = handlers.word_index.hook.clone();
|
||||
register_hook!(move |event: &mut DocumentDidChange<'_>| {
|
||||
if !event.ghost_transaction && event.doc.word_completion_enabled() {
|
||||
helix_event::send_blocking(
|
||||
&tx,
|
||||
Event::Update(
|
||||
event.doc.id(),
|
||||
Change {
|
||||
old_text: event.old_text.clone(),
|
||||
text: event.doc.text().clone(),
|
||||
changes: event.changes.clone(),
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
Ok(())
|
||||
});
|
||||
|
||||
let tx = handlers.word_index.hook.clone();
|
||||
register_hook!(move |event: &mut DocumentDidClose<'_>| {
|
||||
if event.doc.word_completion_enabled() {
|
||||
helix_event::send_blocking(
|
||||
&tx,
|
||||
Event::Delete(event.doc.id(), event.doc.text().clone()),
|
||||
);
|
||||
}
|
||||
Ok(())
|
||||
});
|
||||
|
||||
let coordinator = handlers.word_index.coordinator.clone();
|
||||
register_hook!(move |event: &mut ConfigDidChange<'_>| {
|
||||
// The feature has been turned off. Clear the index and reclaim any used memory.
|
||||
if event.old.word_completion.enable && !event.new.word_completion.enable {
|
||||
coordinator.send(Event::Clear).unwrap();
|
||||
}
|
||||
|
||||
// The feature has been turned on. Index open documents.
|
||||
if !event.old.word_completion.enable && event.new.word_completion.enable {
|
||||
for doc in event.editor.documents() {
|
||||
if doc.word_completion_enabled() {
|
||||
coordinator.send(Event::Insert(doc.text().clone())).unwrap();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
});
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use std::collections::HashSet;
|
||||
|
||||
use super::*;
|
||||
use helix_core::diff::compare_ropes;
|
||||
|
||||
impl WordIndex {
|
||||
fn words(&self) -> HashSet<String> {
|
||||
let inner = self.inner.read();
|
||||
inner.words().map(|w| w.to_string()).collect()
|
||||
}
|
||||
}
|
||||
|
||||
#[track_caller]
|
||||
fn assert_words<I: ToString, T: IntoIterator<Item = I>>(text: &str, expected: T) {
|
||||
let text = Rope::from_str(text);
|
||||
let index = WordIndex::default();
|
||||
index.add_document(&text);
|
||||
let actual = index.words();
|
||||
let expected: HashSet<_> = expected.into_iter().map(|i| i.to_string()).collect();
|
||||
assert_eq!(expected, actual);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parse() {
|
||||
assert_words("one two three", ["one", "two", "three"]);
|
||||
assert_words("a foo c", ["foo"]);
|
||||
}
|
||||
|
||||
#[track_caller]
|
||||
fn assert_diff<S, R, I>(before: &str, after: &str, expect_removed: R, expect_inserted: I)
|
||||
where
|
||||
S: ToString,
|
||||
R: IntoIterator<Item = S>,
|
||||
I: IntoIterator<Item = S>,
|
||||
{
|
||||
let before = Rope::from_str(before);
|
||||
let after = Rope::from_str(after);
|
||||
let diff = compare_ropes(&before, &after);
|
||||
let expect_removed: HashSet<_> =
|
||||
expect_removed.into_iter().map(|i| i.to_string()).collect();
|
||||
let expect_inserted: HashSet<_> =
|
||||
expect_inserted.into_iter().map(|i| i.to_string()).collect();
|
||||
|
||||
let index = WordIndex::default();
|
||||
index.add_document(&before);
|
||||
let words_before = index.words();
|
||||
index.update_document(&before, &after, diff.changes());
|
||||
let words_after = index.words();
|
||||
|
||||
let actual_removed = words_before.difference(&words_after).cloned().collect();
|
||||
let actual_inserted = words_after.difference(&words_before).cloned().collect();
|
||||
|
||||
eprintln!("\"{before}\" {words_before:?} => \"{after}\" {words_after:?}");
|
||||
assert_eq!(
|
||||
expect_removed, actual_removed,
|
||||
"expected {expect_removed:?} to be removed, instead {actual_removed:?} was"
|
||||
);
|
||||
assert_eq!(
|
||||
expect_inserted, actual_inserted,
|
||||
"expected {expect_inserted:?} to be inserted, instead {actual_inserted:?} was"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn diff() {
|
||||
assert_diff("one two three", "one five three", ["two"], ["five"]);
|
||||
assert_diff("one two three", "one to three", ["two"], []);
|
||||
assert_diff("one two three", "one three", ["two"], []);
|
||||
assert_diff("one two three", "one t{o three", ["two"], []);
|
||||
assert_diff("one foo three", "one fooo three", ["foo"], ["fooo"]);
|
||||
}
|
||||
}
|
||||
@@ -227,6 +227,7 @@ pub struct Theme {
|
||||
// tree-sitter highlight styles are stored in a Vec to optimize lookups
|
||||
scopes: Vec<String>,
|
||||
highlights: Vec<Style>,
|
||||
rainbow_length: usize,
|
||||
}
|
||||
|
||||
impl From<Value> for Theme {
|
||||
@@ -253,12 +254,20 @@ impl<'de> Deserialize<'de> for Theme {
|
||||
}
|
||||
}
|
||||
|
||||
#[allow(clippy::type_complexity)]
|
||||
fn build_theme_values(
|
||||
mut values: Map<String, Value>,
|
||||
) -> (HashMap<String, Style>, Vec<String>, Vec<Style>, Vec<String>) {
|
||||
) -> (
|
||||
HashMap<String, Style>,
|
||||
Vec<String>,
|
||||
Vec<Style>,
|
||||
usize,
|
||||
Vec<String>,
|
||||
) {
|
||||
let mut styles = HashMap::new();
|
||||
let mut scopes = Vec::new();
|
||||
let mut highlights = Vec::new();
|
||||
let mut rainbow_length = 0;
|
||||
|
||||
let mut warnings = Vec::new();
|
||||
|
||||
@@ -277,6 +286,27 @@ fn build_theme_values(
|
||||
styles.reserve(values.len());
|
||||
scopes.reserve(values.len());
|
||||
highlights.reserve(values.len());
|
||||
|
||||
for (i, style) in values
|
||||
.remove("rainbow")
|
||||
.and_then(|value| match palette.parse_style_array(value) {
|
||||
Ok(styles) => Some(styles),
|
||||
Err(err) => {
|
||||
warnings.push(err);
|
||||
None
|
||||
}
|
||||
})
|
||||
.unwrap_or_else(default_rainbow)
|
||||
.into_iter()
|
||||
.enumerate()
|
||||
{
|
||||
let name = format!("rainbow.{i}");
|
||||
styles.insert(name.clone(), style);
|
||||
scopes.push(name);
|
||||
highlights.push(style);
|
||||
rainbow_length += 1;
|
||||
}
|
||||
|
||||
for (name, style_value) in values {
|
||||
let mut style = Style::default();
|
||||
if let Err(err) = palette.parse_style(&mut style, style_value) {
|
||||
@@ -289,9 +319,19 @@ fn build_theme_values(
|
||||
highlights.push(style);
|
||||
}
|
||||
|
||||
(styles, scopes, highlights, warnings)
|
||||
(styles, scopes, highlights, rainbow_length, warnings)
|
||||
}
|
||||
|
||||
fn default_rainbow() -> Vec<Style> {
|
||||
vec![
|
||||
Style::default().fg(Color::Red),
|
||||
Style::default().fg(Color::Yellow),
|
||||
Style::default().fg(Color::Green),
|
||||
Style::default().fg(Color::Blue),
|
||||
Style::default().fg(Color::Cyan),
|
||||
Style::default().fg(Color::Magenta),
|
||||
]
|
||||
}
|
||||
impl Theme {
|
||||
/// To allow `Highlight` to represent arbitrary RGB colors without turning it into an enum,
|
||||
/// we interpret the last 256^3 numbers as RGB.
|
||||
@@ -382,6 +422,10 @@ impl Theme {
|
||||
})
|
||||
}
|
||||
|
||||
pub fn rainbow_length(&self) -> usize {
|
||||
self.rainbow_length
|
||||
}
|
||||
|
||||
fn from_toml(value: Value) -> (Self, Vec<String>) {
|
||||
if let Value::Table(table) = value {
|
||||
Theme::from_keys(table)
|
||||
@@ -392,12 +436,14 @@ impl Theme {
|
||||
}
|
||||
|
||||
fn from_keys(toml_keys: Map<String, Value>) -> (Self, Vec<String>) {
|
||||
let (styles, scopes, highlights, load_errors) = build_theme_values(toml_keys);
|
||||
let (styles, scopes, highlights, rainbow_length, load_errors) =
|
||||
build_theme_values(toml_keys);
|
||||
|
||||
let theme = Self {
|
||||
styles,
|
||||
scopes,
|
||||
highlights,
|
||||
rainbow_length,
|
||||
..Default::default()
|
||||
};
|
||||
(theme, load_errors)
|
||||
@@ -541,6 +587,21 @@ impl ThemePalette {
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn parse_style_array(&self, value: Value) -> Result<Vec<Style>, String> {
|
||||
let mut styles = Vec::new();
|
||||
|
||||
for v in value
|
||||
.as_array()
|
||||
.ok_or_else(|| format!("Could not parse value as an array: '{value}'"))?
|
||||
{
|
||||
let mut style = Style::default();
|
||||
self.parse_style(&mut style, v.clone())?;
|
||||
styles.push(style);
|
||||
}
|
||||
|
||||
Ok(styles)
|
||||
}
|
||||
}
|
||||
|
||||
impl TryFrom<Value> for ThemePalette {
|
||||
|
||||
@@ -1783,6 +1783,7 @@ roots = [".marksman.toml"]
|
||||
language-servers = [ "marksman", "markdown-oxide" ]
|
||||
indent = { tab-width = 2, unit = " " }
|
||||
block-comment-tokens = { start = "<!--", end = "-->" }
|
||||
word-completion.trigger-length = 4
|
||||
|
||||
[[grammar]]
|
||||
name = "markdown"
|
||||
@@ -2046,7 +2047,10 @@ roots = ["rebar.config"]
|
||||
shebangs = ["escript"]
|
||||
comment-token = "%%"
|
||||
indent = { tab-width = 4, unit = " " }
|
||||
language-servers = [ "erlang-ls", "elp" ]
|
||||
language-servers = [
|
||||
{ name = "erlang-ls", except-features = ["document-symbols", "workspace-symbols"] },
|
||||
{ name = "elp", except-features = ["document-symbols", "workspace-symbols"] }
|
||||
]
|
||||
|
||||
[[grammar]]
|
||||
name = "erlang"
|
||||
|
||||
7
runtime/queries/_jsx/textobjects.scm
Normal file
7
runtime/queries/_jsx/textobjects.scm
Normal file
@@ -0,0 +1,7 @@
|
||||
; See runtime/queries/ecma/README.md for more info.
|
||||
|
||||
(jsx_self_closing_element) @xml-element.around @xml-element.inside
|
||||
|
||||
(jsx_element (jsx_opening_element) (_)* @xml-element.inside (jsx_closing_element))
|
||||
|
||||
(jsx_element) @xml-element.around
|
||||
20
runtime/queries/bash/rainbows.scm
Normal file
20
runtime/queries/bash/rainbows.scm
Normal file
@@ -0,0 +1,20 @@
|
||||
[
|
||||
(function_definition)
|
||||
(compound_statement)
|
||||
(subshell)
|
||||
(test_command)
|
||||
(subscript)
|
||||
(parenthesized_expression)
|
||||
(array)
|
||||
(expansion)
|
||||
(command_substitution)
|
||||
] @rainbow.scope
|
||||
|
||||
[
|
||||
"(" ")"
|
||||
"((" "))"
|
||||
"${" "$("
|
||||
"{" "}"
|
||||
"[" "]"
|
||||
"[[" "]]"
|
||||
] @rainbow.bracket
|
||||
@@ -19,5 +19,3 @@
|
||||
(invocation_expression function: (member_access_expression name: (identifier) @name)) @reference.send
|
||||
|
||||
(namespace_declaration name: (identifier) @name) @definition.module
|
||||
|
||||
(namespace_declaration name: (identifier) @name) @module
|
||||
|
||||
29
runtime/queries/c/rainbows.scm
Normal file
29
runtime/queries/c/rainbows.scm
Normal file
@@ -0,0 +1,29 @@
|
||||
[
|
||||
(preproc_params)
|
||||
(preproc_defined)
|
||||
(argument_list)
|
||||
(attribute_specifier)
|
||||
(ms_declspec_modifier)
|
||||
(declaration_list)
|
||||
(parenthesized_declarator)
|
||||
(parenthesized_expression)
|
||||
(abstract_parenthesized_declarator)
|
||||
(array_declarator)
|
||||
(compound_statement)
|
||||
(initializer_list)
|
||||
(compound_literal_expression)
|
||||
(enumerator_list)
|
||||
(field_declaration_list)
|
||||
(parameter_list)
|
||||
(for_statement)
|
||||
(macro_type_specifier)
|
||||
(subscript_expression)
|
||||
(subscript_designator)
|
||||
(cast_expression)
|
||||
] @rainbow.scope
|
||||
|
||||
[
|
||||
"(" ")"
|
||||
"{" "}"
|
||||
"[" "]"
|
||||
] @rainbow.bracket
|
||||
9
runtime/queries/c/tags.scm
Normal file
9
runtime/queries/c/tags.scm
Normal file
@@ -0,0 +1,9 @@
|
||||
(function_declarator
|
||||
declarator: [(identifier) (field_identifier)] @definition.function)
|
||||
|
||||
(preproc_function_def name: (identifier) @definition.function)
|
||||
|
||||
(type_definition
|
||||
declarator: (type_identifier) @definition.type)
|
||||
|
||||
(preproc_def name: (identifier) @definition.constant)
|
||||
13
runtime/queries/clojure/rainbows.scm
Normal file
13
runtime/queries/clojure/rainbows.scm
Normal file
@@ -0,0 +1,13 @@
|
||||
[
|
||||
(list_lit)
|
||||
(map_lit)
|
||||
(vec_lit)
|
||||
(anon_fn_lit)
|
||||
] @rainbow.scope
|
||||
|
||||
[
|
||||
"(" ")"
|
||||
"#"
|
||||
"{" "}"
|
||||
"[" "]"
|
||||
] @rainbow.bracket
|
||||
1
runtime/queries/common-lisp/rainbows.scm
Normal file
1
runtime/queries/common-lisp/rainbows.scm
Normal file
@@ -0,0 +1 @@
|
||||
; inherits: scheme
|
||||
49
runtime/queries/cpp/rainbows.scm
Normal file
49
runtime/queries/cpp/rainbows.scm
Normal file
@@ -0,0 +1,49 @@
|
||||
[
|
||||
; c
|
||||
(preproc_params)
|
||||
(preproc_defined)
|
||||
(argument_list)
|
||||
(attribute_specifier)
|
||||
(ms_declspec_modifier)
|
||||
(declaration_list)
|
||||
(parenthesized_declarator)
|
||||
(parenthesized_expression)
|
||||
(abstract_parenthesized_declarator)
|
||||
(array_declarator)
|
||||
(compound_statement)
|
||||
(initializer_list)
|
||||
(compound_literal_expression)
|
||||
(enumerator_list)
|
||||
(field_declaration_list)
|
||||
(parameter_list)
|
||||
(for_statement)
|
||||
; (macro_type_specifier) - not part of cpp
|
||||
(subscript_expression)
|
||||
(subscript_designator)
|
||||
(cast_expression)
|
||||
|
||||
; cpp
|
||||
(decltype)
|
||||
(explicit_function_specifier)
|
||||
(template_parameter_list)
|
||||
(template_argument_list)
|
||||
(parameter_list)
|
||||
(argument_list)
|
||||
(structured_binding_declarator)
|
||||
(noexcept)
|
||||
(throw_specifier)
|
||||
(static_assert_declaration)
|
||||
(condition_clause)
|
||||
(for_range_loop)
|
||||
(new_declarator)
|
||||
(delete_expression "[" "]")
|
||||
(lambda_capture_specifier)
|
||||
(sizeof_expression)
|
||||
] @rainbow.scope
|
||||
|
||||
[
|
||||
"(" ")"
|
||||
"{" "}"
|
||||
"[" "]"
|
||||
"<" ">"
|
||||
] @rainbow.bracket
|
||||
12
runtime/queries/cpp/tags.scm
Normal file
12
runtime/queries/cpp/tags.scm
Normal file
@@ -0,0 +1,12 @@
|
||||
; inherits: c
|
||||
|
||||
(function_declarator
|
||||
declarator: (qualified_identifier name: (identifier) @definition.function))
|
||||
|
||||
(struct_specifier
|
||||
name: (type_identifier) @definition.struct
|
||||
body: (field_declaration_list))
|
||||
|
||||
(class_specifier
|
||||
name: (type_identifier) @definition.class
|
||||
body: (field_declaration_list))
|
||||
15
runtime/queries/css/rainbows.scm
Normal file
15
runtime/queries/css/rainbows.scm
Normal file
@@ -0,0 +1,15 @@
|
||||
[
|
||||
(keyframe_block_list)
|
||||
(block)
|
||||
(attribute_selector)
|
||||
(feature_query)
|
||||
(parenthesized_query)
|
||||
(selector_query)
|
||||
(parenthesized_value)
|
||||
(arguments)
|
||||
] @rainbow.scope
|
||||
|
||||
[
|
||||
"{" "}"
|
||||
"(" ")"
|
||||
] @rainbow.bracket
|
||||
28
runtime/queries/ecma/rainbows.scm
Normal file
28
runtime/queries/ecma/rainbows.scm
Normal file
@@ -0,0 +1,28 @@
|
||||
[
|
||||
(export_clause)
|
||||
(named_imports)
|
||||
(statement_block)
|
||||
(for_statement)
|
||||
(for_in_statement)
|
||||
(switch_body)
|
||||
(catch_clause "(" ")")
|
||||
(parenthesized_expression)
|
||||
(object)
|
||||
(object_pattern)
|
||||
(array)
|
||||
(array_pattern)
|
||||
(subscript_expression)
|
||||
(template_substitution)
|
||||
(arguments)
|
||||
(class_body)
|
||||
(formal_parameters)
|
||||
(computed_property_name)
|
||||
] @rainbow.scope
|
||||
|
||||
[
|
||||
"(" ")"
|
||||
"${" "{" "}"
|
||||
"[" "]"
|
||||
] @rainbow.bracket
|
||||
|
||||
(regex "/" @rainbow.bracket) @rainbow.scope
|
||||
24
runtime/queries/elixir/rainbows.scm
Normal file
24
runtime/queries/elixir/rainbows.scm
Normal file
@@ -0,0 +1,24 @@
|
||||
[
|
||||
(block)
|
||||
(interpolation)
|
||||
(list)
|
||||
(tuple)
|
||||
(bitstring)
|
||||
(map)
|
||||
; short-hand function captures like &(&1 + &2)
|
||||
(unary_operator
|
||||
operator: "&")
|
||||
(arguments "(" ")")
|
||||
(access_call)
|
||||
(sigil)
|
||||
] @rainbow.scope
|
||||
|
||||
[
|
||||
"(" ")"
|
||||
"%"
|
||||
"{" "}"
|
||||
"[" "]"
|
||||
"<<" ">>"
|
||||
"#{"
|
||||
"|"
|
||||
] @rainbow.bracket
|
||||
54
runtime/queries/elixir/tags.scm
Normal file
54
runtime/queries/elixir/tags.scm
Normal file
@@ -0,0 +1,54 @@
|
||||
; Definitions
|
||||
|
||||
; * modules and protocols
|
||||
(call
|
||||
target: (identifier) @ignore
|
||||
(arguments (alias) @name)
|
||||
(#any-of? @ignore "defmodule" "defprotocol")) @definition.module
|
||||
|
||||
; * functions/macros
|
||||
(call
|
||||
target: (identifier) @ignore
|
||||
(arguments
|
||||
[
|
||||
; zero-arity functions with no parentheses
|
||||
(identifier) @name
|
||||
; regular function clause
|
||||
(call target: (identifier) @name)
|
||||
; function clause with a guard clause
|
||||
(binary_operator
|
||||
left: (call target: (identifier) @name)
|
||||
operator: "when")
|
||||
])
|
||||
(#any-of? @ignore "def" "defp" "defdelegate" "defguard" "defguardp" "defmacro" "defmacrop" "defn" "defnp")) @definition.function
|
||||
|
||||
; References
|
||||
|
||||
; ignore calls to kernel/special-forms keywords
|
||||
(call
|
||||
target: (identifier) @ignore
|
||||
(#any-of? @ignore "def" "defp" "defdelegate" "defguard" "defguardp" "defmacro" "defmacrop" "defn" "defnp" "defmodule" "defprotocol" "defimpl" "defstruct" "defexception" "defoverridable" "alias" "case" "cond" "else" "for" "if" "import" "quote" "raise" "receive" "require" "reraise" "super" "throw" "try" "unless" "unquote" "unquote_splicing" "use" "with"))
|
||||
|
||||
; ignore module attributes
|
||||
(unary_operator
|
||||
operator: "@"
|
||||
operand: (call
|
||||
target: (identifier) @ignore))
|
||||
|
||||
; * function call
|
||||
(call
|
||||
target: [
|
||||
; local
|
||||
(identifier) @name
|
||||
; remote
|
||||
(dot
|
||||
right: (identifier) @name)
|
||||
]) @reference.call
|
||||
|
||||
; * pipe into function call
|
||||
(binary_operator
|
||||
operator: "|>"
|
||||
right: (identifier) @name) @reference.call
|
||||
|
||||
; * modules
|
||||
(alias) @name @reference.module
|
||||
24
runtime/queries/erlang/rainbows.scm
Normal file
24
runtime/queries/erlang/rainbows.scm
Normal file
@@ -0,0 +1,24 @@
|
||||
[
|
||||
; ()
|
||||
(arguments "(" ")")
|
||||
(parenthesized_expression)
|
||||
(function_type)
|
||||
; #{}
|
||||
(record)
|
||||
(map)
|
||||
; {}
|
||||
(map_update)
|
||||
(tuple)
|
||||
; <<>>
|
||||
(bitstring)
|
||||
; []
|
||||
(list)
|
||||
] @rainbow.scope
|
||||
|
||||
[
|
||||
"#"
|
||||
"{" "}"
|
||||
"(" ")"
|
||||
"[" "]"
|
||||
"<<" ">>"
|
||||
] @rainbow.bracket
|
||||
45
runtime/queries/erlang/tags.scm
Normal file
45
runtime/queries/erlang/tags.scm
Normal file
@@ -0,0 +1,45 @@
|
||||
; Modules
|
||||
(attribute
|
||||
name: (atom) @_attr
|
||||
(arguments (atom) @definition.module)
|
||||
(#eq? @_attr "module"))
|
||||
|
||||
; Constants
|
||||
((attribute
|
||||
name: (atom) @_attr
|
||||
(arguments
|
||||
.
|
||||
[
|
||||
(atom) @definition.constant
|
||||
(call function: [(variable) (atom)] @definition.macro)
|
||||
]))
|
||||
(#eq? @_attr "define"))
|
||||
|
||||
; Record definitions
|
||||
((attribute
|
||||
name: (atom) @_attr
|
||||
(arguments
|
||||
.
|
||||
(atom) @definition.struct))
|
||||
(#eq? @_attr "record"))
|
||||
|
||||
; Function specs
|
||||
((attribute
|
||||
name: (atom) @_attr
|
||||
(stab_clause name: (atom) @definition.interface))
|
||||
(#eq? @_attr "spec"))
|
||||
|
||||
; Types
|
||||
((attribute
|
||||
name: (atom) @_attr
|
||||
(arguments
|
||||
(binary_operator
|
||||
left: [
|
||||
(atom) @definition.type
|
||||
(call function: (atom) @definition.type)
|
||||
]
|
||||
operator: "::")))
|
||||
(#any-of? @_attr "type" "opaque"))
|
||||
|
||||
; Functions
|
||||
(function_clause name: (atom) @definition.function)
|
||||
@@ -2,4 +2,4 @@
|
||||
|
||||
(function_definition (name) @name) @definition.function
|
||||
|
||||
(call (name) @name) @reference.call
|
||||
(call (identifier) @name) @reference.call
|
||||
|
||||
32
runtime/queries/gleam/rainbows.scm
Normal file
32
runtime/queries/gleam/rainbows.scm
Normal file
@@ -0,0 +1,32 @@
|
||||
[
|
||||
(target_group)
|
||||
(unqualified_imports)
|
||||
(tuple)
|
||||
(list)
|
||||
(function)
|
||||
(function_parameters)
|
||||
(todo)
|
||||
(tuple)
|
||||
(list)
|
||||
(anonymous_function)
|
||||
(block)
|
||||
(case)
|
||||
(record_update)
|
||||
(arguments)
|
||||
(record_pattern_arguments)
|
||||
(tuple_pattern)
|
||||
(list_pattern)
|
||||
(type_definition)
|
||||
(data_constructor_arguments)
|
||||
(tuple_type)
|
||||
(function_parameter_types)
|
||||
(type_arguments)
|
||||
(type_parameters)
|
||||
] @rainbow.scope
|
||||
|
||||
[
|
||||
"(" ")"
|
||||
"[" "]"
|
||||
"{" "}"
|
||||
"#"
|
||||
] @rainbow.bracket
|
||||
33
runtime/queries/go/rainbows.scm
Normal file
33
runtime/queries/go/rainbows.scm
Normal file
@@ -0,0 +1,33 @@
|
||||
[
|
||||
(import_spec_list)
|
||||
(const_declaration)
|
||||
(var_declaration)
|
||||
(type_parameter_list)
|
||||
(parameter_list)
|
||||
(type_declaration)
|
||||
(parenthesized_type)
|
||||
(type_arguments)
|
||||
(array_type)
|
||||
(implicit_length_array_type)
|
||||
(slice_type)
|
||||
(field_declaration_list)
|
||||
(interface_type)
|
||||
(map_type)
|
||||
(block)
|
||||
(expression_switch_statement)
|
||||
(type_switch_statement)
|
||||
(select_statement)
|
||||
(parenthesized_expression)
|
||||
(argument_list)
|
||||
(index_expression)
|
||||
(slice_expression)
|
||||
(type_assertion_expression)
|
||||
(type_conversion_expression)
|
||||
(literal_value)
|
||||
] @rainbow.scope
|
||||
|
||||
[
|
||||
"(" ")"
|
||||
"[" "]"
|
||||
"{" "}"
|
||||
] @rainbow.bracket
|
||||
@@ -4,7 +4,7 @@
|
||||
(function_declaration
|
||||
name: (identifier) @name) @definition.function
|
||||
(#strip! @doc "^//\\s*")
|
||||
(#set-adjacent! @doc @definition.function)
|
||||
(#select-adjacent! @doc @definition.function)
|
||||
)
|
||||
|
||||
(
|
||||
@@ -13,7 +13,7 @@
|
||||
(method_declaration
|
||||
name: (field_identifier) @name) @definition.method
|
||||
(#strip! @doc "^//\\s*")
|
||||
(#set-adjacent! @doc @definition.method)
|
||||
(#select-adjacent! @doc @definition.method)
|
||||
)
|
||||
|
||||
(call_expression
|
||||
|
||||
13
runtime/queries/html/rainbows.scm
Normal file
13
runtime/queries/html/rainbows.scm
Normal file
@@ -0,0 +1,13 @@
|
||||
[
|
||||
(doctype)
|
||||
(erroneous_end_tag)
|
||||
] @rainbow.scope
|
||||
|
||||
([
|
||||
(element)
|
||||
(script_element)
|
||||
(style_element)
|
||||
] @rainbow.scope
|
||||
(#set! rainbow.include-children))
|
||||
|
||||
["<" ">" "<!" "</" "/>"] @rainbow.bracket
|
||||
9
runtime/queries/html/textobjects.scm
Normal file
9
runtime/queries/html/textobjects.scm
Normal file
@@ -0,0 +1,9 @@
|
||||
(script_element (start_tag) (_) @xml-element.inside (end_tag)) @xml-element.around
|
||||
|
||||
(style_element (start_tag) (_) @xml-element.inside (end_tag)) @xml-element.around
|
||||
|
||||
(element (start_tag) (_)* @xml-element.inside (end_tag))
|
||||
|
||||
(element) @xml-element.around
|
||||
|
||||
(comment) @comment.around
|
||||
35
runtime/queries/java/rainbows.scm
Normal file
35
runtime/queries/java/rainbows.scm
Normal file
@@ -0,0 +1,35 @@
|
||||
[
|
||||
(cast_expression)
|
||||
(inferred_parameters)
|
||||
(dimensions_expr)
|
||||
(parenthesized_expression)
|
||||
(array_access)
|
||||
(argument_list)
|
||||
(type_arguments)
|
||||
(dimensions)
|
||||
(block)
|
||||
(switch_block)
|
||||
(catch_clause)
|
||||
(resource_specification)
|
||||
(for_statement)
|
||||
(enhanced_for_statement)
|
||||
(annotation_argument_list)
|
||||
(element_value_array_initializer)
|
||||
(module_body)
|
||||
(enum_body)
|
||||
(type_parameters)
|
||||
(class_body)
|
||||
(constructor_body)
|
||||
(annotation_type_body)
|
||||
(annotation_type_element_declaration)
|
||||
(interface_body)
|
||||
(array_initializer)
|
||||
(formal_parameters)
|
||||
] @rainbow.scope
|
||||
|
||||
[
|
||||
"(" ")"
|
||||
"{" "}"
|
||||
"[" "]"
|
||||
"<" ">"
|
||||
] @rainbow.bracket
|
||||
1
runtime/queries/javascript/rainbows.scm
Normal file
1
runtime/queries/javascript/rainbows.scm
Normal file
@@ -0,0 +1 @@
|
||||
; inherits: ecma
|
||||
9
runtime/queries/json/rainbows.scm
Normal file
9
runtime/queries/json/rainbows.scm
Normal file
@@ -0,0 +1,9 @@
|
||||
[
|
||||
(object)
|
||||
(array)
|
||||
] @rainbow.scope
|
||||
|
||||
[
|
||||
"[" "]"
|
||||
"{" "}"
|
||||
] @rainbow.bracket
|
||||
9
runtime/queries/jsx/rainbows.scm
Normal file
9
runtime/queries/jsx/rainbows.scm
Normal file
@@ -0,0 +1,9 @@
|
||||
; inherits: ecma
|
||||
|
||||
[
|
||||
(jsx_expression)
|
||||
] @rainbow.scope
|
||||
|
||||
(jsx_opening_element ["<" ">"] @rainbow.bracket) @rainbow.scope
|
||||
(jsx_closing_element ["</" ">"] @rainbow.bracket) @rainbow.scope
|
||||
(jsx_self_closing_element ["<" "/>"] @rainbow.bracket) @rainbow.scope
|
||||
2
runtime/queries/markdown/tags.scm
Normal file
2
runtime/queries/markdown/tags.scm
Normal file
@@ -0,0 +1,2 @@
|
||||
; TODO: have symbol types for markup?
|
||||
(atx_heading) @definition.class
|
||||
17
runtime/queries/nix/rainbows.scm
Normal file
17
runtime/queries/nix/rainbows.scm
Normal file
@@ -0,0 +1,17 @@
|
||||
[
|
||||
(formals)
|
||||
(parenthesized_expression)
|
||||
(attrset_expression)
|
||||
(let_attrset_expression)
|
||||
(rec_attrset_expression)
|
||||
(inherit_from)
|
||||
(interpolation)
|
||||
(list_expression)
|
||||
] @rainbow.scope
|
||||
|
||||
[
|
||||
"${"
|
||||
"{" "}"
|
||||
"(" ")"
|
||||
"[" "]"
|
||||
] @rainbow.bracket
|
||||
30
runtime/queries/python/rainbows.scm
Normal file
30
runtime/queries/python/rainbows.scm
Normal file
@@ -0,0 +1,30 @@
|
||||
[
|
||||
(future_import_statement)
|
||||
(import_from_statement)
|
||||
(with_clause)
|
||||
(parameters)
|
||||
(parenthesized_list_splat)
|
||||
(argument_list)
|
||||
(tuple_pattern)
|
||||
(list_pattern)
|
||||
(subscript)
|
||||
(list)
|
||||
(set)
|
||||
(tuple)
|
||||
(dictionary)
|
||||
(dictionary_comprehension)
|
||||
(set_comprehension)
|
||||
(list_comprehension)
|
||||
(generator_expression)
|
||||
(parenthesized_expression)
|
||||
(interpolation)
|
||||
(format_expression)
|
||||
] @rainbow.scope
|
||||
|
||||
[
|
||||
"(" ")"
|
||||
"{" "}"
|
||||
"[" "]"
|
||||
] @rainbow.bracket
|
||||
|
||||
; (string ["{{" "}}"] @rainbow.bracket) @rainbow.scope
|
||||
1
runtime/queries/racket/rainbows.scm
Normal file
1
runtime/queries/racket/rainbows.scm
Normal file
@@ -0,0 +1 @@
|
||||
; inherits: scheme
|
||||
17
runtime/queries/regex/rainbows.scm
Normal file
17
runtime/queries/regex/rainbows.scm
Normal file
@@ -0,0 +1,17 @@
|
||||
[
|
||||
(lookahead_assertion)
|
||||
(character_class)
|
||||
(anonymous_capturing_group)
|
||||
(named_capturing_group)
|
||||
(non_capturing_group)
|
||||
(count_quantifier)
|
||||
(character_class_escape)
|
||||
] @rainbow.scope
|
||||
|
||||
[
|
||||
"(?" "(?:"
|
||||
"(?<" ">"
|
||||
"(" ")"
|
||||
"[" "]"
|
||||
"{" "}"
|
||||
] @rainbow.bracket
|
||||
28
runtime/queries/ruby/rainbows.scm
Normal file
28
runtime/queries/ruby/rainbows.scm
Normal file
@@ -0,0 +1,28 @@
|
||||
[
|
||||
(begin_block)
|
||||
(end_block)
|
||||
(singleton_method)
|
||||
(block_parameters)
|
||||
(parenthesized_statements)
|
||||
(element_reference)
|
||||
(argument_list "(" ")")
|
||||
(block)
|
||||
(destructured_left_assignment)
|
||||
(interpolation)
|
||||
(string_array)
|
||||
(symbol_array)
|
||||
(regex)
|
||||
(array)
|
||||
(hash)
|
||||
(method_parameters)
|
||||
] @rainbow.scope
|
||||
|
||||
[
|
||||
"#{"
|
||||
"{" "}"
|
||||
"(" ")"
|
||||
"%w(" "%i("
|
||||
"[" "]"
|
||||
"|"
|
||||
"/"
|
||||
] @rainbow.bracket
|
||||
60
runtime/queries/rust/rainbows.scm
Normal file
60
runtime/queries/rust/rainbows.scm
Normal file
@@ -0,0 +1,60 @@
|
||||
[
|
||||
; {/}
|
||||
(declaration_list)
|
||||
(field_declaration_list)
|
||||
(field_initializer_list)
|
||||
(enum_variant_list)
|
||||
(block)
|
||||
(match_block)
|
||||
(use_list)
|
||||
(struct_pattern)
|
||||
|
||||
; (/)
|
||||
(ordered_field_declaration_list)
|
||||
(arguments)
|
||||
(parameters)
|
||||
(tuple_type)
|
||||
(tuple_expression)
|
||||
(tuple_pattern)
|
||||
(tuple_struct_pattern)
|
||||
(unit_type)
|
||||
(unit_expression)
|
||||
(visibility_modifier)
|
||||
(parenthesized_expression)
|
||||
(token_repetition_pattern)
|
||||
|
||||
; </>
|
||||
(type_parameters)
|
||||
(type_arguments)
|
||||
(bracketed_type)
|
||||
(for_lifetimes)
|
||||
|
||||
; [/]
|
||||
(array_type)
|
||||
(array_expression)
|
||||
(index_expression)
|
||||
(slice_pattern)
|
||||
|
||||
; attributes #[]
|
||||
(attribute_item)
|
||||
(inner_attribute_item)
|
||||
|
||||
; macros
|
||||
(token_tree_pattern)
|
||||
(macro_definition)
|
||||
|
||||
; closures
|
||||
(closure_parameters)
|
||||
] @rainbow.scope
|
||||
|
||||
; attributes like `#[serde(rename_all = "kebab-case")]`
|
||||
(attribute arguments: (token_tree) @rainbow.scope)
|
||||
|
||||
[
|
||||
"#"
|
||||
"[" "]"
|
||||
"(" ")"
|
||||
"{" "}"
|
||||
"<" ">"
|
||||
"|"
|
||||
] @rainbow.bracket
|
||||
26
runtime/queries/rust/tags.scm
Normal file
26
runtime/queries/rust/tags.scm
Normal file
@@ -0,0 +1,26 @@
|
||||
(struct_item
|
||||
name: (type_identifier) @definition.struct)
|
||||
|
||||
(const_item
|
||||
name: (identifier) @definition.constant)
|
||||
|
||||
(trait_item
|
||||
name: (type_identifier) @definition.interface)
|
||||
|
||||
(function_item
|
||||
name: (identifier) @definition.function)
|
||||
|
||||
(function_signature_item
|
||||
name: (identifier) @definition.function)
|
||||
|
||||
(enum_item
|
||||
name: (type_identifier) @definition.type)
|
||||
|
||||
(enum_variant
|
||||
name: (identifier) @definition.struct)
|
||||
|
||||
(mod_item
|
||||
name: (identifier) @definition.module)
|
||||
|
||||
(macro_definition
|
||||
name: (identifier) @definition.macro)
|
||||
12
runtime/queries/scheme/rainbows.scm
Normal file
12
runtime/queries/scheme/rainbows.scm
Normal file
@@ -0,0 +1,12 @@
|
||||
[
|
||||
(list)
|
||||
(vector)
|
||||
(byte_vector)
|
||||
] @rainbow.scope
|
||||
|
||||
[
|
||||
"#(" "#vu8("
|
||||
"(" ")"
|
||||
"[" "]"
|
||||
"{" "}"
|
||||
] @rainbow.bracket
|
||||
3
runtime/queries/scss/rainbows.scm
Normal file
3
runtime/queries/scss/rainbows.scm
Normal file
@@ -0,0 +1,3 @@
|
||||
; inherits: css
|
||||
|
||||
(parameters) @rainbow.scope
|
||||
1
runtime/queries/starlark/rainbows.scm
Normal file
1
runtime/queries/starlark/rainbows.scm
Normal file
@@ -0,0 +1 @@
|
||||
; inherits: python
|
||||
12
runtime/queries/toml/rainbows.scm
Normal file
12
runtime/queries/toml/rainbows.scm
Normal file
@@ -0,0 +1,12 @@
|
||||
[
|
||||
(table_array_element)
|
||||
(table)
|
||||
(array)
|
||||
(inline_table)
|
||||
] @rainbow.scope
|
||||
|
||||
[
|
||||
"[[" "]]"
|
||||
"[" "]"
|
||||
"{" "}"
|
||||
] @rainbow.bracket
|
||||
2
runtime/queries/tsx/rainbows.scm
Normal file
2
runtime/queries/tsx/rainbows.scm
Normal file
@@ -0,0 +1,2 @@
|
||||
; inherits: typescript
|
||||
; inherits: jsx
|
||||
19
runtime/queries/typescript/rainbows.scm
Normal file
19
runtime/queries/typescript/rainbows.scm
Normal file
@@ -0,0 +1,19 @@
|
||||
; inherits: ecma
|
||||
|
||||
[
|
||||
(import_require_clause)
|
||||
(enum_body)
|
||||
(lookup_type)
|
||||
(parenthesized_type)
|
||||
(object_type)
|
||||
(type_parameters)
|
||||
(index_signature)
|
||||
(array_type)
|
||||
(tuple_type)
|
||||
] @rainbow.scope
|
||||
|
||||
(type_arguments ["<" ">"] @rainbow.bracket) @rainbow.scope
|
||||
|
||||
[
|
||||
"{|" "|}"
|
||||
] @rainbow.bracket
|
||||
6
runtime/queries/typst/tags.scm
Normal file
6
runtime/queries/typst/tags.scm
Normal file
@@ -0,0 +1,6 @@
|
||||
; should be a heading
|
||||
(heading (text) @definition.class)
|
||||
|
||||
; should be a label/reference/tag
|
||||
(heading (label) @definition.function)
|
||||
(content (label) @definition.function)
|
||||
29
runtime/queries/xml/rainbows.scm
Normal file
29
runtime/queries/xml/rainbows.scm
Normal file
@@ -0,0 +1,29 @@
|
||||
[
|
||||
(processing_instructions)
|
||||
(cdata_sect)
|
||||
(xml_decl)
|
||||
(doctype_decl)
|
||||
(element_decl)
|
||||
(element_choice)
|
||||
(element_seq)
|
||||
(mixed)
|
||||
(attlist_decl)
|
||||
(notation_type)
|
||||
(enumeration)
|
||||
(ge_decl)
|
||||
(pe_decl)
|
||||
(notation_decl)
|
||||
] @rainbow.scope
|
||||
|
||||
((element) @rainbow.scope
|
||||
(#set! rainbow.include-children))
|
||||
|
||||
[
|
||||
"<?" "?>"
|
||||
"<" ">"
|
||||
"</" "/>"
|
||||
"<!"
|
||||
"(" ")"
|
||||
")*"
|
||||
"[" "]"
|
||||
] @rainbow.bracket
|
||||
5
runtime/queries/xml/textobjects.scm
Normal file
5
runtime/queries/xml/textobjects.scm
Normal file
@@ -0,0 +1,5 @@
|
||||
(element (start_tag) (_)* @xml-element.inside (end_tag))
|
||||
|
||||
(element) @xml-element.around
|
||||
|
||||
(comment) @comment.around
|
||||
9
runtime/queries/yaml/rainbows.scm
Normal file
9
runtime/queries/yaml/rainbows.scm
Normal file
@@ -0,0 +1,9 @@
|
||||
[
|
||||
(flow_sequence)
|
||||
(flow_mapping)
|
||||
] @rainbow.scope
|
||||
|
||||
[
|
||||
"[" "]"
|
||||
"{" "}"
|
||||
] @rainbow.bracket
|
||||
@@ -36,6 +36,8 @@ pub mod tasks {
|
||||
let grammar = syntax_config.grammar;
|
||||
LanguageData::compile_indent_query(grammar, config)?;
|
||||
LanguageData::compile_textobject_query(grammar, config)?;
|
||||
LanguageData::compile_tag_query(grammar, config)?;
|
||||
LanguageData::compile_rainbow_query(grammar, config)?;
|
||||
}
|
||||
|
||||
println!("Query check succeeded");
|
||||
|
||||
Reference in New Issue
Block a user