Skip to content

Commit

Permalink
Merge branch 'helix-editor:master' into better-bufferline
Browse files Browse the repository at this point in the history
  • Loading branch information
CedricMeu authored Dec 6, 2024
2 parents 56a686d + 28953ef commit 4bab206
Show file tree
Hide file tree
Showing 59 changed files with 1,053 additions and 140 deletions.
18 changes: 14 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ on:
schedule:
- cron: "00 01 * * *"

env:
MSRV: "1.76"

jobs:
check:
name: Check (msrv)
Expand All @@ -18,7 +21,9 @@ jobs:
uses: actions/checkout@v4

- name: Install MSRV toolchain
uses: dtolnay/[email protected]
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.MSRV }}

- uses: Swatinem/rust-cache@v2
with:
Expand All @@ -39,7 +44,9 @@ jobs:
uses: actions/checkout@v4

- name: Install MSRV toolchain
uses: dtolnay/[email protected]
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.MSRV }}

- uses: Swatinem/rust-cache@v2
with:
Expand Down Expand Up @@ -71,8 +78,9 @@ jobs:
uses: actions/checkout@v4

- name: Install MSRV toolchain
uses: dtolnay/rust-toolchain@1.76
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.MSRV }}
components: rustfmt, clippy

- uses: Swatinem/rust-cache@v2
Expand All @@ -99,7 +107,9 @@ jobs:
uses: actions/checkout@v4

- name: Install MSRV toolchain
uses: dtolnay/[email protected]
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.MSRV }}

- uses: Swatinem/rust-cache@v2
with:
Expand Down
12 changes: 6 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 12 additions & 1 deletion book/src/commands.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Commands

Command mode can be activated by pressing `:`. The built-in commands are:
- [Typable commands](#typable-commands)
- [Static commands](#static-commands)

## Typable commands

Typable commands are used from command mode and may take arguments. Command mode can be activated by pressing `:`. The built-in typable commands are:

{{#include ./generated/typable-cmd.md}}

## Static Commands

Static commands take no arguments and can be bound to keys. Static commands can also be executed from the command picker (`<space>?`). The built-in static commands are:

{{#include ./generated/static-cmd.md}}
2 changes: 1 addition & 1 deletion book/src/editor.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ The following statusline elements can be configured:

[^1]: By default, a progress spinner is shown in the statusline beside the file path.

[^2]: You may also have to activate them in the LSP config for them to appear, not just in Helix. Inlay hints in Helix are still being improved on and may be a little bit laggy/janky under some circumstances. Please report any bugs you see so we can fix them!
[^2]: You may also have to activate them in the language server config for them to appear, not just in Helix. Inlay hints in Helix are still being improved on and may be a little bit laggy/janky under some circumstances. Please report any bugs you see so we can fix them!

### `[editor.cursor-shape]` Section

Expand Down
6 changes: 4 additions & 2 deletions book/src/generated/lang-support.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
| Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Default LSP |
| Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Default language servers |
| --- | --- | --- | --- | --- |
| ada ||| | `ada_language_server` |
| adl |||| |
Expand Down Expand Up @@ -134,7 +134,7 @@
| mermaid || | | |
| meson || || `mesonlsp` |
| mint | | | | `mint` |
| mojo |||| `mojo-lsp-server` |
| mojo |||| `magic` |
| move || | | |
| msbuild || || |
| nasm ||| | |
Expand Down Expand Up @@ -208,6 +208,7 @@
| tact |||| |
| task || | | |
| tcl || || |
| teal || | | |
| templ || | | `templ` |
| textproto |||| |
| tfvars || || `terraform-ls` |
Expand All @@ -225,6 +226,7 @@
| uxntal || | | |
| v |||| `v-analyzer` |
| vala ||| | `vala-language-server` |
| vento || | | |
| verilog ||| | `svlangserver` |
| vhdl || | | `vhdl_ls` |
| vhs || | | |
Expand Down
Loading

0 comments on commit 4bab206

Please sign in to comment.