Use flag-lines after for inlay code lenses

Closes #727

CHANGELOG.md

@@ -1,6 +1,8 @@
 ## Unreleased
 
 Breaking changes:
+- New default server for Nix, [`nil`](https://github.com/oxalica/nil), replacing `rnix-lsp`.
+- Inlay code lenses (used by OCaml and Haskell language servers) are now shown after the referenced line. This requires Kakoune version >= 2024.
 - `lsp_hover_max_lines` now more directly controls the lines of information in the hover box.
 - `lsp_hover_max_lines` has been deprecated for `lsp_hover_max_info_lines`. `lsp_hover_max_lines` now defaults to `-1` and when it is `-1` `lsp_hover_max_info_lines` is used to control lines of information in the hover box.
 

rc/lsp.kak

@@ -419,7 +419,7 @@ declare-option -hidden int lsp_timestamp -1
 declare-option -hidden range-specs lsp_references
 declare-option -hidden range-specs lsp_semantic_tokens
 declare-option -hidden range-specs lsp_inlay_hints
-declare-option -hidden range-specs lsp_inlay_code_lenses
+declare-option -hidden line-specs lsp_inlay_code_lenses
 declare-option -hidden line-specs lsp_code_lenses 0 '0| '
 declare-option -hidden str lsp_project_root
 
@@ -2310,7 +2310,7 @@ define-command lsp-inlay-hints-disable -params 1 -docstring "lsp-inlay-hints-dis
 } -shell-script-candidates %{ printf '%s\n' buffer global window }
 
 define-command lsp-inlay-code-lenses-enable -params 1 -docstring "lsp-inlay-code-lenses-enable <scope>: enable inlay code lenses for <scope>" %{
-    add-highlighter "%arg{1}/lsp_inlay_code_lenses" replace-ranges lsp_inlay_code_lenses
+    add-highlighter "%arg{1}/lsp_inlay_code_lenses" flag-lines -after Default lsp_inlay_code_lenses
 } -shell-script-candidates %{ printf '%s\n' buffer global window }
 
 define-command lsp-inlay-code-lenses-disable -params 1 -docstring "lsp-inlay-code-lenses-disable <scope>: disable inlay code lenses for <scope>"  %{

src/language_features/code_lens.rs

@@ -65,22 +65,21 @@ fn editor_code_lens(
         }
     };
     let version = document.version;
-    let range_specs = lenses
+    let line_specs = lenses
         .iter()
         .map(|(server_name, lens)| {
             let server = &ctx.language_servers[server_name];
             let label = lens.command.as_ref().map_or("", |v| &v.title);
             let position =
                 lsp_position_to_kakoune(&lens.range.start, &document.text, server.offset_encoding);
             let line = position.line;
-            let column = position.column;
             lazy_static! {
                 static ref CODE_LENS_INDICATOR: &'static str =
                     wcwidth::expected_width_or_fallback("🔎", 2, "[L]");
             }
 
             editor_quote(&format!(
-                "{line}.{column}+0|{{InlayCodeLens}}[{} {}] ",
+                "{line}|{{InlayCodeLens}}[{} {}] ",
                 *CODE_LENS_INDICATOR,
                 escape_tuple_element(&escape_kakoune_markup(label))
             ))
@@ -92,7 +91,7 @@ fn editor_code_lens(
     let line_flags = gather_line_flags(ctx, buffile).0;
     let command = formatdoc!(
          "evaluate-commands \"set-option buffer lsp_diagnostic_lines {version} {line_flags} '0|%opt[lsp_diagnostic_line_error_sign]'\"
-          set-option buffer lsp_inlay_code_lenses {version} {range_specs}",
+          set-option buffer lsp_inlay_code_lenses {version} {line_specs}",
     );
     let command = format!(
         "evaluate-commands -buffer {} %§{}§",