foster/deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-03-09 13:49:37 -04:00
Code Issues Packages 1 Wiki Activity

improvements

Browse source
This commit is contained in:
Ryan Dahl 2022-01-08 12:52:32 -05:00
parent 3bbfb8eeb4
commit c020e694c7
1 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
cli/config_file.rs
View file

@ -184,9 +184,9 @@ fn discover_inner(
) -> Result<Option<ConfigFile>, AnyError> {
for ancestor in start.ancestors() {
println!("ancestor {:?}", ancestor.display());
for config_filename in CONFIG_FILE_NAMES {
let f = ancestor.join(config_filename);
if checked.insert(f.clone()) {
if checked.insert(ancestor.to_path_buf()) {
for config_filename in CONFIG_FILE_NAMES {
let f = ancestor.join(config_filename);
println!("f {:?}", f.display());
match ConfigFile::read(f) {
Ok(cf) => {
@ -885,4 +885,29 @@ mod tests {
}));
assert_eq!(tsconfig1.as_bytes(), tsconfig2.as_bytes());
}
#[test]
fn test_discover_inner() {
// testdata/fmt/deno.jsonc exists
let testdata = test_util::testdata_path();
let c_md = testdata.join("fmt/fmt_with_config/c.md");
let mut checked = HashSet::new();
let config_file = discover_inner(&c_md, &mut checked).unwrap().unwrap();
assert!(checked.contains(c_md.parent().unwrap()));
assert!(!checked.contains(&testdata));
let fmt_config = config_file.to_fmt_config().unwrap().unwrap();
let expected_exclude = ModuleSpecifier::from_file_path(
testdata.join("fmt/fmt_with_config/b.ts"),
)
.unwrap();
assert_eq!(fmt_config.files.exclude, vec![expected_exclude]);
// Now add all ancestors of testdata to checked.
for a in testdata.ancestors() {
checked.insert(a.to_path_buf());
}
// If we call discover_inner again starting at testdata, we ought to get None.
assert!(discover_inner(&testdata, &mut checked).unwrap().is_none());
}
}