andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 09:26:19 +04:00
Code Issues Projects Releases Wiki Activity

Allow specifying a different style for diff indicator in vcs gutter. (#8343)

Browse Source 
This allows using a background in diff style
(for nice patch file coloring) while keeping the
gutter indicator nice (and using appropriate colors).
This commit is contained in:
Alexis Mousset 2023-09-21 00:28:36 +02:00 committed by GitHub
parent 651fd1ca72
commit 2284bce970
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
book/src/themes.md
View File

@ -245,9 +245,12 @@ #### Syntax highlighting
- `diff` - version control changes - `diff` - version control changes
- `plus` - additions - `plus` - additions
- `gutter` - gutter indicator
- `minus` - deletions - `minus` - deletions
- `gutter` - gutter indicator
- `delta` - modifications - `delta` - modifications
- `moved` - renamed or moved files/changes - `moved` - renamed or moved files/changes
- `gutter` - gutter indicator
#### Interface #### Interface

6
helix-view/src/gutter.rs
View File

@ -94,9 +94,9 @@ pub fn diff<'doc>(
theme: &Theme, theme: &Theme,
_is_focused: bool, _is_focused: bool,
) -> GutterFn<'doc> { ) -> GutterFn<'doc> {
let added = theme.get("diff.plus"); let added = theme.get("diff.plus.gutter");
let deleted = theme.get("diff.minus"); let deleted = theme.get("diff.minus.gutter");
let modified = theme.get("diff.delta"); let modified = theme.get("diff.delta.gutter");
if let Some(diff_handle) = doc.diff_handle() { if let Some(diff_handle) = doc.diff_handle() {
let hunks = diff_handle.load(); let hunks = diff_handle.load();
let mut hunk_i = 0; let mut hunk_i = 0;