d646903161
# Description This pr is a follow up to [#11569](https://github.com/nushell/nushell/pull/11569#issuecomment-1902279587) > Revert the logic in https://github.com/nushell/nushell/pull/10694 and apply the logic in this pr to mv, cp, rv will require a larger change, I need to think how to achieve the bahavior And sorry @bobhy for reverting some of your changes. This pr is going to unify glob behavior on the given commands: * open * rm * cp-old * mv * umv * cp * du So they have the same behavior to `ls`, which is: If given parameter is quoted by single quote(`'`) or double quote(`"`), don't auto-expand the glob pattern. If not quoted, auto-expand the glob pattern. Fixes: #9558 Fixes: #10211 Fixes: #9310 Fixes: #10364 # TODO But there is one thing remains: if we give a variable to the command, it will always auto-expand the glob pattern, e.g: ```nushell let path = "a[123]b" rm $path ``` I don't think it's expected. But I also think user might want to auto-expand the glob pattern in variables. So I'll introduce a new command called `glob escape`, then if user doesn't want to auto-expand the glob pattern, he can just do this: `rm ($path | glob escape)` # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> # Tests + Formatting Done # After Submitting <!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. --> ## NOTE This pr changes the semantic of `GlobPattern`, before this pr, it will `expand path` after evaluated, this makes `nu_engine::glob_from` have no chance to glob things right if a path contains glob pattern. e.g: [#9310 ](https://github.com/nushell/nushell/issues/9310#issuecomment-1886824030) #10211 I think changing the semantic is fine, because it makes glob works if path contains something like '*'. It maybe a breaking change if a custom command's argument are annotated by `: glob`.
62 lines
1.9 KiB
Rust
62 lines
1.9 KiB
Rust
use chrono::FixedOffset;
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
use super::{
|
|
Call, CellPath, Expression, ExternalArgument, FullCellPath, MatchPattern, Operator,
|
|
RangeOperator,
|
|
};
|
|
use crate::{ast::ImportPattern, BlockId, Signature, Span, Spanned, Unit, VarId};
|
|
|
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
|
pub enum Expr {
|
|
Bool(bool),
|
|
Int(i64),
|
|
Float(f64),
|
|
Binary(Vec<u8>),
|
|
Range(
|
|
Option<Box<Expression>>, // from
|
|
Option<Box<Expression>>, // next value after "from"
|
|
Option<Box<Expression>>, // to
|
|
RangeOperator,
|
|
),
|
|
Var(VarId),
|
|
VarDecl(VarId),
|
|
Call(Box<Call>),
|
|
ExternalCall(Box<Expression>, Vec<ExternalArgument>, bool), // head, args, is_subexpression
|
|
Operator(Operator),
|
|
RowCondition(BlockId),
|
|
UnaryNot(Box<Expression>),
|
|
BinaryOp(Box<Expression>, Box<Expression>, Box<Expression>), //lhs, op, rhs
|
|
Subexpression(BlockId),
|
|
Block(BlockId),
|
|
Closure(BlockId),
|
|
MatchBlock(Vec<(MatchPattern, Expression)>),
|
|
List(Vec<Expression>),
|
|
Table(Vec<Expression>, Vec<Vec<Expression>>),
|
|
Record(Vec<RecordItem>),
|
|
Keyword(Vec<u8>, Span, Box<Expression>),
|
|
ValueWithUnit(Box<Expression>, Spanned<Unit>),
|
|
DateTime(chrono::DateTime<FixedOffset>),
|
|
Filepath(String, bool),
|
|
Directory(String, bool),
|
|
GlobPattern(String, bool),
|
|
String(String),
|
|
CellPath(CellPath),
|
|
FullCellPath(Box<FullCellPath>),
|
|
ImportPattern(ImportPattern),
|
|
Overlay(Option<BlockId>), // block ID of the overlay's origin module
|
|
Signature(Box<Signature>),
|
|
StringInterpolation(Vec<Expression>),
|
|
Spread(Box<Expression>),
|
|
Nothing,
|
|
Garbage,
|
|
}
|
|
|
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
|
pub enum RecordItem {
|
|
/// A key: val mapping
|
|
Pair(Expression, Expression),
|
|
/// Span for the "..." and the expression that's being spread
|
|
Spread(Span, Expression),
|
|
}
|