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

feat: don't crash LSP when there are errors resolving the workspace #6257

Merged
merged 2 commits into from
Oct 9, 2024
Merged

feat: don't crash LSP when there are errors resolving the workspace #6257

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f181b4
Workspace package is the first package if the workspace is assumed
asterite Oct 9, 2024
e3013d2
LSP: don't crash if there's an error in Nargo.toml
asterite Oct 9, 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
28 changes: 22 additions & 6 deletions tooling/lsp/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,12 +267,16 @@ fn byte_span_to_range<'a, F: files::Files<'a> + ?Sized>(

pub(crate) fn resolve_workspace_for_source_path(file_path: &Path) -> Result<Workspace, LspError> {
if let Some(toml_path) = find_file_manifest(file_path) {
return resolve_workspace_from_toml(
match resolve_workspace_from_toml(
&toml_path,
PackageSelection::All,
Some(NOIR_ARTIFACT_VERSION_STRING.to_string()),
)
.map_err(|err| LspError::WorkspaceResolutionError(err.to_string()));
) {
Ok(workspace) => return Ok(workspace),
Err(error) => {
eprintln!("Error while processing {:?}: {}", toml_path, error);
}
}
}

let Some(parent_folder) = file_path
Expand All @@ -285,14 +289,22 @@ pub(crate) fn resolve_workspace_for_source_path(file_path: &Path) -> Result<Work
file_path
)));
};

let crate_name = match CrateName::from_str(parent_folder) {
Ok(name) => name,
Err(error) => {
eprintln!("{}", error);
CrateName::from_str("root").unwrap()
}
};

let assumed_package = Package {
version: None,
compiler_required_version: Some(NOIR_ARTIFACT_VERSION_STRING.to_string()),
root_dir: PathBuf::from(parent_folder),
package_type: PackageType::Binary,
entry_path: PathBuf::from(file_path),
name: CrateName::from_str(parent_folder)
.map_err(|err| LspError::WorkspaceResolutionError(err.to_string()))?,
name: crate_name,
dependencies: BTreeMap::new(),
expression_width: None,
};
Expand All @@ -309,7 +321,11 @@ pub(crate) fn workspace_package_for_file<'a>(
workspace: &'a Workspace,
file_path: &Path,
) -> Option<&'a Package> {
workspace.members.iter().find(|package| file_path.starts_with(&package.root_dir))
if workspace.is_assumed {
workspace.members.first()
} else {
workspace.members.iter().find(|package| file_path.starts_with(&package.root_dir))
}
}

pub(crate) fn prepare_package<'file_manager, 'parsed_files>(
Expand Down
Loading