Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: lsp completion for internal pkg from program root #1445

Merged
merged 1 commit into from
Jun 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 123 additions & 3 deletions kclvm/tools/src/LSP/src/completion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -453,13 +453,55 @@ fn completion_import_builtin_pkg(program: &Program, pos: &KCLPos) -> IndexSet<KC

if let Some(node) = program.pos_to_stmt(line_start_pos) {
if let Stmt::Import(_) = node.node {
// system modules
completions.extend(STANDARD_SYSTEM_MODULES.iter().map(|s| KCLCompletionItem {
label: s.to_string(),
detail: None,
documentation: None,
kind: Some(KCLCompletionItemKind::Module),
insert_text: None,
}))
}));

// internal pkg and modules in program.root
if let Ok(entries) = fs::read_dir(program.root.clone()) {
for entry in entries {
if let Ok(entry) = entry {
if let Ok(file_type) = entry.file_type() {
// internal pkgs
if file_type.is_dir() {
if let Some(name) = entry.file_name().to_str() {
completions.insert(KCLCompletionItem {
label: name.to_string(),
detail: None,
documentation: None,
kind: Some(KCLCompletionItemKind::Module),
insert_text: None,
});
}
} else {
// internal module
let path = entry.path();
if path.to_str().unwrap_or("") == pos.filename {
continue;
}
if let Some(extension) = path.extension() {
if extension == KCL_FILE_EXTENSION {
if let Some(name) = entry.file_name().to_str() {
completions.insert(KCLCompletionItem {
label: name.to_string(),
detail: None,
documentation: None,
kind: Some(KCLCompletionItemKind::Module),
insert_text: None,
});
}
}
}
}
}
}
}
}
}
}
completions
Expand Down Expand Up @@ -744,7 +786,9 @@ mod tests {
use indexmap::IndexSet;
use kclvm_driver::toolchain;
use kclvm_error::Position as KCLPos;
use kclvm_sema::builtin::{BUILTIN_FUNCTIONS, MATH_FUNCTION_TYPES, STRING_MEMBER_FUNCTIONS};
use kclvm_sema::builtin::{
BUILTIN_FUNCTIONS, MATH_FUNCTION_TYPES, STANDARD_SYSTEM_MODULES, STRING_MEMBER_FUNCTIONS,
};
use lsp_types::{CompletionItem, CompletionItemKind, CompletionResponse, InsertTextFormat};
use proc_macro_crate::bench_test;

Expand Down Expand Up @@ -1159,7 +1203,7 @@ mod tests {
#[bench_test]
fn import_builtin_package() {
let (file, program, _, gs) =
compile_test_file("src/test_data/completion_test/import/builtin_pkg.k");
compile_test_file("src/test_data/completion_test/import/builtin/builtin_pkg.k");
let mut items: IndexSet<KCLCompletionItem> = IndexSet::new();

// test completion for builtin packages
Expand Down Expand Up @@ -1780,6 +1824,37 @@ mod tests {
}
}

#[macro_export]
macro_rules! completion_label_test_snapshot {
($name:ident, $file:expr, $line:expr, $column: expr, $trigger: expr) => {
#[test]
fn $name() {
insta::assert_snapshot!(format!("{:?}", {
let (file, program, _, gs) = compile_test_file($file);

let pos = KCLPos {
filename: file.clone(),
line: $line,
column: Some($column),
};
let tool = toolchain::default();

let mut got = completion($trigger, &program, &pos, &gs, &tool).unwrap();

match &mut got {
CompletionResponse::Array(arr) => {
let mut labels: Vec<String> =
arr.iter().map(|item| item.label.clone()).collect();
labels.sort();
labels
}
CompletionResponse::List(_) => panic!("test failed"),
}
}));
}
};
}

#[macro_export]
macro_rules! completion_label_without_builtin_func_test_snapshot {
($name:ident, $file:expr, $line:expr, $column: expr, $trigger: expr) => {
Expand Down Expand Up @@ -1823,6 +1898,43 @@ mod tests {
};
}

#[macro_export]
macro_rules! completion_label_without_system_pkg_test_snapshot {
($name:ident, $file:expr, $line:expr, $column: expr, $trigger: expr) => {
#[test]
fn $name() {
insta::assert_snapshot!(format!("{:?}", {
let (file, program, _, gs) = compile_test_file($file);

let pos = KCLPos {
filename: file.clone(),
line: $line,
column: Some($column),
};
let tool = toolchain::default();

let mut got = completion($trigger, &program, &pos, &gs, &tool).unwrap();

match &mut got {
CompletionResponse::Array(arr) => {
let mut labels: Vec<String> =
arr.iter().map(|item| item.label.clone()).collect();
labels.sort();
let labels: Vec<String> = labels
.iter()
.filter(|label| !STANDARD_SYSTEM_MODULES.contains(&label.as_str()))
.cloned()
.collect();

labels
}
CompletionResponse::List(_) => panic!("test failed"),
}
}));
}
};
}

completion_label_without_builtin_func_test_snapshot!(
lambda_1,
"src/test_data/completion_test/lambda/lambda_1/lambda_1.k",
Expand Down Expand Up @@ -1854,4 +1966,12 @@ mod tests {
4,
Some('\n')
);

completion_label_without_system_pkg_test_snapshot!(
import_internal_pkg_test,
"src/test_data/completion_test/import/internal/main.k",
1,
8,
None
);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
source: tools/src/LSP/src/completion.rs
expression: "format!(\"{:?}\",\n {\n let(file, program, _, gs) =\n compile_test_file(\"src/test_data/completion_test/import/internal/main.k\")\n ; let pos = KCLPos\n { filename : file.clone(), line : 1, column : Some(8), } ; let tool =\n toolchain :: default() ; let mut got =\n completion(None, & program, & pos, & gs, & tool).unwrap() ; match &\n mut got\n {\n CompletionResponse :: Array(arr) =>\n {\n let mut labels : Vec < String > =\n arr.iter().map(| item | item.label.clone()).collect() ;\n labels.sort() ; let labels : Vec < String > =\n labels.iter().filter(| label |!\n STANDARD_SYSTEM_MODULES.contains(&\n label.as_str())).cloned().collect() ; labels\n } CompletionResponse :: List(_) => panic! (\"test failed\"),\n }\n })"
---
["tt"]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import
Loading