language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-08-04 12:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge pull request #7290 from faldor20/basic-tag-completion

Browse source 
Basic tag completion
This commit is contained in:
Eli Dowling 2024-12-02 13:19:14 +10:00 • committed by GitHub
commit e483f36a59
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 46 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/language_server/src/analysis/analysed_doc.rs
View file

@ -13,7 +13,10 @@ use tower_lsp::lsp_types::{
};
use crate::{
analysis::completion::{field_completion, get_completion_items, get_module_completion_items},
analysis::completion::{
field_completion, get_completion_items, get_module_completion_items,
get_tag_completion_items,
},
convert::{ToRange, ToRocPosition},
};
@ -261,7 +264,7 @@ impl AnalyzedDocument {
if is_module_completion {
info!("Getting module dot completion...");
Some(get_module_completion_items(
symbol_prefix,
&symbol_prefix,
interns,
imports,
modules_info,
@ -284,13 +287,16 @@ impl AnalyzedDocument {
if is_module_or_type_completion {
info!("Getting module completion...");
let completions = get_module_completion_items(
symbol_prefix,
let mut completions = get_module_completion_items(
&symbol_prefix,
interns,
imports,
modules_info,
true,
);
let tag_completions =
get_tag_completion_items(&symbol_prefix, module_id, modules_info);
completions.extend(tag_completions);
Some(completions)
} else {
info!("Getting variable completion...");

38
crates/language_server/src/analysis/completion.rs
View file

@ -55,8 +55,42 @@ pub fn get_completion_items(
make_completion_items(subs, module_id, interns, docs, completions)
}
/// Super basic tag completion. Doesn't include any type documentation for the tags being completed
pub(super) fn get_tag_completion_items(
prefix: &String,
module_id: &ModuleId,
modules_info: &ModulesInfo,
) -> Vec<CompletionItem> {
modules_info
.subs_by_module
.get(module_id)
.iter()
.flat_map(|a| {
let mut lock = a.lock();
lock.tag_names.dedup();
lock.tag_names
.iter()
.filter_map(|a| {
if a.as_ident_str().starts_with(prefix) {
Some(CompletionItem {
label: a.as_ident_str().to_string(),
kind: Some(CompletionItemKind::ENUM),
documentation: Some(lsp_types::Documentation::String(
a.as_ident_str().to_string(),
)),
..Default::default()
})
} else {
None
}
})
.collect::<Vec<_>>() //we have to collect so that we can release the lock
})
.collect()
}
pub(super) fn get_module_completion_items(
prefix: String,
prefix: &String,
interns: &Interns,
imported_modules: &HashMap<ModuleId, Arc<Vec<(Symbol, Variable)>>>,
modules_info: &ModulesInfo,
@ -68,7 +102,7 @@ pub(super) fn get_module_completion_items(
let mod_name = mod_id.to_ident_str(interns).to_string();
// Completion for modules themselves
if mod_name.starts_with(&prefix) {
if mod_name.starts_with(prefix) {
let item = CompletionItem {
label: mod_name.clone(),
kind: Some(CompletionItemKind::MODULE),