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 lsp panic caused by advanced resolver compile err #1361

Merged
merged 2 commits into from
May 27, 2024
Merged

fix: fix lsp panic caused by advanced resolver compile err #1361

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3723317
fix lsp panic caused by advanced resolver compile err
He1pa May 27, 2024
106d381
fmt code
He1pa May 27, 2024
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
25 changes: 20 additions & 5 deletions kclvm/tools/src/LSP/src/request.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,10 @@ pub(crate) fn handle_goto_definition(
if !snapshot.verify_request_path(&path.clone().into(), &sender) {
return Ok(None);
}
let db = snapshot.get_db(&path.clone().into())?;
let db = match snapshot.get_db(&path.clone().into()) {
Ok(db) => db,
Err(_) => return Ok(None),
};
let kcl_pos = kcl_pos(&file, params.text_document_position_params.position);
let res = goto_def(&kcl_pos, &db.gs);
if res.is_none() {
Expand All @@ -261,7 +264,10 @@ pub(crate) fn handle_reference(
if !snapshot.verify_request_path(&path.clone().into(), &sender) {
return Ok(None);
}
let db = snapshot.get_db(&path.clone().into())?;
let db = match snapshot.get_db(&path.clone().into()) {
Ok(db) => db,
Err(_) => return Ok(None),
};
let pos = kcl_pos(&file, params.text_document_position.position);
let log = |msg: String| log_message(msg, &sender);
let module_cache = snapshot.module_cache.clone();
Expand Down Expand Up @@ -304,7 +310,10 @@ pub(crate) fn handle_completion(
.and_then(|ctx| ctx.trigger_character)
.and_then(|s| s.chars().next());

let db = snapshot.get_db(&path.clone().into())?;
let db = match snapshot.get_db(&path.clone().into()) {
Ok(db) => db,
Err(_) => return Ok(None),
};

let res = completion(
completion_trigger_character,
Expand All @@ -331,7 +340,10 @@ pub(crate) fn handle_hover(
if !snapshot.verify_request_path(&path.clone().into(), &sender) {
return Ok(None);
}
let db = snapshot.get_db(&path.clone().into())?;
let db = match snapshot.get_db(&path.clone().into()) {
Ok(db) => db,
Err(_) => return Ok(None),
};
let kcl_pos = kcl_pos(&file, params.text_document_position_params.position);
let res = hover::hover(&kcl_pos, &db.gs);
if res.is_none() {
Expand Down Expand Up @@ -379,7 +391,10 @@ pub(crate) fn handle_rename(
if !snapshot.verify_request_path(&path.clone().into(), &sender) {
return Ok(None);
}
let db = snapshot.get_db(&path.clone().into())?;
let db = match snapshot.get_db(&path.clone().into()) {
Ok(db) => db,
Err(_) => return Ok(None),
};
let kcl_pos = kcl_pos(&file, params.text_document_position.position);
let log = |msg: String| log_message(msg, &sender);
let references = find_refs(
Expand Down
Loading