language-servers/ts_query_ls
1
0
Fork 0
mirror of https://github.com/ribru17/ts_query_ls.git synced 2025-12-23 05:36:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: completions and diagnostics for missing nodes

Browse source
This commit is contained in:
Riley Bruins 2025-02-01 16:33:32 -08:00
parent 70fbdd80c4
commit cba095dd77
2 changed files with 42 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/handlers/completion.rs
View file

@ -81,33 +81,45 @@ pub async fn completion(
let cursor_after_at_sign = lsp_position_to_byte_offset(position, &rope)
.and_then(|b| rope.try_byte_to_char(b))
.is_ok_and(|c| rope.char(c) == '@');
let in_capture =
cursor_after_at_sign || node_is_or_has_ancestor(tree.root_node(), current_node, "capture");
if !in_capture && !node_is_or_has_ancestor(tree.root_node(), current_node, "predicate") {
let in_anon = node_is_or_has_ancestor(tree.root_node(), current_node, "anonymous_node");
if let (Some(symbols), Some(supertypes)) = (
backend.symbols_vec_map.get(uri),
backend.supertype_map_map.get(uri),
) {
for symbol in symbols.iter() {
if (in_anon && !symbol.named) || (!in_anon && symbol.named) {
completion_items.push(CompletionItem {
label: symbol.label.clone(),
kind: if symbol.named {
if !supertypes.contains_key(symbol) {
Some(CompletionItemKind::CLASS)
let root = tree.root_node();
let in_capture = cursor_after_at_sign || node_is_or_has_ancestor(root, current_node, "capture");
let in_missing = node_is_or_has_ancestor(root, current_node, "missing_node");
if !in_capture && !node_is_or_has_ancestor(root, current_node, "predicate") {
let in_anon = node_is_or_has_ancestor(root, current_node, "string")
&& !node_is_or_has_ancestor(root, current_node, "predicate");
let top_level = current_node.kind() == "program";
if !top_level {
if let (Some(symbols), Some(supertypes)) = (
backend.symbols_vec_map.get(uri),
backend.supertype_map_map.get(uri),
) {
for symbol in symbols.iter() {
if (in_anon && !symbol.named) || (!in_anon && symbol.named) {
completion_items.push(CompletionItem {
label: symbol.label.clone(),
kind: if symbol.named {
if !supertypes.contains_key(symbol) {
Some(CompletionItemKind::CLASS)
} else {
Some(CompletionItemKind::INTERFACE)
}
} else {
Some(CompletionItemKind::INTERFACE)
}
} else {
Some(CompletionItemKind::CONSTANT)
},
..Default::default()
});
Some(CompletionItemKind::CONSTANT)
},
..Default::default()
});
}
}
}
}
if !in_anon {
if !in_missing && !in_anon {
if !top_level {
completion_items.push(CompletionItem {
label: String::from("MISSING"),
kind: Some(CompletionItemKind::KEYWORD),
..Default::default()
});
}
if let Some(fields) = backend.fields_vec_map.get(uri) {
for field in fields.iter() {
completion_items.push(CompletionItem {
@ -188,7 +200,11 @@ mod test {
Position { line: 0, character: 6 },
&[SymbolInfo { label: String::from("identifier"), named: true }],
&["operator"],
&[("identifier", CompletionItemKind::CLASS), ("operator: ", CompletionItemKind::FIELD)]
&[
("identifier", CompletionItemKind::CLASS),
("MISSING", CompletionItemKind::KEYWORD),
("operator: ", CompletionItemKind::FIELD),
]
)]
#[case(
r"((constant) @constant

2
src/util.rs
View file

@ -253,6 +253,8 @@ const DIAGNOSTICS_QUERY: &str = r#"
(anonymous_node (string (string_content) @a))
(named_node . name: (identifier) @n)
(named_node . supertype: (identifier) @supertype)
(missing_node name: (identifier) @n)
(missing_node name: (string (string_content) @a))
(field_definition name: (identifier) @f)
(parameters (capture) @c)
(predicate