Skip to content

fix(lsp): prefer most specific project root #9441

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

Merged
ematipico merged 5 commits into from
Mar 30, 2026
Merged

fix(lsp): prefer most specific project root #9441

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c922650
fix(lsp): prefer most specific project root
soconnor-seeq Feb 25, 2026
2519dc2
addresses coderabbitai comment
soconnor-seeq Mar 12, 2026
7d2ba5f
PR feedback addressed
soconnor-seeq Mar 23, 2026
a186da5
More PR feedback addressed
soconnor-seeq Mar 23, 2026
8d66d5c
Calls resolve_configuration_path once in did_open flow
soconnor-seeq Mar 25, 2026
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
Prev Previous commit
Calls resolve_configuration_path once in did_open flow
  • Loading branch information
@soconnor-seeq
soconnor-seeq committed Mar 25, 2026
commit 8d66d5c4ebaedeb94fedb2e5ab4f45008dce1ba0
82 changes: 42 additions & 40 deletions crates/biome_lsp/src/handlers/text_document.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@ pub(crate) async fn did_open(
let language_hint = DocumentFileSource::from_language_id(&params.text_document.language_id);

let path = session.file_path(&url)?;
let Some(project_key) = ensure_project_for_opened_document(session, &path).await else {
let file_path = path.to_path_buf();
let config_path = session.resolve_configuration_path(Some(&file_path));

let Some(project_key) =
ensure_project_for_opened_document(session, &path, config_path.as_ref()).await
else {
return Ok(());
};

Expand Down Expand Up @@ -75,55 +80,50 @@ pub(crate) async fn did_open(
async fn ensure_project_for_opened_document(
session: &Arc<Session>,
path: &Utf8Path,
config_path: Option<&ConfigurationPathHint>,
) -> Option<ProjectKey> {
let is_relative_config_path = session
.get_settings_configuration_path()
.is_some_and(|config_path| !config_path.is_absolute());

let mut load_status = None;

if let Some(project_key) = session.project_for_path(path) {
if let Some(config_path) = session.get_settings_configuration_path() {
if !config_path.is_absolute() {
let file_path = path.to_path_buf();
// Re-resolve relative configurationPath per file so each workspace folder uses
// its own config, even when a project is already open.
if let Some(resolved_path) = session.resolve_configuration_path(Some(&file_path)) {
let status = session
.load_biome_configuration_file(resolved_path, false)
.await;
session.set_configuration_status(status);
if !status.is_loaded() {
error!("Configuration could not be loaded for {path}");
return None;
}
// Re-check after loading: a nested project may have been registered.
return match session.project_for_path(path) {
Some(updated_key) => Some(updated_key),
None => {
error!("Could not find project for {path}");
None
}
};
}
if is_relative_config_path {
// Absolute configurationPath is global; only relative needs per-file resolution.
// Use the per-file resolved configurationPath so each workspace folder
// uses its own config, even when a project is already open.
if let Some(resolved_path) = config_path {
session.set_configuration_status(ConfigurationStatus::Loading);
let status = session
.load_biome_configuration_file(resolved_path.clone(), false)
.await;
load_status = Some(status);
}
}
return Some(project_key);
if load_status.is_none() {
return Some(project_key);
}
} else {
info!("No open project for path: {path:?}. Opening new project.");
}

session.set_configuration_status(ConfigurationStatus::Loading);
if !session.has_initialized() {
session.load_extension_settings(None).await;
if load_status.is_none() {
session.set_configuration_status(ConfigurationStatus::Loading);
if !session.has_initialized() {
session.load_extension_settings(None).await;
}
load_status = Some(load_from_workspace_root_for_path(session, path, config_path).await);
}

let status = load_from_workspace_root_for_path(session, path).await;
let status = load_status.expect("load_status should be set");

session.set_configuration_status(status);

if status.is_loaded() {
match session.project_for_path(path) {
Some(project_key) => Some(project_key),
None => {
error!("Could not find project for {path}");
None
}
}
session.project_for_path(path).or_else(|| {
error!("Could not find project for {path}");
None
})
} else {
error!("Configuration could not be loaded for {path}");
None
Expand All @@ -134,11 +134,13 @@ async fn ensure_project_for_opened_document(
async fn load_from_workspace_root_for_path(
session: &Arc<Session>,
path: &Utf8Path,
config_path: Option<&ConfigurationPathHint>,
) -> ConfigurationStatus {
let file_path = path.to_path_buf();
if let Some(path) = session.resolve_configuration_path(Some(&file_path)) {
if let Some(path) = config_path {
info!("Loading user configuration from text_document {:?}", &path);
return session.load_biome_configuration_file(path, false).await;
return session
.load_biome_configuration_file(path.clone(), false)
.await;
}

let project_path = path
Expand Down