Commit Graph

512 Commits (7d4fee8f9cd2266dc9671b045069e99956acf2f3)

Author SHA1 Message Date
ChrHorn 11367488ac
Improve Python queries, add locals (#3284) 2 years ago
ChrHorn 0c08ff1596
update catppuccin theme(s) to new palettes (#3281) 2 years ago
ChrHorn 59bf1669ec
javascript queries: fix parameters (#3280) 2 years ago
Alexander Brevig 07019c3905
fix: gruvbox color modes (#3202)
* fix: gruvbox color modes

* increase contrast, and use blue and not purple
2 years ago
Banst 7e06681413
feat: add cue support (#3262) 2 years ago
Alexander Brevig e405e88c86
Flatwhite Theme (#3236) 2 years ago
Erasin 919edfb323
Add Graphviz Dot lang support (#3241)
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
2 years ago
Slug 14eca318a7
Add transparent theme based on base16_default (#3216) 2 years ago
Erasin a1c969012d
Fix cursorline and selection themes for onelight (#3226) 2 years ago
Erasin 681c0a91dc
Add textobject for javascript (#3213) 2 years ago
Michael Davis 9ed9c3faca
Remove let_declaration from Rust locals tracking (#3212) 2 years ago
Philipp Mildenberger bf74a4652d
JS/TS highlighting improvements (#3219) 2 years ago
A-Walrus 61856f1d64
Nord color modes (#3200)
* Add color modes to nord theme

* Add color-modes to nord_light theme and fixup

Fg color was not set in some places and defaulted incorrectly.
2 years ago
Erasin df5ab8b40c
Fix: Python hightlight (#3201) 2 years ago
n0s4 d97c4ee217 Spacing 2 years ago
n0s4 d95c7eaa29 Fixes + consistency
Some lines went longer than the titlebars, fixed regex in
SPLITTING SELECTIONS which wasn't actually correct.
Changed 1 "bat" to a "cat" in ADDING SELECTION ON NEXT
SEARCH MATCH which makes it harder to do with a simple
s select.
2 years ago
n0s4 348951f6f9 Add SPLITTING SELECTIONS 2 years ago
n0s4 b0f8d74db9 Spelling 2 years ago
n0s4 771de41155 Add CYCLING AND REMOVING SELECTIONS 2 years ago
n0s4 9114672419 Move Jumplist section and add recap 2 years ago
n0s4 4e76436b20 Add 'ADDING SELECTION ON NEXT SEARCH MATCH' 2 years ago
n0s4 d2b292660d Add SEARCH FOR SELECTION 2 years ago
n0s4 c7f9caf6bd Add REGISTERS, update MACROS accordingly 2 years ago
n0s4 29ee7f6d01 Add REPLACING WITH YANKED TEXT and INCREMENTING/DECREMTING
Also some consistency issues
 - redundant/dated comment in JOINING LINES
 - spacing around slashes
 - etc.
2 years ago
n0s4 92d94e1f7e Add REPITITION section 2 years ago
n0s4 88902d1f59 Improve ALIGN SELECTIONS section 2 years ago
n0s4 ec4c2f3965 Reduce A-; section to a note on section 3.7
Also fixed consistency of capitalisation and spacing of notes.
2 years ago
n0s4 ce732ce664 Correct recap numbers. 2 years ago
n0s4 d0381d942d Line too long + grammar. 2 years ago
n0s4 5accb5cd58 Add vale to gitignore + spelling 2 years ago
n0s4 68acdbb9a2 Added REPLACE and moved SELECTING TO A CHARACTER into the same chapter. 2 years ago
n0s4 1fed3a2220 Add 'ALIGN SELECTIONS' and 'SPLIT SELECTIONS ON LINES' 2 years ago
n0s4 15e1a0ebf2 Move COLLAPSING SELECTION to MOTIONS AND SELECTIONS.
Also had to do a little rewording to fit the recap for MOTIONS AND SELECTIONS.
2 years ago
n0s4 aa5cebae22 Added Select mode section.
Also added a note about X on "SELECTING LINES".
2 years ago
n0s4 a0d01455ac Re-order sections. 2 years ago
Kirawi 0a2646e720
Improve python highlighting (#3103)
* improve python queries

* update python grammar to `0.20.2`

* fix variadic parameter scope

* add punctuation scopes

* fix order of punctuation scopes

* undo  `embedded` delete
2 years ago
Daniel Longeuay 2ede98c4b4
feat(tree-sitter): add go template support (#3091)
* feat(tree-sitter):  add go template support

* fix(tree-sitter): 🐛 go template highlight scope selectors

* chore(tree-sitter): 🔧 update go template grammar commit
2 years ago
Mr. E d4a5413255
feat(themes): add mode-specific styles to the dracula themes (#3135) 2 years ago
Clay b55573dc1d
Add elixir & heex comment textobjects (#3179) 2 years ago
André Sá 742d16026e
Add ayu themes (#3184) 2 years ago
A-Walrus cb142b5750
Highlight constructor in monokai theme (#3131) 2 years ago
bootradev 4db01b3f82
add support for rulers to boo_berry theme (#3191) 2 years ago
trivernis 6f01208a73
Merge branch 'master' of github.com:helix-editor/helix 2 years ago
Erasin dad6d0f3b2
Fix: svelte indets.scm (#3147) 2 years ago
Clay ec85fb9ab6
Improve HEEx comment highlights, inject comment lang (#3170) 2 years ago
trivernis a6e16df9a3
Merge branch 'master' of github.com:helix-editor/helix 2 years ago
trivernis 7cb8330751
Merge remote-tracking branch 'pr-tree/tree_explore'
Signed-off-by: trivernis <trivernis@protonmail.com>
2 years ago
Aiko Mastboom 4589111d12
helix_view::theme [WARN] Theme (#3119)
* helix_view::theme [WARN] Theme

* updated: warning, error, info, hint colours
https://github.com/catppuccin/catppuccin/blob/main/docs/style-guide.md#typography

Co-authored-by: Aiko Mastboom <git@aiko.sh>
2 years ago
Philipp Mildenberger b6c700fce9
Replace '; inherits <language>' in treesitter queries with <language> queries instead of appending them (#2470)
Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
2 years ago
0rphee 76756f0e5d
add statusline.{mode} colors and tweak various settings (#3128) 2 years ago
Erasin 3b1ba7fb12
Add `color-modes` for onelight theme (#3104)
Add keyword.function and keyword.storage.type for TS
2 years ago
Mr. E b6e06c8c0c
feat(themes): add mode-specific styles to the onedark theme (#3098) 2 years ago
Michael Davis 9753da6ab7
Fix locals tracking in Rust closures (#3027)
The fix comes from the rewriting of the `closure_parameters` stanza:
it was capturing the entire `closure_parameters` node including
paretheses, whitespace, and commas. Capturing the identifiers within
fixes the tracking.

In order to make sure locals definitions from closure parameters don't
leak out of the body of the closure, though, we should also mark the
closure itself as a locals scope.
2 years ago
Joe 0c9594e41e
Add SCSS language support (#3074) 2 years ago
Termina94 3cced1e3c8
Add cursorline colour to darkplus theme (#3054)
Co-authored-by: Dean Revell <revell@gmail.com>
2 years ago
0rphee 7951ebfd4d
[Theme] Noctis (#3043) 2 years ago
Mateusz S. Szczygieł 5f69beb87f
Add textobjects.scm to GLSL (#3051) 2 years ago
Philipp Mildenberger e97b8607c1
Added ungrammar language support (#3048) 2 years ago
Austen LeBeau 0cb0c30618
add fortran language (#3025) 2 years ago
Gokul Soumya b7a3531b8f
theme(onedark): Remove bg for window separator (#3011) 2 years ago
Jake Langford 230ba264bf
Introduce storage highlighting for typescript/javascript (#2961) 2 years ago
Ivan Tham e35abe38f3
Remove broken ledger tag highlight (#2988) 2 years ago
A-Walrus 1378b911b6
Fix some typos (#2978) 2 years ago
Ivan Tham b612211070
Update tree-sitter-ledger (#2936) 2 years ago
Michael Davis aacd0c8aa5
Update TSQ queries (#2960)
A few changes to make TSQ highlights better:

* A parsing error has been fixed in the grammar itself
    * Previously tree-sitter-tsq did not parse the variables
      in predicates like `(#set! injection.language "javascript")`
* Theme nodes as `tag`
    * The newly added node to the parser (from the above fix) is
      `variable` which takes over the `variable` capture from nodes
* Highlight known predicates as `function` and unsupported
  predicates as `error`
    * This may help when translating queries from nvim-treesitter.
      For example `#any-of?` is a common one used in nvim-treesitter
      queries but not implemented in Helix or tree-sitter-cli.
* Inject tree-sitter-regex into `#match?` predicates
2 years ago
Jens Getreu 936ed3a226 Add Autumn night theme
Under some light conditions, one prefers a high contrast theme.
2 years ago
Jens Getreu 2e709859c4 Autumn theme: slightly adjust contrast 2 years ago
Skyler Hawthorne f392e35439
feat(theme): solarized: add cursorline, ruler, indent guide (#2962) 2 years ago
rsteube 4c30a3609a
languages: added elvish (#2948) 2 years ago
nosa 290b3ebbbe
Update night_owl for cursorline (#2938) 2 years ago
ramojus cc3aded185
add statusline mode colors to meliora theme (#2933) 2 years ago
nosa 8a19196ad5
Updated for #2676 , but I took the opportunity to do some other changes. (#2929)
- Misspelling of 'modifiers' for markdown.heading.1 and 2.
- Errors are now just underlined instead of in red.
- Diagnostics are dimmed, as well as whitespace.
- Add constant.builtin.
2 years ago
Blaž Hrastnik 9ae70cc410 Disable tree-sitter python indents, use fallback for now
There's been a lot of complaints about the state of python indentation
and the fallback actually works better until the solution proposed
in https://github.com/helix-editor/helix/issues/763#issuecomment-1137894973=
is implemented.
2 years ago
two-six 444bc24a26
[Theme] Nord Light (#2908)
* add theme

* updated nord_light

* update to colors

* last update to colors
2 years ago
Erasin 051a7f0606
add cursorline to one light theme (#2925) 2 years ago
Jens Getreu 7baa8e837b
Add `color-modes` to Autumn theme (#2928)
Co-authored-by: Jens Getreu <jens.getreu@dlh.lu>
2 years ago
Michael Davis c5600c9c01 markdown: limit raw block highlight to code fence content 2 years ago
Michael Davis c8dba2f4c6 erlang: highlight modules in behaviour attributes 2 years ago
Michael Davis 19acbfe02d erlang: highlight records with macro names
You might use a macro like `?MODULE` to name a record:

    -record(?MODULE, {a, b, c}).

With this fix, the record fields correctly get `variable.other.member`
highlights.
2 years ago
Michael Davis bf1aa8876c git-commit: fix highlight edge cases
* branch message with current branch and diverged branch has been
  added to the parser
* scissors used in verbose commits are marked as a punctuation
  delimiter
    * we could use comment instead since they're visually the
      same but IMO this works better
2 years ago
Michael Davis 4a0dab8bc2 erlang: fix '#match?' for specs/callbacks 2 years ago
Michael Davis e4e8a39bf7 replace module captures with namespace
`module` is undocumented and does not exist in other themes. The
equivalent existing scope based on usage (Elixir for example) is
`namespace`.
2 years ago
Michael Davis 016e97314c html: highlight punctuation
* `/>` as in self-closing tags like `<hr/>`
* `=` as in the separator between attribute name and value `<a href="bar">`
2 years ago
Michael Davis 7cf88f2bac edoc: prevent rogue punctuation highlights
Punctuation highlights would show up outside of where they
were valid, for example using parentheses in some text. This
change prevents that by gating the captures to being under
the named nodes in which they are valid.
2 years ago
Michael Davis 78c944ebc3 rust: fix highlight corner-cases
* add punctuation highlights for commas as in function parameters
* remove stray `variable.parameter` highlight
    * I couldn't find any regressions from this and it fixes an
      edge case I ran into (but sadly did not record 😓)
* highlight `fn` as `keyword.function`
    * the theme docs have `fn` as an example so it seems fitting
2 years ago
Michael Davis ca82cd86e6 markdown: highlight punctuation 2 years ago
Michael Davis bd527c84e6 erlang: highlight unary '#' as punctuation.bracket
The '#' character may either be interpreted as a map when used
like so:

    %% Example 1
    #{a => b}

Or as an operator which updates an existing map when the left-hand
side is an expression:

    %% Example 2
    MyMap#{a => b}

This commit changes the highlight to `punctuation.bracket` when used
as a character in a literal map (example 1) and keeps the `operator`
highlight when used for updating (example 2).
2 years ago
Michael Davis d523280e85 erlang: highlight nullary macros as constants 2 years ago
Sora 26501afe13
Update cursorline for tokyonight + tokyonight_storm (#2927)
Co-authored-by: s0LA1337 <dreamer@neoncity.dev>
2 years ago
Skyler Hawthorne f2768da1f6
add mode colors to solarized (#2926) 2 years ago
Mathspy d06800f1dd
Add mode specific styles (#2676)
* Add mode specific styles

In similar vein to neovim's lualine and similar statusline packages this
allows helix users to style their mode based on which mode it is thus
making each mode more visually distinct at a glance

* Add an example based on rosepine

* Add editor.colors-mode config

* Document statusline mode styles
2 years ago
Jens Getreu 94fc41a419
Add cursorline to Autumn theme (#2918)
Co-authored-by: Jens Getreu <jens.getreu@dlh.lu>
2 years ago
Ben Lee-Cohen 15ac1142cf
Adding a cursorline for the Nord theme (#2916) 2 years ago
Stuart Hinson 6ac6080969
primary cursorline for Dracula theme (#2915) 2 years ago
Michael Davis 64cf4c859b
support Bazel languages (#2903) 2 years ago
Gokul Soumya 23ce5f1837
Add cursorline scope for onedark theme (#2892) 2 years ago
ramojus db2aa57074
update meliora theme (#2890) 2 years ago
Gokul Soumya a26943de4e
Right align scrollbar with track in completion popup (#2754)
- Align the scollbar to the right edge of the popup rather than at
  a margin of one.
- Add a scrollbar track and a new scope `ui.menu.scroll`.
2 years ago
Ramojus c113531db9
add meliora theme (#2884) 2 years ago
two-six 18435899b2
[Theme] Acme (#2876) 2 years ago
Gokul Soumya 924b4ebb39 Add theme scopes for indent guides 2 years ago
Mathspy fa4934cff9
Default rulers color to red (#2669)
* Default rulers color to red

Currently if the theme a user is using doesn't have `ui.virtual.rulers`
set and they set up a ruler it just fails silently making it really hard
to figure out what went wrong. Did they set incorrectly set the ruler?
Are they using an outdated version of Helix that doesn't support rulers?

This happened to me today, I even switched to the default theme with
the assumption that maybe my theme just doesn't have the rulers setup
properly and it still didn't work.

Not sure if this is a good idea or not, feel free to suggest better
alternatives!

* Use builtin Style methods instead of Bevy style defaults

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* Only default the style if there's no ui or ui.virtual

* Update themes style from ui.virtual to ui.virtual.whitespace

* Revert ui.virtual change in onelight theme

* Prefer unwrap_or_else

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
2 years ago
Michael Davis 9f676dab57 add test textobjects queries for erlang,gleam,go,python,rust 2 years ago
Connor Lay (Clay) 67f6c85792 text-objects: add test capture & elixir queries 2 years ago
cossonleo 21d4bf859b tree helper and file explorer 2 years ago
farwyler cad4e03a00
adds missing tree-sitter-comment injection for js/ts (#2763) 2 years ago
Joe e2878a6e21
Add noctis bordo theme (#2830) 2 years ago
A-Walrus ad15e7b5e8
Add "<<=" operator to Rust syntax highlighting (#2805) 2 years ago
Clay b13e534b92
HEEx: upgrade version and support new special_attribute node (#2800) 2 years ago
nosa 21d12e1487
Restore section spacing in tutor. (#2791) 2 years ago
Axot 4d604d3b50
Add clojure language support (#2780)
Co-authored-by: Mateusz Ledwoń <mateusz.ledwon@iteo.com>
2 years ago
nosa 3b1866f959
update tutor (#2716)
* update tutor

* Capitalize "command mode ".

* Update runtime/tutor.txt

Editing mistake.

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
2 years ago
Anton Romanov 7983c71752
Introduce storage_class highlight scope (#2731) 2 years ago
Kappa d7bd441675
Cleanup for runtime/tutor.txt (#2590) 2 years ago
Bjorn Ove Hay Andersen 3b2d4031f1
Clarified the text in chapter 3 of the tutor (#2735)
* Clarified the text in chapter 3 of the tutor (#2725)

* Adjusted section 3.1 to better show how C works
2 years ago
Jonas Tepe a766b32ed1 Expand chapter one recap of tutor
This add the missing variant of entering insert mode
to the chapter 1 recap section.
2 years ago
Ivan 0bc7259672
add prisma tree-sitter and lsp support (#2703)
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
2 years ago
Danny 567e71fbbc
fix spelling of catppuccin theme (#2713) 2 years ago
Michael Davis 4a27e2d938 capture rust closures as function textobjects
Closures like

    iter.map(|a| a + 1)

Are sort-of functions, so `]f` or `maf` or `mif` can apply to them
as well as named function definitions.
2 years ago
Michael Davis f7a3d35752 add textobject queries for gleam 2 years ago
Michael Davis bcafdf404f add textobject queries for elixir 2 years ago
Michael Davis 7a9147489e add textobject queries for erlang 2 years ago
farwyler f0d1c85553
support for openscad (#2680)
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
2 years ago
nosa 5b4e0a304b
Update selection style of Night Owl (#2668) 2 years ago
Michael Davis fd4858c03d
add tree-sitter-jsdoc (#2650) 2 years ago
Michael Davis 42d780b103
add tree-sitter-edoc (#2640)
* add tree-sitter-edoc

* fix escape character capture in markdown queries

* add field negation operator "!" to tsq highlights
2 years ago
Michael Zeller 99e08f50bd
catpuccin ui.popup should be a different color from ui.background (#2644) 2 years ago
Ben Lee-Cohen fc666db6b9
Solarized Light: Fixing menu colors and adding English translation (#2626) 2 years ago
Clay fc8c488322
Elixir: inject Markdown into docs, remove h sigil HEEx injection (#2619)
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
2 years ago
Timothy DeHerrera eba82250bb
feat(lang): Update Nix grammar & improve queries (#2472) 2 years ago
Paul Graydon 710c4a84b2
Adjust colors in tokyonight themes (#2606) 2 years ago
pancake 7706a4a0d8
Add Vlang tree-sitter in the languages.toml (#2526)
Co-authored-by: pancake <pancake@nopcode.org>
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
2 years ago
Ben Lee-Cohen 7160e745f7 Changing Macro color to avoid color confusion
I noticed that in Rust, `println!`being a macro, it matched the color of string literals. This was visually confusing to me, so I checked what the nvim catpuccin theme (https://github.com/catppuccin/nvim) does. While it is pretty different, it does use different colors for strings and all function types: https://share.cleanshot.com/RLG2y1

I don't know if blue or red makes more sense given the other syntax choices, but wanted to propose this change cc @IsotoxalDev
2 years ago
Michael Davis 82da9bd4f2 update Erlang grammar and queries
The update to the grammar itself covers the case where the document
is a single expression without a trailing newline such as "min(A, B)".
A small change to the parser now parses these expressions correctly
which improves the display of the function head in the signature
help popup.

The update to the queries marks 'andalso', 'orelse', 'not', etc. as
`@keyword.operator` which improves the look - it looks odd to see
operators that are words highlighted the same as tokens like '->'
or '=:='.
2 years ago
Michael Davis 45dd54082e update Gleam grammar and queries
With respect to the queries:

The locals scope for functions was not large enough, so a function's
parameter could outlive the function body. To fix it, we just widen
the scope to the `function` node.

See also https://github.com/gleam-lang/tree-sitter-gleam/issues/25

With respect to the parser:

An external scanner has been added that fixes the parsing of strings.
Previously, a comment inside a string would act like a comment rather
than string contents.

See also https://github.com/gleam-lang/tree-sitter-gleam/issues/14#issuecomment-1129263640

A new constructor node has been added as well which makes type
highlighting more fine grained.

See also https://github.com/gleam-lang/tree-sitter-gleam/pull/29
2 years ago
Andrey Tkachenko 10463fe32c Add `parameter.around` text object query 2 years ago
Andrey Tkachenko 67fe16008e
Basic verilog support (#2552) 2 years ago
Isotoxal c429ed660f
Add Catppuccin Theme (#2546)
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
2 years ago
Jens Getreu 6801b28da0
Highlight active window in Autumn theme (#2531)
Co-authored-by: Jens Getreu <jens.getreu@dlh.lu>
3 years ago
Joel 0018545263 fix: remove duplicated `ui.help` in themes
the bottom value is used, so i've removed the top `ui.help` values from all themes

also, the values are not merged, so:

```toml
"ui.help" = { modifiers = ["reversed"] }
"ui.help" = { fg = "white", bg = "black" }
```

is equal to:

```toml
"ui.help" = { fg = "white", bg = "black" }
```
3 years ago
Blaž Hrastnik d25bae844c
Add Scheme support
Skipped scm for now :/ it overlaps with tree-sitter-tsq
3 years ago
Christoph Horn 9be810fd01 add missing `ui.menu` to themes, fix issues with some themes 3 years ago
Paul Scott 09f9f70576 Python highlight decorator attribute 3 years ago
Paul Scott 2a2030142f Python highlight keyword argument as parameter 3 years ago
Paul Scott e680f9644d Python handling highlighting parameters with defaults 3 years ago
Paul Scott abef250c58 Python highlight improvements: type, parameter etc
* str, list, etc. handled as @function.builtin and @type.builtin
* None and non-conforming type indentifiers as @type in type hints
* class identifiers treated as @type
* @constructor used for constructor definitions and calls rather than
  as a catch-all for type-like things
* Parameters highlighted
* self and cls as @variable.builtin
* improved decorator highlighting as part of @function

Re-ordering of some statements to give more accurate priority.
3 years ago
Zeddicus414 8e8d4ba27f dark_plus theme constructor should be green. 3 years ago
Zeddicus414 a6da99a144 Change python highlights.scm to more fully utilize the themes.
Create type keywords
Allow _CONSTANTS to start with _
Highlight constants before constructors
Move some keywords into @keyword.control
3 years ago
Andrey Tkachenko 62fd1f6999
Include macro attributes to impls, structs, enums, functions etc. textobjects (#2494) 3 years ago
midnightexigent 8493b5fca6
Add tree-sitter ssh client config queries (#2498)
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
3 years ago