language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-10-21 07:41:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

lsp: Notify preview about text edits

Browse source 
Have the LS notify the live preview about changes it initiates, so
the live preview can update its selection.

This is not possible for all edits the LS generates: Many are sent
to the editor which may or may not trigger them later, but the
notification happens when the LS adds changes on top of changes
requested by the live preview (e.g. by adding an import). This
fixes having a newly added element selected once it is rendered.
This commit is contained in:
Tobias Hunger 2024-02-15 14:53:54 +01:00 • committed by Tobias Hunger
parent e4a0a85e2f
commit e1aefc6f16
4 changed files with 152 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

32
tools/lsp/language.rs
View file

@ -23,7 +23,9 @@ use crate::util::{
#[cfg(target_arch = "wasm32")]
use crate::wasm_prelude::*;
use crate::ServerNotifier;
use i_slint_compiler::diagnostics::SourceFile;
use i_slint_compiler::object_tree::ElementRc;
use i_slint_compiler::parser::{syntax_nodes, NodeOrToken, SyntaxKind, SyntaxNode, SyntaxToken};
use i_slint_compiler::pathutils::clean_path;
@ -87,6 +89,31 @@ fn create_show_preview_command(
)
}
pub fn notify_preview_about_text_edit(
server_notifier: &ServerNotifier,
edit: &TextEdit,
source_file: &SourceFile,
) {
let new_length = edit.new_text.len() as u32;
let (start_offset, end_offset) = {
let so =
source_file.offset(edit.range.start.line as usize, edit.range.start.character as usize);
let eo =
source_file.offset(edit.range.end.line as usize, edit.range.end.character as usize);
(std::cmp::min(so, eo) as u32, std::cmp::max(so, eo) as u32)
};
let Ok(url) = Url::from_file_path(source_file.path()) else {
return;
};
server_notifier.send_message_to_preview(LspToPreviewMessage::AdjustSelection {
url: VersionedUrl::new(url, source_file.version()),
start_offset,
end_offset,
new_length,
});
}
#[cfg(feature = "preview-external")]
pub fn request_state(ctx: &std::rc::Rc<Context>) {
use i_slint_compiler::diagnostics::Spanned;
@ -406,7 +433,7 @@ pub fn register_request_handlers(rh: &mut RequestHandler) {
let p = tk.parent();
let version = p.source_file.version();
if let Some(value) = find_element_id_for_highlight(&tk, &tk.parent()) {
let edits = value
let edits: Vec<_> = value
.into_iter()
.map(|r| TextEdit {
range: map_range(&p.source_file, r),
@ -1374,6 +1401,9 @@ pub fn add_component(
if let Some(edit) =
completion::create_import_edit(doc, &component.component_type, &component.import_path)
{
if let Some(sf) = doc.node.as_ref().map(|n| &n.source_file) {
notify_preview_about_text_edit(&ctx.server_notifier, &edit, sf);
}
edits.push(edit);
}