Skip to content

Commit 0ca5e54

Browse files
committed
Merge branch 'master' into hover_dump
2 parents f3d108b + 29789f2 commit 0ca5e54

File tree

308 files changed

+12793
-5885
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

308 files changed

+12793
-5885
lines changed

.envrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
watch_file shell.nix
2+
watch_file default.nix
23
watch_file flake.lock
34
watch_file rust-toolchain.toml
45

56
# try to use flakes, if it fails use normal nix (ie. shell.nix)
67
use flake || use nix
7-
eval "$shellHook"
8+
eval "$shellHook"

.github/dependabot.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ updates:
88
schedule:
99
interval: "weekly"
1010
groups:
11-
tree-sitter:
12-
patterns:
13-
- "tree-sitter*"
1411
rust-dependencies:
1512
update-types:
1613
- "minor"

.github/workflows/cachix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
uses: actions/checkout@v4
1515

1616
- name: Install nix
17-
uses: cachix/install-nix-action@v30
17+
uses: cachix/install-nix-action@v31
1818

1919
- name: Authenticate with Cachix
20-
uses: cachix/cachix-action@v15
20+
uses: cachix/cachix-action@v16
2121
with:
2222
name: helix
2323
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}

.github/workflows/gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Github Pages
1+
name: GitHub Pages
22

33
on:
44
push:

CHANGELOG.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@ Updated languages and queries:
735735
- Recognize common Dockerfile file types ([#9772](https://github.com/helix-editor/helix/pull/9772))
736736
- Recognize NUON files as Nu ([#9839](https://github.com/helix-editor/helix/pull/9839))
737737
- Add textobjects for Java native functions and constructors ([#9806](https://github.com/helix-editor/helix/pull/9806))
738-
- Fix "braket" typeo in JSX highlights ([#9910](https://github.com/helix-editor/helix/pull/9910))
738+
- Fix "braket" typo in JSX highlights ([#9910](https://github.com/helix-editor/helix/pull/9910))
739739
- Update tree-sitter-hurl ([#9775](https://github.com/helix-editor/helix/pull/9775))
740740
- Add textobjects queries for Vala ([#8541](https://github.com/helix-editor/helix/pull/8541))
741741
- Update tree-sitter-git-config ([9610254](https://github.com/helix-editor/helix/commit/9610254))
@@ -942,7 +942,7 @@ Updated languages and queries:
942942
- Add Fortran comment injections ([#7305](https://github.com/helix-editor/helix/pull/7305))
943943
- Switch Vue language server to `vue-language-server` ([#7312](https://github.com/helix-editor/helix/pull/7312))
944944
- Update tree-sitter-sql ([#7387](https://github.com/helix-editor/helix/pull/7387), [#8464](https://github.com/helix-editor/helix/pull/8464))
945-
- Replace the MATLAB tre-sitter grammar ([#7388](https://github.com/helix-editor/helix/pull/7388), [#7442](https://github.com/helix-editor/helix/pull/7442), [#7491](https://github.com/helix-editor/helix/pull/7491), [#7493](https://github.com/helix-editor/helix/pull/7493), [#7511](https://github.com/helix-editor/helix/pull/7511), [#7532](https://github.com/helix-editor/helix/pull/7532), [#8040](https://github.com/helix-editor/helix/pull/8040))
945+
- Replace the MATLAB tree-sitter grammar ([#7388](https://github.com/helix-editor/helix/pull/7388), [#7442](https://github.com/helix-editor/helix/pull/7442), [#7491](https://github.com/helix-editor/helix/pull/7491), [#7493](https://github.com/helix-editor/helix/pull/7493), [#7511](https://github.com/helix-editor/helix/pull/7511), [#7532](https://github.com/helix-editor/helix/pull/7532), [#8040](https://github.com/helix-editor/helix/pull/8040))
946946
- Highlight TOML table headers ([#7441](https://github.com/helix-editor/helix/pull/7441))
947947
- Recognize `cppm` file-type as C++ ([#7492](https://github.com/helix-editor/helix/pull/7492))
948948
- Refactor ecma language queries into private and public queries ([#7207](https://github.com/helix-editor/helix/pull/7207))
@@ -1429,7 +1429,7 @@ Features:
14291429
- Support underline styles and colors ([#4061](https://github.com/helix-editor/helix/pull/4061), [98c121c](https://github.com/helix-editor/helix/commit/98c121c))
14301430
- Inheritance for themes ([#3067](https://github.com/helix-editor/helix/pull/3067), [#4096](https://github.com/helix-editor/helix/pull/4096))
14311431
- Cursorcolumn ([#4084](https://github.com/helix-editor/helix/pull/4084))
1432-
- Overhauled system for writing files and quiting ([#2267](https://github.com/helix-editor/helix/pull/2267), [#4397](https://github.com/helix-editor/helix/pull/4397))
1432+
- Overhauled system for writing files and quitting ([#2267](https://github.com/helix-editor/helix/pull/2267), [#4397](https://github.com/helix-editor/helix/pull/4397))
14331433
- Autosave when terminal loses focus ([#3178](https://github.com/helix-editor/helix/pull/3178))
14341434
- Use OSC52 as a fallback for the system clipboard ([#3220](https://github.com/helix-editor/helix/pull/3220))
14351435
- Show git diffs in the gutter ([#3890](https://github.com/helix-editor/helix/pull/3890), [#5012](https://github.com/helix-editor/helix/pull/5012), [#4995](https://github.com/helix-editor/helix/pull/4995))
@@ -1584,7 +1584,7 @@ Themes:
15841584
- Update `pop-dark` ([#4323](https://github.com/helix-editor/helix/pull/4323))
15851585
- Update `rose_pine` ([#4221](https://github.com/helix-editor/helix/pull/4221))
15861586
- Add `kanagawa` ([#4300](https://github.com/helix-editor/helix/pull/4300))
1587-
- Add `hex_steel`, `hex_toxic` and `hex_lavendar` ([#4367](https://github.com/helix-editor/helix/pull/4367), [#4990](https://github.com/helix-editor/helix/pull/4990))
1587+
- Add `hex_steel`, `hex_toxic` and `hex_lavender` ([#4367](https://github.com/helix-editor/helix/pull/4367), [#4990](https://github.com/helix-editor/helix/pull/4990))
15881588
- Update `tokyonight` and `tokyonight_storm` ([#4415](https://github.com/helix-editor/helix/pull/4415))
15891589
- Update `gruvbox` ([#4626](https://github.com/helix-editor/helix/pull/4626))
15901590
- Update `dark_plus` ([#4661](https://github.com/helix-editor/helix/pull/4661), [#4678](https://github.com/helix-editor/helix/pull/4678))
@@ -1751,7 +1751,7 @@ Usability improvements and fixes:
17511751
- Introduce `keyword.storage` highlight scope ([#2731](https://github.com/helix-editor/helix/pull/2731))
17521752
- Handle symlinks more consistently ([#2718](https://github.com/helix-editor/helix/pull/2718))
17531753
- Improve markdown list rendering ([#2687](https://github.com/helix-editor/helix/pull/2687))
1754-
- Update auto-pairs and idle-timout settings when the config is reloaded ([#2736](https://github.com/helix-editor/helix/pull/2736))
1754+
- Update auto-pairs and idle-timeout settings when the config is reloaded ([#2736](https://github.com/helix-editor/helix/pull/2736))
17551755
- Fix panic on closing last buffer ([#2658](https://github.com/helix-editor/helix/pull/2658))
17561756
- Prevent modifying jumplist until jumping to a reference ([#2670](https://github.com/helix-editor/helix/pull/2670))
17571757
- Ensure `:quit` and `:quit!` take no arguments ([#2654](https://github.com/helix-editor/helix/pull/2654))

0 commit comments

Comments
 (0)