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(lsp): inherit workspace-root-only fields in members #24440

Merged
merged 6 commits into from
Jul 8, 2024
Merged

fix(lsp): inherit workspace-root-only fields in members #24440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9ee2935
fix(lsp): inherit workspace-root-only fields in members
nayeemrmn Jul 5, 2024
525a11e
canon dir in test fixture
nayeemrmn Jul 5, 2024
4debaf7
Merge remote-tracking branch 'upstream/main' into lsp-workspace-inher…
nayeemrmn Jul 5, 2024
606f930
add comment
nayeemrmn Jul 5, 2024
475c40d
Merge remote-tracking branch 'upstream/main' into lsp-workspace-inher…
nayeemrmn Jul 6, 2024
2c7d99b
Merge branch 'main' into lsp-workspace-inherit-fields
nayeemrmn Jul 8, 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
63 changes: 41 additions & 22 deletions cli/lsp/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1299,16 +1299,27 @@ impl ConfigData {
}
};

let vendor_dir = config_file.as_ref().and_then(|c| {
if c.vendor() == Some(true) {
Some(c.specifier.to_file_path().ok()?.parent()?.join("vendor"))
} else {
None
}
});
let vendor_dir = if let Some(workspace_root) = workspace_root {
workspace_root.vendor_dir.clone()
} else {
config_file.as_ref().and_then(|c| {
if c.vendor() == Some(true) {
Some(c.specifier.to_file_path().ok()?.parent()?.join("vendor"))
} else {
None
}
})
};

// Load lockfile
let lockfile = config_file.as_ref().and_then(resolve_lockfile_from_config);
let lockfile = if let Some(workspace_root) = workspace_root {
workspace_root.lockfile.clone()
} else {
config_file
.as_ref()
.and_then(resolve_lockfile_from_config)
.map(Arc::new)
};
if let Some(lockfile) = &lockfile {
if let Ok(specifier) = ModuleSpecifier::from_file_path(&lockfile.filename)
{
Expand Down Expand Up @@ -1376,23 +1387,31 @@ impl ConfigData {
})
.map(|(r, _)| r)
.ok();
let byonm = std::env::var("DENO_UNSTABLE_BYONM").is_ok()
|| config_file
.as_ref()
.map(|c| c.has_unstable("byonm"))
.unwrap_or(false)
|| (*DENO_FUTURE
&& package_json.is_some()
&& config_file
let byonm = if let Some(workspace_root) = workspace_root {
workspace_root.byonm
} else {
std::env::var("DENO_UNSTABLE_BYONM").is_ok()
|| config_file
.as_ref()
.map(|c| c.json.node_modules_dir.is_none())
.unwrap_or(true));
.map(|c| c.has_unstable("byonm"))
.unwrap_or(false)
|| (*DENO_FUTURE
&& package_json.is_some()
&& config_file
.as_ref()
.map(|c| c.json.node_modules_dir.is_none())
.unwrap_or(true))
};
if byonm {
lsp_log!(" Enabled 'bring your own node_modules'.");
}
let node_modules_dir = config_file
.as_ref()
.and_then(|c| resolve_node_modules_dir(c, byonm));
let node_modules_dir = if let Some(workspace_root) = workspace_root {
workspace_root.node_modules_dir.clone()
} else {
config_file
.as_ref()
.and_then(|c| resolve_node_modules_dir(c, byonm))
};

// Load import map
let mut import_map = None;
Expand Down Expand Up @@ -1547,7 +1566,7 @@ impl ConfigData {
byonm,
node_modules_dir,
vendor_dir,
lockfile: lockfile.map(Arc::new),
lockfile,
package_json: package_json.map(Arc::new),
npmrc,
import_map,
Expand Down
Loading