language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-10-01 06:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

LSP: Improvements on complete ergonomics

Browse source
This commit is contained in:
Olivier Goffart 2021-04-17 08:57:42 +02:00
parent b94ea38965
commit 131f4d6682
1 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
tools/lsp/main.rs
View file

@ -69,7 +69,7 @@ fn run_lsp_server() -> Result<(), Error> {
let capabilities = ServerCapabilities {
completion_provider: Some(CompletionOptions {
resolve_provider: Some(true),
trigger_characters: None,
trigger_characters: Some(vec![".".to_owned()]),
work_done_progress_options: WorkDoneProgressOptions::default(),
}),
hover_provider: Some(HoverProviderCapability::Simple(true)),
@ -345,7 +345,25 @@ fn token_descr(
if !node.text_range().contains(o.into()) {
return None;
}
let token = node.token_at_offset(o.into()).last()?;
let mut taf = node.token_at_offset(o.into());
let token = match (taf.next(), taf.next()) {
(None, _) => return None,
(Some(t), None) => t,
(Some(l), Some(r)) => match (l.kind(), r.kind()) {
// Prioritize identifier
(SyntaxKind::Identifier, _) => l,
(_, SyntaxKind::Identifier) => r,
// then the dot
(SyntaxKind::Dot, _) => l,
(_, SyntaxKind::Dot) => r,
// de-prioritize the white spaces
(SyntaxKind::Whitespace, _) => r,
(SyntaxKind::Comment, _) => r,
(_, SyntaxKind::Whitespace) => l,
(_, SyntaxKind::Comment) => l,
_ => l,
},
};
Some(SyntaxToken { token, source_file: node.source_file.clone() })
}