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.

Sign up for GitHub

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

Jump to bottom

fix: fix complete schema pkg name error. #1750

Merged
merged 1 commit into from
Nov 13, 2024
Merged

fix: fix complete schema pkg name error. #1750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
78 changes: 49 additions & 29 deletions kclvm/tools/src/LSP/src/completion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,13 +351,13 @@ fn completion_assign(pos: &KCLPos, gs: &GlobalState) -> Option<lsp_types::Comple
match &sema_info.ty {
Some(ty) => {
items.extend(
ty_complete_label(
ty_complete_label_and_inser_text(
ty,
gs.get_packages().get_module_info(&pos.filename),
)
.iter()
.map(|label| {
KCLCompletionItem {
.map(
|(label, insert_text)| KCLCompletionItem {
label: format!(" {}", label),
detail: Some(format!(
"{}: {}",
Expand All @@ -366,9 +366,9 @@ fn completion_assign(pos: &KCLPos, gs: &GlobalState) -> Option<lsp_types::Comple
)),
kind: Some(KCLCompletionItemKind::Variable),
documentation: sema_info.doc.clone(),
insert_text: None,
}
}),
insert_text: Some(format!(" {}", insert_text)),
},
),
);
return Some(into_completion_items(&items).into());
}
Expand Down Expand Up @@ -471,6 +471,7 @@ fn completion_import_stmt(
line: pos.line,
column: Some(0),
};

if let Some(node) = program.pos_to_stmt(line_start_pos) {
if let Stmt::Import(_) = node.node {
completions.extend(completion_import_builtin_pkg());
Expand Down Expand Up @@ -734,38 +735,47 @@ fn dot_completion_in_import_stmt(
Some(into_completion_items(&items).into())
}

fn ty_complete_label(ty: &Type, module: Option<&ModuleInfo>) -> Vec<String> {
fn ty_complete_label_and_inser_text(
ty: &Type,
module: Option<&ModuleInfo>,
) -> Vec<(String, String)> {
match &ty.kind {
TypeKind::Bool => vec!["True".to_string(), "False".to_string()],
TypeKind::Bool => vec![
("True".to_string(), "True".to_string()),
("False".to_string(), "False".to_string()),
],
TypeKind::BoolLit(b) => {
vec![if *b {
"True".to_string()
("True".to_string(), "True".to_string())
} else {
"False".to_string()
("False".to_string(), "False".to_string())
}]
}
TypeKind::IntLit(i) => vec![i.to_string()],
TypeKind::FloatLit(f) => vec![f.to_string()],
TypeKind::Str => vec![r#""""#.to_string()],
TypeKind::StrLit(s) => vec![format!("{:?}", s)],
TypeKind::List(_) => vec!["[]".to_string()],
TypeKind::Dict(_) => vec!["{}".to_string()],
TypeKind::IntLit(i) => vec![(i.to_string(), i.to_string())],
TypeKind::FloatLit(f) => vec![(f.to_string(), f.to_string())],
TypeKind::Str => vec![(r#""""#.to_string(), r#""""#.to_string())],
TypeKind::StrLit(s) => vec![(format!("{:?}", s), format!("{:?}", s))],
TypeKind::List(_) => vec![("[]".to_string(), "[$1]".to_string())],
TypeKind::Dict(_) => vec![("{}".to_string(), "{$1}".to_string())],
TypeKind::Union(types) => types
.iter()
.flat_map(|ty| ty_complete_label(ty, module))
.flat_map(|ty| ty_complete_label_and_inser_text(ty, module))
.collect(),
TypeKind::Schema(schema) => {
vec![format!(
"{}{}{}",
if schema.pkgpath.is_empty() || schema.pkgpath == MAIN_PKG {
"".to_string()
} else if let Some(m) = module {
format!("{}.", pkg_real_name(&schema.pkgpath, m))
} else {
format!("{}.", schema.pkgpath.split('.').last().unwrap())
},
schema.name,
"{}"
vec![(
format!(
"{}{}{}",
if schema.pkgpath.is_empty() || schema.pkgpath == MAIN_PKG {
"".to_string()
} else if let Some(m) = module {
format!("{}.", pkg_real_name(&schema.pkgpath, m))
} else {
format!("{}.", schema.pkgpath.split('.').last().unwrap())
},
schema.name,
"{}"
),
"{$1}".to_string(), // `$1`` is used to determine the cursor position after completion
)]
}
_ => vec![],
Expand Down Expand Up @@ -1404,12 +1414,22 @@ mod tests {
column: Some(6),
};
let got = completion(Some(':'), &program, &pos, &gs, &tool, None).unwrap();
let got_labels: Vec<String> = match got {
let got_labels: Vec<String> = match &got {
CompletionResponse::Array(arr) => arr.iter().map(|item| item.label.clone()).collect(),
CompletionResponse::List(_) => panic!("test failed"),
};
let expected_labels: Vec<&str> = vec![" sub.Person1{}"];
assert_eq!(got_labels, expected_labels);

let got_insert_test: Vec<String> = match &got {
CompletionResponse::Array(arr) => arr
.iter()
.map(|item| item.clone().insert_text.unwrap().clone())
.collect(),
CompletionResponse::List(_) => panic!("test failed"),
};
let expected_insert_test: Vec<&str> = vec![" {$1}"];
assert_eq!(got_insert_test, expected_insert_test);
}

#[test]
Expand Down
1 change: 1 addition & 0 deletions kclvm/tools/src/LSP/src/test_data/completion_test/import/external/external_0/kcl.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@

[dependencies]
k8s = { oci = "oci://ghcr.io/kcl-lang/k8s", tag = "1.28" }

1 change: 1 addition & 0 deletions kclvm/tools/src/LSP/src/test_data/completion_test/import/external/external_1/kcl.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@

[dependencies]
k8s = { oci = "oci://ghcr.io/kcl-lang/k8s", tag = "1.28" }

1 change: 1 addition & 0 deletions kclvm/tools/src/LSP/src/test_data/goto_import_def_test/kcl.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ version = "0.0.4"

[dependencies]
konfig = { git = "https://github.com/awesome-kusion/konfig.git", tag = "v0.0.1" }

Loading