Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
kirawi committed Jan 10, 2024
2 parents d7c7808 + 7463977 commit 2fae2da
Show file tree
Hide file tree
Showing 45 changed files with 1,485 additions and 81 deletions.
1 change: 1 addition & 0 deletions book/src/SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@
- [Adding textobject queries](./guides/textobject.md)
- [Adding indent queries](./guides/indent.md)
- [Adding injection queries](./guides/injection.md)
- [Adding rainbow bracket queries](./guides/rainbow_bracket_queries.md)
1 change: 1 addition & 0 deletions book/src/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ Its settings will be merged with the configuration directory `config.toml` and t
| `insert-final-newline` | Whether to automatically insert a trailing line-ending on write if missing | `true` |
| `popup-border` | Draw border around `popup`, `menu`, `all`, or `none` | `none` |
| `indent-heuristic` | How the indentation for a newly inserted line is computed: `simple` just copies the indentation level from the previous line, `tree-sitter` computes the indentation based on the syntax tree and `hybrid` combines both approaches. If the chosen heuristic is not available, a different one will be used as a fallback (the fallback order being `hybrid` -> `tree-sitter` -> `simple`). | `hybrid`
| `rainbow-brackets` | Whether to render rainbow colors for matching brackets. Requires tree-sitter `rainbows.scm` queries for the language. | `false` |

### `[editor.statusline]` Section

Expand Down
182 changes: 182 additions & 0 deletions book/src/generated/lang-support.md
Original file line number Diff line number Diff line change
Expand Up @@ -192,3 +192,185 @@
| yaml || || `yaml-language-server`, `ansible-language-server` |
| yuck || | | |
| zig |||| `zls` |
| Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Rainbow Brackets | Default LSP |
| --- | --- | --- | --- | --- | --- |
| astro || | | | |
| awk ||| | | `awk-language-server` |
| bash ||||| `bash-language-server` |
| bass || | | | `bass` |
| beancount || | | | |
| bibtex || | | | `texlab` |
| bicep || | | | `bicep-langserver` |
| blueprint || | | | `blueprint-compiler` |
| c ||||| `clangd` |
| c-sharp ||| | | `OmniSharp` |
| cabal | | | | | |
| cairo |||| | `cairo-language-server` |
| capnp || || | |
| clojure || | || `clojure-lsp` |
| cmake |||| | `cmake-language-server` |
| comment || | | | |
| common-lisp || | || `cl-lsp` |
| cpon || || | |
| cpp ||||| `clangd` |
| crystal ||| | | `crystalline` |
| css || | || `vscode-css-language-server` |
| cue || | | | `cuelsp` |
| d |||| | `serve-d` |
| dart || || | `dart` |
| devicetree || | | | |
| dhall ||| | | `dhall-lsp-server` |
| diff || | | | |
| dockerfile || | | | `docker-langserver` |
| dot || | | | `dot-language-server` |
| dtd || | | | |
| edoc || | | | |
| eex || | | | |
| ejs || | | | |
| elixir ||||| `elixir-ls` |
| elm ||| | | `elm-language-server` |
| elvish || | | | `elvish` |
| env || | | | |
| erb || | | | |
| erlang ||| || `erlang_ls` |
| esdl || | | | |
| fish |||| | |
| forth || | | | `forth-lsp` |
| fortran || || | `fortls` |
| fsharp || | | | `fsautocomplete` |
| gdscript |||| | |
| gemini || | | | |
| git-attributes || | | | |
| git-commit ||| | | |
| git-config || | | | |
| git-ignore || | | | |
| git-rebase || | | | |
| gleam ||| || `gleam` |
| glsl |||| | |
| go ||||| `gopls` |
| godot-resource || | | | |
| gomod || | | | `gopls` |
| gotmpl || | | | `gopls` |
| gowork || | | | `gopls` |
| graphql || | | | |
| hare || | | | |
| haskell ||| | | `haskell-language-server-wrapper` |
| haskell-persistent || | | | |
| hcl || || | `terraform-ls` |
| heex ||| | | `elixir-ls` |
| hosts || | | | |
| html || | || `vscode-html-language-server` |
| hurl || || | |
| idris | | | | | `idris2-lsp` |
| iex || | | | |
| ini || | | | |
| java ||||| `jdtls` |
| javascript ||||| `typescript-language-server` |
| jinja || | | | |
| jsdoc || | | | |
| json || ||| `vscode-json-language-server` |
| jsonnet || | | | `jsonnet-language-server` |
| jsx ||||| `typescript-language-server` |
| julia |||| | `julia` |
| just |||| | |
| kdl || | | | |
| kotlin || | | | `kotlin-language-server` |
| latex ||| | | `texlab` |
| lean || | | | `lean` |
| ledger || | | | |
| llvm |||| | |
| llvm-mir |||| | |
| llvm-mir-yaml || || | |
| lua |||| | `lua-language-server` |
| make || | | | |
| markdoc || | | | `markdoc-ls` |
| markdown || | | | `marksman` |
| markdown.inline || | | | |
| matlab |||| | |
| mermaid || | | | |
| meson || || | |
| mint | | | | | `mint` |
| msbuild || || | |
| nasm ||| | | |
| nickel || || | `nls` |
| nim |||| | `nimlangserver` |
| nix || | || `nil` |
| nu || | | | |
| nunjucks || | | | |
| ocaml || || | `ocamllsp` |
| ocaml-interface || | | | `ocamllsp` |
| odin || || | `ols` |
| opencl |||| | `clangd` |
| openscad || | | | `openscad-lsp` |
| org || | | | |
| pascal ||| | | `pasls` |
| passwd || | | | |
| pem || | | | |
| perl || | | | `perlnavigator` |
| php |||| | `intelephense` |
| po ||| | | |
| pod || | | | |
| ponylang |||| | |
| prisma || | | | `prisma-language-server` |
| prolog | | | | | `swipl` |
| protobuf || || | `bufls`, `pb` |
| prql || | | | |
| purescript || | | | `purescript-language-server` |
| python ||||| `pylsp` |
| qml || || | `qmlls` |
| r || | | | `R` |
| racket || | || `racket` |
| regex || | || |
| rego || | | | `regols` |
| rescript ||| | | `rescript-language-server` |
| rmarkdown || || | `R` |
| robot || | | | `robotframework_ls` |
| ron || || | |
| rst || | | | |
| ruby ||||| `solargraph` |
| rust ||||| `rust-analyzer` |
| sage ||| | | |
| scala || || | `metals` |
| scheme || | || |
| scss || | || `vscode-css-language-server` |
| slint || || | `slint-lsp` |
| smithy || | | | `cs` |
| sml || | | | |
| solidity || | | | `solc` |
| sql || | | | |
| sshclientconfig || | | | |
| starlark ||| || |
| strace || | | | |
| svelte || || | `svelteserver` |
| sway |||| | `forc` |
| swift || | | | `sourcekit-lsp` |
| t32 || | | | |
| tablegen |||| | |
| task || | | | |
| tfvars || || | `terraform-ls` |
| todotxt || | | | |
| toml || | || `taplo` |
| tsq || | || |
| tsx ||||| `typescript-language-server` |
| twig || | | | |
| typescript ||||| `typescript-language-server` |
| ungrammar || | | | |
| unison || | | | |
| uxntal || | | | |
| v |||| | `v-analyzer` |
| vala || | | | `vala-language-server` |
| verilog ||| | | `svlangserver` |
| vhdl || | | | `vhdl_ls` |
| vhs || | | | |
| vue || | | | `vue-language-server` |
| wast || | | | |
| wat || | | | |
| webc || | | | |
| wgsl || | | | `wgsl_analyzer` |
| wit || || | |
| wren |||| | |
| xit || | | | |
| xml || ||| |
| yaml || ||| `yaml-language-server` |
| yuck || | | | |
| zig ||||| `zls` |
2 changes: 1 addition & 1 deletion book/src/guides/README.md
Original file line number Diff line number Diff line change
@@ -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 changes: 132 additions & 0 deletions book/src/guides/rainbow_bracket_queries.md
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions book/src/languages.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ 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` |
| `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.
| `rulers` | Overrides the `editor.rulers` config key for the language. |
| `rainbow-brackets` | Overrides the `editor.rainbow-brackets` config key for the language. |

### File-type detection and the `file-types` key

Expand Down
11 changes: 11 additions & 0 deletions book/src/themes.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,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:
Expand Down
Loading

0 comments on commit 2fae2da

Please sign in to comment.