refactor: nest Ruby LSP actions under core.lsp

This commit is contained in:
Valdemar Lorenzen
2026-10-09 14:48:25 +02:00
parent f093091002
commit be6be22b76
6 changed files with 35 additions and 11 deletions
+5 -5
View File
@@ -259,9 +259,9 @@ Vamp.configure do |config|
initialization_options: {}, initialization_options: {},
settings: { "my-language-server" => { "exampleOption" => true } } settings: { "my-language-server" => { "exampleOption" => true } }
} }
config.bind "leader d", config.core.lsp_definition config.bind "leader d", config.core.lsp.definition
config.bind "leader D", config.core.lsp_diagnostics config.bind "leader D", config.core.lsp.diagnostics
config.bind "K", config.core.lsp_hover config.bind "K", config.core.lsp.hover
end end
``` ```
@@ -275,7 +275,7 @@ The native module initializes each server, sends `initialization_options` as `in
`:lsp_definition` or the configured Space d binding requests a definition at the primary caret, once regardless of selection count. Both Location and LocationLink results are supported; multiple results use the first. Local-file navigation reuses loaded buffers without overwriting unsaved text. LSP UTF-16 positions and percent-encoded file URIs are translated to validated grapheme coordinates. Navigation is ignored if its source buffer, revision, caret, or latest request has changed. `:lsp_definition` or the configured Space d binding requests a definition at the primary caret, once regardless of selection count. Both Location and LocationLink results are supported; multiple results use the first. Local-file navigation reuses loaded buffers without overwriting unsaved text. LSP UTF-16 positions and percent-encoded file URIs are translated to validated grapheme coordinates. Navigation is ignored if its source buffer, revision, caret, or latest request has changed.
For programmatic bindings, use `config.core.lsp_definition`, `config.core.lsp_diagnostics`, and `config.core.lsp_hover`, immutable Action objects eligible in Normal mode. Each routes to the same native implementation as its Ex command; no LSP keys are bound by default. These actions are also available in the command palette. For programmatic bindings, `config.core.lsp` exposes immutable Normal-mode Action objects: `definition`, `diagnostics`, and `hover`. Each routes to the same native implementation as its Ex command; no LSP keys are bound by default. These actions are also available in the command palette. The namespace is distinct from `config.lsp[language_id]` server configuration; flat Ruby LSP action members have been removed without aliases.
Diagnostics appear as severity-colored gutter numbers and text underlines; the primary caret's diagnostic appears in the message row. `:lsp_diagnostics` reports the current document's server state. Older versioned diagnostics are discarded; unversioned diagnostics can only be associated with the arrival-time document revision. Editing clears previous annotations immediately. Server startup/transport failures are reported and clear that server's diagnostics; other servers and native editing remain available. There are no automatic restarts. Diagnostics appear as severity-colored gutter numbers and text underlines; the primary caret's diagnostic appears in the message row. `:lsp_diagnostics` reports the current document's server state. Older versioned diagnostics are discarded; unversioned diagnostics can only be associated with the arrival-time document revision. Editing clears previous annotations immediately. Server startup/transport failures are reported and clear that server's diagnostics; other servers and native editing remain available. There are no automatic restarts.
@@ -332,7 +332,7 @@ Key notation follows [Herdr's readable style](https://herdr.dev/docs/configurati
| Normal | `insert`, `append`, `open_below`, `open_above` | | Normal | `insert`, `append`, `open_below`, `open_above` |
| Normal, Visual | `insert_first_nonblank`, `append_line_end`, `clone_above`, `clone_below` | | Normal, Visual | `insert_first_nonblank`, `append_line_end`, `clone_above`, `clone_below` |
| Normal | `join_lines`, `undo`, `redo`, `command` | | Normal | `join_lines`, `undo`, `redo`, `command` |
| Normal | `lsp_definition`, `lsp_diagnostics`, `lsp_hover` | | Normal | `lsp.definition`, `lsp.diagnostics`, `lsp.hover` |
| Normal | `search`, `paste_before`, `paste_after` | | Normal | `search`, `paste_before`, `paste_after` |
| Normal | `paste_system_before`, `paste_system_after` | | Normal | `paste_system_before`, `paste_system_after` |
| Normal, Visual | `select`, `search_next`, `search_previous` | | Normal, Visual | `select`, `search_next`, `search_previous` |
+3 -3
View File
@@ -19,9 +19,9 @@ Vamp.configure do |config|
# command: ["my-language-server", "--stdio"], extensions: ["myl"], # command: ["my-language-server", "--stdio"], extensions: ["myl"],
# initialization_options: {}, settings: {} # initialization_options: {}, settings: {}
# } # }
# config.bind "leader d", config.core.lsp_definition # config.bind "leader d", config.core.lsp.definition
# config.bind "leader D", config.core.lsp_diagnostics # config.bind "leader D", config.core.lsp.diagnostics
# config.bind "K", config.core.lsp_hover # config.bind "K", config.core.lsp.hover
config.bind "g", "greet" config.bind "g", "greet"
config.bind "leader g", "greet" config.bind "leader g", "greet"
config.bind "ctrl+r", config.core.redo config.bind "ctrl+r", config.core.redo
+1 -1
View File
@@ -39,7 +39,7 @@ Set VAMP_RUBY to choose the Ruby executable.
Native LSP is disabled by default: config.lsp[\"rust\"] = true enables a preset Native LSP is disabled by default: config.lsp[\"rust\"] = true enables a preset
Custom languages: config.lsp[\"my-language\"] = { command: [...], extensions: [...] } Custom languages: config.lsp[\"my-language\"] = { command: [...], extensions: [...] }
LSP commands: :lsp_definition, :lsp_diagnostics, :lsp_hover LSP commands: :lsp_definition, :lsp_diagnostics, :lsp_hover
Hover binding: config.bind \"K\", config.core.lsp_hover (no default key)"; Hover binding: config.bind \"K\", config.core.lsp.hover (no default key)";
struct Options { struct Options {
file: Option<PathBuf>, file: Option<PathBuf>,
+13
View File
@@ -873,6 +873,19 @@ end
.unwrap_err() .unwrap_err()
.contains("must be a String") .contains("must be a String")
); );
for target in [
"config.core.lsp_hover",
"config.core.lsp_definition",
"config.core.lsp_diagnostics",
"config.core.lsp.hvoer",
"config.core.lsp",
] {
let invalid = fixture.file(
"invalid_action.rb",
&format!("Vamp.configure {{ |config| config.bind 'K', {target} }}"),
);
assert!(load_config(&invalid).is_err(), "{target}");
}
let invalid = fixture.file("core.rb", "Vamp.plugin 'evil', core: true"); let invalid = fixture.file("core.rb", "Vamp.plugin 'evil', core: true");
assert!(RubyPlugin::start(&invalid, &serde_json::json!({})).is_err()); assert!(RubyPlugin::start(&invalid, &serde_json::json!({})).is_err());
let invalid = fixture.file("syntax.rb", "this is not valid ruby ("); let invalid = fixture.file("syntax.rb", "this is not valid ruby (");
+12 -1
View File
@@ -64,11 +64,22 @@ module Vamp
copy_system paste_system_before paste_system_after copy_system paste_system_before paste_system_after
select_lines clone_above clone_below select_next skip_occurrence select_all select_lines clone_above clone_below select_next skip_occurrence select_all
file_picker file_explorer file_picker file_explorer
lsp_definition lsp_diagnostics lsp_hover
].each do |name| ].each do |name|
action = Action.new("core.#{name}".freeze).freeze action = Action.new("core.#{name}".freeze).freeze
define_singleton_method(name) { action } define_singleton_method(name) { action }
end end
module Lsp
%w[definition diagnostics hover].each do |name|
action = Action.new("core.lsp_#{name}".freeze).freeze
define_singleton_method(name) { action }
end
end
Lsp.freeze
def self.lsp
Lsp
end
end end
module Modes module Modes
+1 -1
View File
@@ -245,7 +245,7 @@ impl Fixture {
"settings": {"rust-analyzer": {"cargo": {"allFeatures": true}}}, "settings": {"rust-analyzer": {"cargo": {"allFeatures": true}}},
}); });
let config = format!( let config = format!(
"Vamp.configure do |config|\n config.clipboard_mode = 'separate'\n config.lsp['fixture-language'] = JSON.parse({})\n config.bind 'leader d', config.core.lsp_definition\n config.bind 'leader D', config.core.lsp_diagnostics\n config.bind 'K', config.core.lsp_hover\nend\n", "Vamp.configure do |config|\n config.clipboard_mode = 'separate'\n config.lsp['fixture-language'] = JSON.parse({})\n config.bind 'leader d', config.core.lsp.definition\n config.bind 'leader D', config.core.lsp.diagnostics\n config.bind 'K', config.core.lsp.hover\nend\n",
serde_json::to_string(&options.to_string()).unwrap(), serde_json::to_string(&options.to_string()).unwrap(),
); );
let config_path = self.root.join("config.rb"); let config_path = self.root.join("config.rb");