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

bugfix: goto def (and hover) for complex select expr #755

Merged
merged 1 commit into from
Oct 11, 2023
Merged

bugfix: goto def (and hover) for complex select expr #755

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
124 changes: 93 additions & 31 deletions kclvm/tools/src/LSP/src/goto_def.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,46 +128,91 @@ pub(crate) fn find_def(

let (inner_expr, parent) = inner_most_expr_in_stmt(&node.node, kcl_pos, None);
if let Some(expr) = inner_expr {
if let Expr::Identifier(id) = expr.node {
let id_node = Node::node_with_pos(
id.clone(),
(
expr.filename,
expr.line,
expr.column,
expr.end_line,
expr.end_column,
),
);
let id = pre_process_identifier(id_node, kcl_pos);
match parent {
Some(schema_expr) => {
if let Expr::Schema(schema_expr) = schema_expr.node {
let schema_def =
find_def(node, &schema_expr.name.get_end_pos(), prog_scope);
if let Some(schema) = schema_def {
match schema {
Definition::Object(obj) => {
let schema_type = obj.ty.into_schema_type();
match expr.node {
Expr::Identifier(id) => {
let id_node = Node::node_with_pos(
id.clone(),
(
expr.filename,
expr.line,
expr.column,
expr.end_line,
expr.end_column,
),
);
let id = pre_process_identifier(id_node, kcl_pos);
match parent {
Some(schema_expr) => {
if let Expr::Schema(schema_expr) = schema_expr.node {
let schema_def =
find_def(node, &schema_expr.name.get_end_pos(), prog_scope);
if let Some(schema) = schema_def {
match schema {
Definition::Object(obj) => match &obj.ty.kind {
kclvm_sema::ty::TypeKind::Schema(schema_type) => {
return find_attr_in_schema(
&schema_type,
&id.names,
&prog_scope.scope_map,
)
}
_ => {}
},
Definition::Scope(_) => {}
}
}
}
}
None => {
if let Some(inner_most_scope) = prog_scope.inner_most_scope(kcl_pos) {
return resolve_var(
&id.names,
&inner_most_scope,
&prog_scope.scope_map,
);
}
}
}
}
Expr::Selector(select_expr) => {
if select_expr.attr.contains_pos(kcl_pos) {
let value_def = find_def(node, &select_expr.value.get_end_pos(), prog_scope);
let id = select_expr.attr;
match value_def {
Some(def) => match def {
Definition::Object(obj) => match &obj.ty.kind {
kclvm_sema::ty::TypeKind::Schema(schema_type) => {
return find_attr_in_schema(
&schema_type,
&id.names,
&id.node.names,
&prog_scope.scope_map,
);
}
Definition::Scope(_) => {
//todo
)
}
_ => {}
},
Definition::Scope(_) => {}
},
None => {
if let Some(inner_most_scope) = prog_scope.inner_most_scope(kcl_pos) {
return resolve_var(
&id.node.names,
&inner_most_scope,
&prog_scope.scope_map,
);
}
}
}
}
None => {
if let Some(inner_most_scope) = prog_scope.inner_most_scope(kcl_pos) {
return resolve_var(&id.names, &inner_most_scope, &prog_scope.scope_map);
}
Expr::Config(_) | Expr::ConfigIfEntry(_) => match parent {
Some(schema_expr) => {
if let Expr::Schema(schema_expr) = schema_expr.node {
return find_def(node, &schema_expr.name.get_end_pos(), prog_scope);
}
}
}
None => {}
},
_ => {}
}
}
None
Expand All @@ -187,7 +232,6 @@ pub(crate) fn resolve_var(
0 => None,
1 => {
let name = names[0].clone();

match current_scope.lookup(&name) {
Some(obj) => match &obj.borrow().kind {
kclvm_sema::resolver::scope::ScopeObjectKind::Module(_) => {
Expand Down Expand Up @@ -920,4 +964,22 @@ mod tests {
let res = goto_definition(&program, &pos, &prog_scope);
compare_goto_res(res, (&file, 43, 4, 43, 9));
}

#[test]
#[bench_test]
fn complex_select_goto_def() {
let path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));

let (file, program, prog_scope, _) =
compile_test_file("src/test_data/goto_def_test/goto_def.k");

let pos = KCLPos {
filename: file.clone(),
line: 52,
column: Some(22),
};

let res = goto_definition(&program, &pos, &prog_scope);
compare_goto_res(res, (&file, 43, 4, 43, 9));
}
}
20 changes: 20 additions & 0 deletions kclvm/tools/src/LSP/src/hover.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,4 +357,24 @@ mod tests {
_ => unreachable!("test error"),
}
}

#[test]
#[bench_test]
fn complex_select_hover() {
let (file, program, prog_scope, _) = compile_test_file("src/test_data/hover_test/fib.k");
let pos = KCLPos {
filename: file.clone(),
line: 14,
column: Some(22),
};
let got = hover(&program, &pos, &prog_scope).unwrap();
match got.contents {
lsp_types::HoverContents::Scalar(marked_string) => {
if let MarkedString::String(s) = marked_string {
assert_eq!(s, "value: int");
}
}
_ => unreachable!("test error"),
}
}
}
14 changes: 14 additions & 0 deletions kclvm/tools/src/LSP/src/test_data/hover_test/fib.k
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
schema Fib:
n1 = n - 1
n2 = n1 - 1
n: int
value: int

if n <= 1:
value = 1
elif n == 2:
value = 1
else:
value = Fib {n = n1}.value + Fib {n = n2}.value

fib8 = Fib {n = 8}.value
1 change: 0 additions & 1 deletion kclvm/tools/src/LSP/src/util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,6 @@ pub(crate) fn inner_most_expr(
match &expr.node {
Expr::Identifier(_) => (Some(expr.clone()), schema_def),
Expr::Selector(select_expr) => {
walk_if_contains_with_new_expr!(select_expr.attr, pos, schema_def, Expr::Identifier);
walk_if_contains!(select_expr.value, pos, schema_def);
(Some(expr.clone()), schema_def)
}
Expand Down
Loading