Update to newest master

in preparation of maybe being able to smash some bugs ;)

book/src/generated/lang-support.md

@@ -1,5 +1,6 @@
 | Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Sticky Context | Default LSP |
 | --- | --- | --- | --- | --- | --- |
+| agda | ✓ |  |  |  |  |
 | astro | ✓ |  |  |  |  |
 | awk | ✓ | ✓ |  |  | `awk-language-server` |
 | bash | ✓ | ✓ | ✓ |  | `bash-language-server` |
@@ -10,23 +11,26 @@
 | blueprint | ✓ |  |  |  | `blueprint-compiler` |
 | c | ✓ | ✓ | ✓ | ✓ | `clangd` |
 | c-sharp | ✓ | ✓ |  |  | `OmniSharp` |
-| cabal |  |  |  |  |  |
+| cabal |  |  |  |  | `haskell-language-server-wrapper` |
 | cairo | ✓ | ✓ | ✓ |  | `cairo-language-server` |
 | capnp | ✓ |  | ✓ |  |  |
+| cel | ✓ |  |  |  |  |
 | clojure | ✓ |  |  |  | `clojure-lsp` |
 | cmake | ✓ | ✓ | ✓ |  | `cmake-language-server` |
 | comment | ✓ |  |  |  |  |
-| common-lisp | ✓ |  |  |  | `cl-lsp` |
+| common-lisp | ✓ |  | ✓ |  | `cl-lsp` |
 | cpon | ✓ |  | ✓ |  |  |
 | cpp | ✓ | ✓ | ✓ | ✓ | `clangd` |
 | crystal | ✓ | ✓ |  |  | `crystalline` |
-| css | ✓ |  |  |  | `vscode-css-language-server` |
+| css | ✓ |  | ✓ |  | `vscode-css-language-server` |
 | cue | ✓ |  |  |  | `cuelsp` |
 | d | ✓ | ✓ | ✓ |  | `serve-d` |
-| dart | ✓ |  | ✓ |  | `dart` |
+| dart | ✓ | ✓ | ✓ |  | `dart` |
+| dbml | ✓ |  |  |  |  |
 | devicetree | ✓ |  |  |  |  |
 | dhall | ✓ | ✓ |  |  | `dhall-lsp-server` |
 | diff | ✓ |  |  |  |  |
+| docker-compose | ✓ |  | ✓ |  | `docker-compose-langserver` |
 | dockerfile | ✓ |  |  |  | `docker-langserver` |
 | dot | ✓ |  |  |  | `dot-language-server` |
 | dtd | ✓ |  |  |  |  |
@@ -40,6 +44,7 @@
 | erb | ✓ |  |  |  |  |
 | erlang | ✓ | ✓ |  |  | `erlang_ls` |
 | esdl | ✓ |  |  |  |  |
+| fidl | ✓ |  |  |  |  |
 | fish | ✓ | ✓ | ✓ |  |  |
 | forth | ✓ |  |  |  | `forth-lsp` |
 | fortran | ✓ |  | ✓ |  | `fortls` |
@@ -54,33 +59,39 @@
 | git-rebase | ✓ |  |  |  |  |
 | gleam | ✓ | ✓ |  |  | `gleam` |
 | glsl | ✓ | ✓ | ✓ |  |  |
-| go | ✓ | ✓ | ✓ | ✓ | `gopls` |
+| gn | ✓ |  |  |  |  |
+| go | ✓ | ✓ | ✓ | ✓ | `gopls`, `golangci-lint-langserver` |
 | godot-resource | ✓ |  |  |  |  |
 | gomod | ✓ |  |  |  | `gopls` |
 | gotmpl | ✓ |  |  |  | `gopls` |
 | gowork | ✓ |  |  |  | `gopls` |
-| graphql | ✓ |  |  |  |  |
+| graphql | ✓ |  |  |  | `graphql-lsp` |
+| groovy | ✓ |  |  |  |  |
 | hare | ✓ |  |  |  |  |
 | haskell | ✓ | ✓ |  |  | `haskell-language-server-wrapper` |
 | haskell-persistent | ✓ |  |  |  |  |
-| hcl | ✓ |  | ✓ |  | `terraform-ls` |
+| hcl | ✓ | ✓ | ✓ |  | `terraform-ls` |
 | heex | ✓ | ✓ |  |  | `elixir-ls` |
+| hocon | ✓ |  | ✓ |  |  |
+| hoon | ✓ |  |  |  |  |
 | hosts | ✓ |  |  |  |  |
 | html | ✓ |  |  | ✓ | `vscode-html-language-server` |
 | hurl | ✓ |  | ✓ |  |  |
 | idris |  |  |  |  | `idris2-lsp` |
 | iex | ✓ |  |  |  |  |
 | ini | ✓ |  |  |  |  |
+| janet | ✓ |  |  |  |  |
 | java | ✓ | ✓ | ✓ |  | `jdtls` |
 | javascript | ✓ | ✓ | ✓ | ✓ | `typescript-language-server` |
 | jinja | ✓ |  |  |  |  |
 | jsdoc | ✓ |  |  |  |  |
 | json | ✓ |  | ✓ | ✓ | `vscode-json-language-server` |
+| json5 | ✓ |  |  |  |  |
 | jsonnet | ✓ |  |  |  | `jsonnet-language-server` |
 | jsx | ✓ | ✓ | ✓ | ✓ | `typescript-language-server` |
 | julia | ✓ | ✓ | ✓ |  | `julia` |
 | just | ✓ | ✓ | ✓ |  |  |
-| kdl | ✓ |  |  |  |  |
+| kdl | ✓ | ✓ | ✓ |  |  |
 | kotlin | ✓ |  |  |  | `kotlin-language-server` |
 | latex | ✓ | ✓ |  |  | `texlab` |
 | lean | ✓ |  |  |  | `lean` |
@@ -88,10 +99,12 @@
 | llvm | ✓ | ✓ | ✓ |  |  |
 | llvm-mir | ✓ | ✓ | ✓ |  |  |
 | llvm-mir-yaml | ✓ |  | ✓ |  |  |
+| log | ✓ |  |  |  |  |
+| lpf | ✓ |  |  |  |  |
 | lua | ✓ | ✓ | ✓ |  | `lua-language-server` |
-| make | ✓ |  |  |  |  |
+| make | ✓ |  | ✓ |  |  |
 | markdoc | ✓ |  |  |  | `markdoc-ls` |
-| markdown | ✓ |  |  | ✓ | `marksman` |
+| markdown | ✓ |  |  | ✓ | `marksman`, `markdown-oxide` |
 | markdown.inline | ✓ |  |  |  |  |
 | matlab | ✓ | ✓ | ✓ | ✓ |  |
 | mermaid | ✓ |  |  |  |  |
@@ -101,8 +114,8 @@
 | nasm | ✓ | ✓ |  |  |  |
 | nickel | ✓ |  | ✓ |  | `nls` |
 | nim | ✓ | ✓ | ✓ |  | `nimlangserver` |
-| nix | ✓ |  |  | ✓ | `nil` |
-| nu | ✓ |  |  |  |  |
+| nix | ✓ | ✓ |  | ✓ | `nil` |
+| nu | ✓ |  |  |  | `nu` |
 | nunjucks | ✓ |  |  |  |  |
 | ocaml | ✓ |  | ✓ |  | `ocamllsp` |
 | ocaml-interface | ✓ |  |  |  | `ocamllsp` |
@@ -115,18 +128,19 @@
 | pem | ✓ |  |  |  |  |
 | perl | ✓ | ✓ | ✓ |  | `perlnavigator` |
 | php | ✓ | ✓ | ✓ |  | `intelephense` |
+| pkl | ✓ |  | ✓ |  |  |
 | po | ✓ | ✓ |  |  |  |
 | pod | ✓ |  |  |  |  |
 | ponylang | ✓ | ✓ | ✓ |  |  |
 | prisma | ✓ |  |  |  | `prisma-language-server` |
 | prolog |  |  |  |  | `swipl` |
-| protobuf | ✓ |  | ✓ |  | `bufls`, `pb` |
+| protobuf | ✓ | ✓ | ✓ |  | `bufls`, `pb` |
 | prql | ✓ |  |  |  |  |
 | purescript | ✓ | ✓ |  |  | `purescript-language-server` |
-| python | ✓ | ✓ | ✓ |  | `pylsp` |
+| python | ✓ | ✓ | ✓ | ✓ | `pylsp` |
 | qml | ✓ |  | ✓ |  | `qmlls` |
 | r | ✓ |  |  |  | `R` |
-| racket | ✓ |  |  |  | `racket` |
+| racket | ✓ |  | ✓ |  | `racket` |
 | regex | ✓ |  |  |  |  |
 | rego | ✓ |  |  |  | `regols` |
 | rescript | ✓ | ✓ |  |  | `rescript-language-server` |
@@ -137,13 +151,15 @@
 | ruby | ✓ | ✓ | ✓ |  | `solargraph` |
 | rust | ✓ | ✓ | ✓ | ✓ | `rust-analyzer` |
 | sage | ✓ | ✓ |  |  |  |
-| scala | ✓ |  | ✓ |  | `metals` |
-| scheme | ✓ |  |  |  |  |
+| scala | ✓ | ✓ | ✓ |  | `metals` |
+| scheme | ✓ |  | ✓ |  |  |
 | scss | ✓ |  |  |  | `vscode-css-language-server` |
-| slint | ✓ |  | ✓ |  | `slint-lsp` |
+| slint | ✓ | ✓ | ✓ |  | `slint-lsp` |
+| smali | ✓ |  | ✓ |  |  |
 | smithy | ✓ |  |  |  | `cs` |
 | sml | ✓ |  |  |  |  |
 | solidity | ✓ |  |  |  | `solc` |
+| spicedb | ✓ |  |  |  |  |
 | sql | ✓ |  |  |  |  |
 | sshclientconfig | ✓ |  |  |  |  |
 | starlark | ✓ | ✓ |  |  |  |
@@ -153,7 +169,9 @@
 | swift | ✓ |  |  |  | `sourcekit-lsp` |
 | t32 | ✓ |  |  |  |  |
 | tablegen | ✓ | ✓ | ✓ |  |  |
+| tact | ✓ | ✓ | ✓ |  |  |
 | task | ✓ |  |  |  |  |
+| templ | ✓ |  |  |  | `templ` |
 | tfvars | ✓ |  | ✓ |  | `terraform-ls` |
 | todotxt | ✓ |  |  |  |  |
 | toml | ✓ |  |  | ✓ | `taplo` |
@@ -161,8 +179,9 @@
 | tsx | ✓ | ✓ | ✓ | ✓ | `typescript-language-server` |
 | twig | ✓ |  |  |  |  |
 | typescript | ✓ | ✓ | ✓ | ✓ | `typescript-language-server` |
+| typst | ✓ |  |  |  | `typst-lsp` |
 | ungrammar | ✓ |  |  |  |  |
-| unison | ✓ |  |  |  |  |
+| unison | ✓ |  | ✓ |  |  |
 | uxntal | ✓ |  |  |  |  |
 | v | ✓ | ✓ | ✓ |  | `v-analyzer` |
 | vala | ✓ |  |  |  | `vala-language-server` |
@@ -178,6 +197,6 @@
 | wren | ✓ | ✓ | ✓ |  |  |
 | xit | ✓ |  |  |  |  |
 | xml | ✓ |  | ✓ |  |  |
-| yaml | ✓ |  | ✓ | ✓ | `yaml-language-server` |
+| yaml | ✓ |  | ✓ | ✓ | `yaml-language-server`, `ansible-language-server` |
 | yuck | ✓ |  |  |  |  |
 | zig | ✓ | ✓ | ✓ | ✓ | `zls` |

helix-term/src/ui/context.rs

@@ -336,7 +336,8 @@ pub fn render_sticky_context(
         } = visual_coords_at_pos(first_node_line, first_node_line_end, doc.tab_width());
 
         // get the highlighting of the basic capture
-        let highlights = EditorView::doc_syntax_highlights(doc, node_start, 1, theme);
+        let syntax_highlights = EditorView::doc_syntax_highlights(doc, node_start, 1, theme);
+        let overlay_highlights = EditorView::empty_highlight_iter(doc, node_start, 1);
 
         let mut offset_area = context_area;
 
@@ -357,7 +358,8 @@ pub fn render_sticky_context(
                 },
                 &formatting,
                 &TextAnnotations::default(),
-                highlights,
+                syntax_highlights,
+                overlay_highlights,
                 theme,
                 &mut [],
                 &mut [],
@@ -390,7 +392,9 @@ pub fn render_sticky_context(
 
             let mut renderer = TextRenderer::new(surface, doc, theme, end_vis_offset, offset_area);
 
-            let highlights = EditorView::doc_syntax_highlights(doc, node_end, 1, theme);
+            let syntax_highlights = EditorView::doc_syntax_highlights(doc, node_end, 1, theme);
+            let overlay_highlights = EditorView::empty_highlight_iter(doc, node_end, 1);
+
             let mut formatting = doc.text_format(offset_area.width, Some(theme));
             formatting.soft_wrap = false;
 
@@ -403,7 +407,8 @@ pub fn render_sticky_context(
                 },
                 &formatting,
                 &TextAnnotations::default(),
-                highlights,
+                syntax_highlights,
+                overlay_highlights,
                 theme,
                 &mut [],
                 &mut [],

helix-term/src/ui/editor.rs

@@ -36,9 +36,9 @@ use tui::{buffer::Buffer as Surface, text::Span};
 use super::{
     completion::CompletionItem,
     context::{self, StickyNode},
+    document::LineDecoration,
     statusline,
 };
-use super::{document::LineDecoration, lsp::SignatureHelp};
 
 pub struct EditorView {
     pub keymaps: Keymaps,

runtime/themes/tokyonight.toml

@@ -83,7 +83,9 @@ hint = { fg = "hint" }
 "ui.statusline.normal" = { bg = "blue", fg = "bg", modifiers = ["bold"] }
 "ui.statusline.insert" = { bg = "light-green", fg = "bg", modifiers = ["bold"] }
 "ui.statusline.select" = { bg = "magenta", fg = "bg", modifiers = ["bold"] }
-"ui.text" = { bg = "bg", fg = "fg" }
+"ui.sticky.context" = { bg = "bg-menu" }
+"ui.sticky.indicator" = { fg = "comment", bg = "bg-menu" }
+"ui.text" = { fg = "fg" }
 "ui.text.focus" = { bg = "bg-visual" }
 "ui.text.inactive" = { fg = "comment", modifiers = ["italic"] }
 "ui.text.info" = { bg = "bg-menu", fg = "fg" }