feat: multiple files & glob input

Author: mtshiba

Cargo.lock

@@ -53,6 +53,7 @@ traditional_chinese = ["erg_common/traditional_chinese", "els/traditional_chines
 pylyzer_core = { version = "0.0.80", path = "./crates/pylyzer_core" }
 erg_common = { workspace = true }
 els = { workspace = true }
+glob = "0.3.2"
 
 [dev-dependencies]
 erg_compiler = { workspace = true }

Cargo.toml

@@ -41,6 +41,13 @@ Make sure that `cargo`/`rustc` is up-to-date, as pylyzer may be written with the
 pylyzer file.py
 ```
 
+## Check multiple files
+
+```sh
+# glob patterns are supported
+pylyzer file1.py file2.py dir/file*.py
+```
+
 ### Check an entire package
 
 If you don't specify a file path, pylyzer will automatically search for the entry point.
@@ -177,7 +184,7 @@ pylyzer converts Python ASTs to Erg ASTs and passes them to Erg's type checker.
 * [x] type assertion (`typing.cast`)
 * [x] type narrowing (`is`, `isinstance`)
 * [x] `pyi` (stub) files support
-* [ ] glob pattern file check
+* [x] glob pattern file check
 * [x] type comment (`# type: ...`)
 * [x] virtual environment support
 * [x] package manager support

README.md

@@ -295,7 +295,7 @@ impl PythonAnalyzer {
         res
     }
 
-    pub fn run(&mut self) {
+    pub fn run(&mut self) -> i32 {
         /*if self.cfg.dist_dir.is_some() {
             reserve_decl_er(self.cfg.input.clone());
         }*/
@@ -317,7 +317,7 @@ impl PythonAnalyzer {
                     dump_decl_package(&self.checker.shared().mod_cache);
                     println!("A declaration file has been generated to __pycache__ directory.");
                 }
-                std::process::exit(0);
+                0
             }
             Err(artifact) => {
                 if !artifact.warns.is_empty() {
@@ -345,7 +345,7 @@ impl PythonAnalyzer {
                     dump_decl_package(&self.checker.shared().mod_cache);
                     println!("A declaration file has been generated to __pycache__ directory.");
                 }
-                std::process::exit(code);
+                code
             }
         }
     }

crates/pylyzer_core/analyze.rs

@@ -212,3 +212,25 @@ For more information try `pylyzer --help`"
     cfg.runtime_args = runtime_args.into();
     cfg
 }
+
+pub(crate) fn files_to_be_checked() -> Vec<PathBuf> {
+    let file_or_patterns = env::args()
+        .skip(1)
+        .rev()
+        .take_while(|arg| !arg.starts_with("-"));
+    let mut files = vec![];
+    for file_or_pattern in file_or_patterns {
+        if PathBuf::from(&file_or_pattern).is_file() {
+            files.push(PathBuf::from(&file_or_pattern));
+        } else {
+            for entry in glob::glob(&file_or_pattern).expect("Failed to read glob pattern") {
+                match entry {
+                    Err(e) => eprintln!("err: {e}"),
+                    Ok(path) if path.is_file() => files.push(path),
+                    _ => {}
+                }
+            }
+        }
+    }
+    files
+}

src/config.rs

@@ -6,6 +6,7 @@ use erg_common::config::ErgMode;
 use erg_common::spawn::exec_new_thread;
 use pylyzer_core::{PythonAnalyzer, SimplePythonParser};
 
+use crate::config::files_to_be_checked;
 use crate::copy::copy_dot_erg;
 
 fn run() {
@@ -15,8 +16,22 @@ fn run() {
         let lang_server = Server::<PythonAnalyzer, SimplePythonParser>::new(cfg, None);
         lang_server.run();
     } else {
-        let mut analyzer = PythonAnalyzer::new(cfg);
-        analyzer.run();
+        let mut code = 0;
+        let files = files_to_be_checked();
+        if files.is_empty() {
+            let mut analyzer = PythonAnalyzer::new(cfg);
+            code = analyzer.run();
+        } else {
+            for path in files {
+                let cfg = cfg.inherit(path);
+                let mut analyzer = PythonAnalyzer::new(cfg);
+                let c = analyzer.run();
+                if c != 0 {
+                    code = 1;
+                }
+            }
+        }
+        std::process::exit(code);
     }
 }