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.

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: Add some restrictions in load_all_files_under_paths #1791

Merged
merged 1 commit into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
43 changes: 41 additions & 2 deletions kclvm/parser/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,8 @@ pub struct ModuleCache {
pub dep_cache: IndexMap<PkgFile, PkgMap>,
/// File source code
pub source_code: IndexMap<PathBuf, String>,

pub last_compile_input: (Vec<String>, Option<LoadProgramOptions>),
}

impl ModuleCache {
Expand Down Expand Up @@ -1022,6 +1024,9 @@ pub fn parse_program(
})
}

/// If there are too many files in the directory, it will affect the performance of lsp. Set a maximum number of files
const MAX_SCAN_FILES: usize = 1000;

/// Parse all kcl files under path and dependencies from opts.
/// Different from `load_program`, this function will compile files that are not imported.
pub fn load_all_files_under_paths(
Expand All @@ -1047,8 +1052,34 @@ pub fn load_all_files_under_paths(
let k_files_from_import = res.paths.clone();
let mut paths = paths.to_vec();
paths.push(&res.program.root);
let module_cache = loader.module_cache.clone();
let mut module_cache_write = module_cache.write();
match &mut module_cache_write {
Ok(m_cache) => {
let paths: Vec<String> = paths.iter().map(|p| p.to_string()).collect();
let paths_is_cached = paths == m_cache.last_compile_input.0;
let opt_is_cached = match (&m_cache.last_compile_input.1, &opts) {
(None, None) => true,
(Some(old), Some(new)) => old.package_maps == new.package_maps,
_ => false,
};
if paths_is_cached && opt_is_cached {
return Ok(res);
} else {
m_cache.last_compile_input = (paths, opts.clone())
}
}
Err(e) => return Err(anyhow::anyhow!("Parse entry failed: {e}")),
}
drop(module_cache_write);

let (k_files_under_path, pkgmap) =
get_files_from_path(&res.program.root, &paths, opts)?;

if k_files_under_path.len() > MAX_SCAN_FILES {
return Ok(res);
}

loader.pkgmap.extend(pkgmap);

// Filter unparsed file
Expand All @@ -1057,12 +1088,20 @@ pub fn load_all_files_under_paths(
for p in paths {
if !k_files_from_import.contains(p) {
let pkgfile = PkgFile::new(p.clone(), pkg.clone());
unparsed_file.push_back(pkgfile);
let module_cache_read = module_cache.read();
match &module_cache_read {
Ok(m_cache) => match m_cache.ast_cache.get(pkgfile.get_path()) {
Some(_) => continue,
None => {
unparsed_file.push_back(pkgfile);
}
},
_ => {}
}
}
}
}

let module_cache = loader.module_cache.clone();
let pkgs_not_imported = &mut res.program.pkgs_not_imported;

let mut new_files = HashSet::new();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ edition = "v0.9.0"
version = "0.0.1"

[dependencies]
pkg = { path = "../pkg" }
pkg = { path = "../pkg" }
Loading