Skip to content

fix(check): init stdlib after applying emmyrc #520

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
merged 1 commit into from
Jun 2, 2025
Merged

fix(check): init stdlib after applying emmyrc #520

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 11 additions & 12 deletions crates/emmylua_check/src/init.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,7 @@ pub fn load_workspace(
config_paths: Option<Vec<PathBuf>>,
ignore: Option<Vec<String>>,
) -> Option<EmmyLuaAnalysis> {
let mut analysis = EmmyLuaAnalysis::new();
analysis.init_std_lib(None);

let mut workspace_folders = vec![workspace_folder];
for path in &workspace_folders {
analysis.add_main_workspace(path.clone());
}

let main_path = workspace_folders.first()?.clone();
let (config_files, config_root): (Vec<PathBuf>, PathBuf) =
if let Some(config_paths) = config_paths {
Expand Down Expand Up @@ -65,16 +58,22 @@ pub fn load_workspace(
);
emmyrc.pre_process_emmyrc(&config_root);

for root in &emmyrc.workspace.workspace_roots {
analysis.add_main_workspace(PathBuf::from_str(root).unwrap());
}

for lib in &emmyrc.workspace.library {
analysis.add_main_workspace(PathBuf::from_str(lib).unwrap());
workspace_folders.push(PathBuf::from_str(lib).unwrap());
}

let mut analysis = EmmyLuaAnalysis::new();

for path in &workspace_folders {
analysis.add_main_workspace(path.clone());
}

for root in &emmyrc.workspace.workspace_roots {
analysis.add_main_workspace(PathBuf::from_str(root).unwrap());
}

analysis.update_config(Arc::new(emmyrc));
analysis.init_std_lib(None);

let file_infos = collect_files(&workspace_folders, &analysis.emmyrc, ignore);
let files = file_infos
Expand Down