@@ -30,14 +30,7 @@ pub fn load_workspace(
30
30
config_paths : Option < Vec < PathBuf > > ,
31
31
ignore : Option < Vec < String > > ,
32
32
) -> Option < EmmyLuaAnalysis > {
33
- let mut analysis = EmmyLuaAnalysis :: new ( ) ;
34
- analysis. init_std_lib ( None ) ;
35
-
36
33
let mut workspace_folders = vec ! [ workspace_folder] ;
37
- for path in & workspace_folders {
38
- analysis. add_main_workspace ( path. clone ( ) ) ;
39
- }
40
-
41
34
let main_path = workspace_folders. first ( ) ?. clone ( ) ;
42
35
let ( config_files, config_root) : ( Vec < PathBuf > , PathBuf ) =
43
36
if let Some ( config_paths) = config_paths {
@@ -65,16 +58,22 @@ pub fn load_workspace(
65
58
) ;
66
59
emmyrc. pre_process_emmyrc ( & config_root) ;
67
60
68
- for root in & emmyrc. workspace . workspace_roots {
69
- analysis. add_main_workspace ( PathBuf :: from_str ( root) . unwrap ( ) ) ;
70
- }
71
-
72
61
for lib in & emmyrc. workspace . library {
73
- analysis. add_main_workspace ( PathBuf :: from_str ( lib) . unwrap ( ) ) ;
74
62
workspace_folders. push ( PathBuf :: from_str ( lib) . unwrap ( ) ) ;
75
63
}
76
64
65
+ let mut analysis = EmmyLuaAnalysis :: new ( ) ;
66
+
67
+ for path in & workspace_folders {
68
+ analysis. add_main_workspace ( path. clone ( ) ) ;
69
+ }
70
+
71
+ for root in & emmyrc. workspace . workspace_roots {
72
+ analysis. add_main_workspace ( PathBuf :: from_str ( root) . unwrap ( ) ) ;
73
+ }
74
+
77
75
analysis. update_config ( Arc :: new ( emmyrc) ) ;
76
+ analysis. init_std_lib ( None ) ;
78
77
79
78
let file_infos = collect_files ( & workspace_folders, & analysis. emmyrc , ignore) ;
80
79
let files = file_infos
0 commit comments