Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support shell expansion in src field (#1324)

This commit is contained in:
Charlie Marsh 2022-12-21 20:57:20 -05:00 committed by GitHub
parent bf5fec342c
commit dad8035eef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/settings/configuration.rs
View File

@ -2,12 +2,15 @@
//! command-line options. Structure mirrors the user-facing representation of //! command-line options. Structure mirrors the user-facing representation of
//! the various parameters. //! the various parameters.
use std::borrow::Cow;
use std::env::VarError;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
use glob::{glob, GlobError, Paths, PatternError}; use glob::{glob, GlobError, Paths, PatternError};
use regex::Regex; use regex::Regex;
use shellexpand; use shellexpand;
use shellexpand::LookupError;
use crate::checks_gen::CheckCodePrefix; use crate::checks_gen::CheckCodePrefix;
use crate::cli::{collect_per_file_ignores, Overrides}; use crate::cli::{collect_per_file_ignores, Overrides};
@ -274,9 +277,13 @@ impl Configuration {
/// Given a list of source paths, which could include glob patterns, resolve the /// Given a list of source paths, which could include glob patterns, resolve the
/// matching paths. /// matching paths.
pub fn resolve_src(src: &[String], project_root: &Path) -> Result<Vec<PathBuf>> { pub fn resolve_src(src: &[String], project_root: &Path) -> Result<Vec<PathBuf>> {
let globs = src let expansions = src
.iter() .iter()
.map(Path::new) .map(shellexpand::full)
.collect::<Result<Vec<Cow<'_, str>>, LookupError<VarError>>>()?;
let globs = expansions
.iter()
.map(|path| Path::new(path.as_ref()))
.map(|path| fs::normalize_path_to(path, project_root)) .map(|path| fs::normalize_path_to(path, project_root))
.map(|path| glob(&path.to_string_lossy())) .map(|path| glob(&path.to_string_lossy()))
.collect::<Result<Vec<Paths>, PatternError>>()?; .collect::<Result<Vec<Paths>, PatternError>>()?;