2019-09-05 18:23:42 +02:00
|
|
|
use crate::data::meta::Tagged;
|
|
|
|
use crate::data::Value;
|
2019-08-19 02:12:28 +02:00
|
|
|
use crate::errors::ShellError;
|
2019-08-28 19:01:16 +02:00
|
|
|
use std::fmt;
|
2019-07-24 06:10:48 +02:00
|
|
|
use std::ops::Div;
|
2019-09-03 09:43:37 +02:00
|
|
|
use std::path::{Component, Path, PathBuf};
|
2019-07-24 06:10:48 +02:00
|
|
|
|
2019-08-28 19:01:16 +02:00
|
|
|
pub struct AbsoluteFile {
|
|
|
|
inner: PathBuf,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl AbsoluteFile {
|
|
|
|
pub fn new(path: impl AsRef<Path>) -> AbsoluteFile {
|
|
|
|
let path = path.as_ref();
|
|
|
|
|
|
|
|
if !path.is_absolute() {
|
|
|
|
panic!(
|
|
|
|
"AbsoluteFile::new must take an absolute path :: {}",
|
|
|
|
path.display()
|
|
|
|
)
|
|
|
|
} else if path.is_dir() {
|
|
|
|
// At the moment, this is not an invariant, but rather a way to catch bugs
|
|
|
|
// in tests.
|
|
|
|
panic!(
|
|
|
|
"AbsoluteFile::new must not take a directory :: {}",
|
|
|
|
path.display()
|
|
|
|
)
|
|
|
|
} else {
|
|
|
|
AbsoluteFile {
|
|
|
|
inner: path.to_path_buf(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn dir(&self) -> AbsolutePath {
|
|
|
|
AbsolutePath::new(self.inner.parent().unwrap())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl From<AbsoluteFile> for PathBuf {
|
|
|
|
fn from(file: AbsoluteFile) -> Self {
|
|
|
|
file.inner
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl fmt::Display for AbsoluteFile {
|
|
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
|
|
write!(f, "{}", self.inner.display())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-07-24 06:10:48 +02:00
|
|
|
pub struct AbsolutePath {
|
|
|
|
inner: PathBuf,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl AbsolutePath {
|
|
|
|
pub fn new(path: impl AsRef<Path>) -> AbsolutePath {
|
|
|
|
let path = path.as_ref();
|
|
|
|
|
|
|
|
if path.is_absolute() {
|
|
|
|
AbsolutePath {
|
|
|
|
inner: path.to_path_buf(),
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
panic!("AbsolutePath::new must take an absolute path")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-08-28 19:01:16 +02:00
|
|
|
impl fmt::Display for AbsolutePath {
|
|
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
|
|
write!(f, "{}", self.inner.display())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-08-02 21:15:07 +02:00
|
|
|
impl Div<&str> for &AbsolutePath {
|
2019-07-24 06:10:48 +02:00
|
|
|
type Output = AbsolutePath;
|
|
|
|
|
|
|
|
fn div(self, rhs: &str) -> Self::Output {
|
2019-08-02 21:15:07 +02:00
|
|
|
let parts = rhs.split("/");
|
|
|
|
let mut result = self.inner.clone();
|
|
|
|
|
|
|
|
for part in parts {
|
|
|
|
result = result.join(part);
|
2019-07-24 06:10:48 +02:00
|
|
|
}
|
2019-08-02 21:15:07 +02:00
|
|
|
|
|
|
|
AbsolutePath::new(result)
|
2019-07-24 06:10:48 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl AsRef<Path> for AbsolutePath {
|
|
|
|
fn as_ref(&self) -> &Path {
|
|
|
|
self.inner.as_path()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub struct RelativePath {
|
|
|
|
inner: PathBuf,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl RelativePath {
|
|
|
|
pub fn new(path: impl Into<PathBuf>) -> RelativePath {
|
|
|
|
let path = path.into();
|
|
|
|
|
|
|
|
if path.is_relative() {
|
|
|
|
RelativePath { inner: path }
|
|
|
|
} else {
|
|
|
|
panic!("RelativePath::new must take a relative path")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-08-02 21:15:07 +02:00
|
|
|
impl<T: AsRef<str>> Div<T> for &RelativePath {
|
2019-07-24 06:10:48 +02:00
|
|
|
type Output = RelativePath;
|
|
|
|
|
|
|
|
fn div(self, rhs: T) -> Self::Output {
|
2019-08-02 21:15:07 +02:00
|
|
|
let parts = rhs.as_ref().split("/");
|
|
|
|
let mut result = self.inner.clone();
|
|
|
|
|
|
|
|
for part in parts {
|
|
|
|
result = result.join(part);
|
2019-07-24 06:10:48 +02:00
|
|
|
}
|
2019-08-02 21:15:07 +02:00
|
|
|
|
|
|
|
RelativePath::new(result)
|
2019-07-24 06:10:48 +02:00
|
|
|
}
|
|
|
|
}
|
2019-08-14 22:05:27 +02:00
|
|
|
|
2019-08-28 19:01:16 +02:00
|
|
|
impl fmt::Display for RelativePath {
|
|
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
|
|
write!(f, "{}", self.inner.display())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-09-03 09:43:37 +02:00
|
|
|
pub enum TaggedValueIter<'a> {
|
|
|
|
Empty,
|
|
|
|
List(indexmap::map::Iter<'a, String, Tagged<Value>>),
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> Iterator for TaggedValueIter<'a> {
|
|
|
|
type Item = (&'a String, &'a Tagged<Value>);
|
|
|
|
|
|
|
|
fn next(&mut self) -> Option<Self::Item> {
|
|
|
|
match self {
|
|
|
|
TaggedValueIter::Empty => None,
|
|
|
|
TaggedValueIter::List(iter) => iter.next(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Tagged<Value> {
|
|
|
|
fn is_dir(&self) -> bool {
|
|
|
|
match self.item() {
|
2019-09-05 18:23:42 +02:00
|
|
|
Value::Row(_) | Value::Table(_) => true,
|
2019-09-03 09:43:37 +02:00
|
|
|
_ => false,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn entries(&self) -> TaggedValueIter<'_> {
|
|
|
|
match self.item() {
|
2019-09-05 18:23:42 +02:00
|
|
|
Value::Row(o) => {
|
2019-09-03 09:43:37 +02:00
|
|
|
let iter = o.entries.iter();
|
|
|
|
TaggedValueIter::List(iter)
|
|
|
|
}
|
|
|
|
_ => TaggedValueIter::Empty,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-08-14 22:05:27 +02:00
|
|
|
#[derive(Debug, Eq, Ord, PartialEq, PartialOrd)]
|
2019-09-03 09:43:37 +02:00
|
|
|
pub struct ValueResource {
|
|
|
|
pub at: usize,
|
2019-08-14 22:05:27 +02:00
|
|
|
pub loc: PathBuf,
|
2019-09-03 09:43:37 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
impl ValueResource {}
|
|
|
|
|
|
|
|
pub struct ValueStructure {
|
|
|
|
pub resources: Vec<ValueResource>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl ValueStructure {
|
|
|
|
pub fn new() -> ValueStructure {
|
|
|
|
ValueStructure {
|
|
|
|
resources: Vec::<ValueResource>::new(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn exists(&self, path: &Path) -> bool {
|
|
|
|
if path == Path::new("/") {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
let path = if path.starts_with("/") {
|
|
|
|
match path.strip_prefix("/") {
|
|
|
|
Ok(p) => p,
|
|
|
|
Err(_) => path,
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
path
|
|
|
|
};
|
|
|
|
|
|
|
|
let comps: Vec<_> = path.components().map(Component::as_os_str).collect();
|
|
|
|
|
|
|
|
let mut is_there = true;
|
|
|
|
|
|
|
|
for (at, fragment) in comps.iter().enumerate() {
|
|
|
|
is_there = is_there
|
|
|
|
&& self
|
|
|
|
.resources
|
|
|
|
.iter()
|
|
|
|
.any(|resource| at == resource.at && *fragment == resource.loc.as_os_str());
|
|
|
|
}
|
|
|
|
|
|
|
|
is_there
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn walk_decorate(&mut self, start: &Tagged<Value>) -> Result<(), ShellError> {
|
|
|
|
self.resources = Vec::<ValueResource>::new();
|
|
|
|
self.build(start, 0)?;
|
|
|
|
self.resources.sort();
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
fn build(&mut self, src: &Tagged<Value>, lvl: usize) -> Result<(), ShellError> {
|
|
|
|
for entry in src.entries() {
|
|
|
|
let value = entry.1;
|
|
|
|
let path = entry.0;
|
|
|
|
|
|
|
|
self.resources.push(ValueResource {
|
|
|
|
at: lvl,
|
|
|
|
loc: PathBuf::from(path),
|
|
|
|
});
|
|
|
|
|
|
|
|
if value.is_dir() {
|
|
|
|
self.build(value, lvl + 1)?;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug, Eq, Ord, PartialEq, PartialOrd)]
|
|
|
|
pub struct Res {
|
2019-08-14 22:05:27 +02:00
|
|
|
pub at: usize,
|
2019-09-03 09:43:37 +02:00
|
|
|
pub loc: PathBuf,
|
2019-08-14 22:05:27 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
impl Res {}
|
|
|
|
|
|
|
|
pub struct FileStructure {
|
|
|
|
pub resources: Vec<Res>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl FileStructure {
|
|
|
|
pub fn new() -> FileStructure {
|
|
|
|
FileStructure {
|
|
|
|
resources: Vec::<Res>::new(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-08-20 13:20:48 +02:00
|
|
|
pub fn contains_more_than_one_file(&self) -> bool {
|
|
|
|
self.resources.len() > 1
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn contains_files(&self) -> bool {
|
|
|
|
self.resources.len() > 0
|
|
|
|
}
|
|
|
|
|
Add support for ~ expansion
This ended up being a bit of a yak shave. The basic idea in this commit is to
expand `~` in paths, but only in paths.
The way this is accomplished is by doing the expansion inside of the code that
parses literal syntax for `SyntaxType::Path`.
As a quick refresher: every command is entitled to expand its arguments in a
custom way. While this could in theory be used for general-purpose macros,
today the expansion facility is limited to syntactic hints.
For example, the syntax `where cpu > 0` expands under the hood to
`where { $it.cpu > 0 }`. This happens because the first argument to `where`
is defined as a `SyntaxType::Block`, and the parser coerces binary expressions
whose left-hand-side looks like a member into a block when the command is
expecting one.
This is mildly more magical than what most programming languages would do,
but we believe that it makes sense to allow commands to fine-tune the syntax
because of the domain nushell is in (command-line shells).
The syntactic expansions supported by this facility are relatively limited.
For example, we don't allow `$it` to become a bare word, simply because the
command asks for a string in the relevant position. That would quickly
become more confusing than it's worth.
This PR adds a new `SyntaxType` rule: `SyntaxType::Path`. When a command
declares a parameter as a `SyntaxType::Path`, string literals and bare
words passed as an argument to that parameter are processed using the
path expansion rules. Right now, that only means that `~` is expanded into
the home directory, but additional rules are possible in the future.
By restricting this expansion to a syntactic expansion when passed as an
argument to a command expecting a path, we avoid making `~` a generally
reserved character. This will also allow us to give good tab completion
for paths with `~` characters in them when a command is expecting a path.
In order to accomplish the above, this commit changes the parsing functions
to take a `Context` instead of just a `CommandRegistry`. From the perspective
of macro expansion, you can think of the `CommandRegistry` as a dictionary
of in-scope macros, and the `Context` as the compile-time state used in
expansion. This could gain additional functionality over time as we find
more uses for the expansion system.
2019-08-26 21:21:03 +02:00
|
|
|
pub fn paths_applying_with<F>(
|
|
|
|
&mut self,
|
|
|
|
to: F,
|
|
|
|
) -> Result<Vec<(PathBuf, PathBuf)>, Box<dyn std::error::Error>>
|
2019-08-14 22:05:27 +02:00
|
|
|
where
|
2019-08-21 17:48:04 +02:00
|
|
|
F: Fn((PathBuf, usize)) -> Result<(PathBuf, PathBuf), Box<dyn std::error::Error>>,
|
2019-08-14 22:05:27 +02:00
|
|
|
{
|
|
|
|
self.resources
|
|
|
|
.iter()
|
|
|
|
.map(|f| (PathBuf::from(&f.loc), f.at))
|
|
|
|
.map(|f| to(f))
|
|
|
|
.collect()
|
|
|
|
}
|
|
|
|
|
2019-08-19 02:12:28 +02:00
|
|
|
pub fn walk_decorate(&mut self, start_path: &Path) -> Result<(), ShellError> {
|
2019-08-14 22:05:27 +02:00
|
|
|
self.resources = Vec::<Res>::new();
|
2019-08-19 02:12:28 +02:00
|
|
|
self.build(start_path, 0)?;
|
2019-08-14 22:05:27 +02:00
|
|
|
self.resources.sort();
|
2019-08-19 02:12:28 +02:00
|
|
|
|
|
|
|
Ok(())
|
2019-08-14 22:05:27 +02:00
|
|
|
}
|
|
|
|
|
2019-08-29 14:16:11 +02:00
|
|
|
fn build(&mut self, src: &Path, lvl: usize) -> Result<(), ShellError> {
|
2019-08-19 02:12:28 +02:00
|
|
|
let source = dunce::canonicalize(src)?;
|
2019-08-14 22:05:27 +02:00
|
|
|
|
|
|
|
if source.is_dir() {
|
2019-09-03 09:43:37 +02:00
|
|
|
for entry in std::fs::read_dir(src)? {
|
2019-08-19 02:12:28 +02:00
|
|
|
let entry = entry?;
|
2019-08-14 22:05:27 +02:00
|
|
|
let path = entry.path();
|
|
|
|
|
|
|
|
if path.is_dir() {
|
2019-08-19 02:12:28 +02:00
|
|
|
self.build(&path, lvl + 1)?;
|
2019-08-14 22:05:27 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
self.resources.push(Res {
|
|
|
|
loc: path.to_path_buf(),
|
|
|
|
at: lvl,
|
|
|
|
});
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
self.resources.push(Res {
|
|
|
|
loc: source,
|
|
|
|
at: lvl,
|
|
|
|
});
|
|
|
|
}
|
2019-08-19 02:12:28 +02:00
|
|
|
|
|
|
|
Ok(())
|
2019-08-14 22:05:27 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
2019-09-03 09:43:37 +02:00
|
|
|
use super::{FileStructure, Res, ValueResource, ValueStructure};
|
2019-09-05 18:23:42 +02:00
|
|
|
use crate::data::meta::{Tag, Tagged};
|
|
|
|
use crate::data::{TaggedDictBuilder, Value};
|
Add support for ~ expansion
This ended up being a bit of a yak shave. The basic idea in this commit is to
expand `~` in paths, but only in paths.
The way this is accomplished is by doing the expansion inside of the code that
parses literal syntax for `SyntaxType::Path`.
As a quick refresher: every command is entitled to expand its arguments in a
custom way. While this could in theory be used for general-purpose macros,
today the expansion facility is limited to syntactic hints.
For example, the syntax `where cpu > 0` expands under the hood to
`where { $it.cpu > 0 }`. This happens because the first argument to `where`
is defined as a `SyntaxType::Block`, and the parser coerces binary expressions
whose left-hand-side looks like a member into a block when the command is
expecting one.
This is mildly more magical than what most programming languages would do,
but we believe that it makes sense to allow commands to fine-tune the syntax
because of the domain nushell is in (command-line shells).
The syntactic expansions supported by this facility are relatively limited.
For example, we don't allow `$it` to become a bare word, simply because the
command asks for a string in the relevant position. That would quickly
become more confusing than it's worth.
This PR adds a new `SyntaxType` rule: `SyntaxType::Path`. When a command
declares a parameter as a `SyntaxType::Path`, string literals and bare
words passed as an argument to that parameter are processed using the
path expansion rules. Right now, that only means that `~` is expanded into
the home directory, but additional rules are possible in the future.
By restricting this expansion to a syntactic expansion when passed as an
argument to a command expecting a path, we avoid making `~` a generally
reserved character. This will also allow us to give good tab completion
for paths with `~` characters in them when a command is expecting a path.
In order to accomplish the above, this commit changes the parsing functions
to take a `Context` instead of just a `CommandRegistry`. From the perspective
of macro expansion, you can think of the `CommandRegistry` as a dictionary
of in-scope macros, and the `Context` as the compile-time state used in
expansion. This could gain additional functionality over time as we find
more uses for the expansion system.
2019-08-26 21:21:03 +02:00
|
|
|
use pretty_assertions::assert_eq;
|
2019-08-14 22:05:27 +02:00
|
|
|
use std::path::PathBuf;
|
|
|
|
|
|
|
|
fn fixtures() -> PathBuf {
|
|
|
|
let mut sdx = PathBuf::new();
|
|
|
|
sdx.push("tests");
|
|
|
|
sdx.push("fixtures");
|
|
|
|
sdx.push("formats");
|
2019-08-19 02:12:28 +02:00
|
|
|
|
|
|
|
match dunce::canonicalize(sdx) {
|
|
|
|
Ok(path) => path,
|
|
|
|
Err(_) => panic!("Wrong path."),
|
|
|
|
}
|
2019-08-14 22:05:27 +02:00
|
|
|
}
|
|
|
|
|
2019-09-03 09:43:37 +02:00
|
|
|
fn structured_sample_record(key: &str, value: &str) -> Tagged<Value> {
|
|
|
|
let mut record = TaggedDictBuilder::new(Tag::unknown());
|
|
|
|
record.insert(key.clone(), Value::string(value));
|
|
|
|
record.into_tagged_value()
|
|
|
|
}
|
|
|
|
|
|
|
|
fn sample_nushell_source_code() -> Tagged<Value> {
|
|
|
|
/*
|
|
|
|
src
|
|
|
|
commands
|
|
|
|
plugins => "sys.rs"
|
|
|
|
tests
|
|
|
|
helpers => "mod.rs"
|
|
|
|
*/
|
|
|
|
|
|
|
|
let mut src = TaggedDictBuilder::new(Tag::unknown());
|
|
|
|
let mut record = TaggedDictBuilder::new(Tag::unknown());
|
|
|
|
|
|
|
|
record.insert_tagged("commands", structured_sample_record("plugins", "sys.rs"));
|
|
|
|
record.insert_tagged("tests", structured_sample_record("helpers", "mod.rs"));
|
|
|
|
src.insert_tagged("src", record.into_tagged_value());
|
|
|
|
|
|
|
|
src.into_tagged_value()
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn prepares_and_decorates_value_filesystemlike_sources() {
|
|
|
|
let mut res = ValueStructure::new();
|
|
|
|
|
|
|
|
res.walk_decorate(&sample_nushell_source_code())
|
|
|
|
.expect("Can not decorate values traversal.");
|
|
|
|
|
|
|
|
assert_eq!(
|
|
|
|
res.resources,
|
|
|
|
vec![
|
|
|
|
ValueResource {
|
|
|
|
loc: PathBuf::from("src"),
|
|
|
|
at: 0,
|
|
|
|
},
|
|
|
|
ValueResource {
|
|
|
|
loc: PathBuf::from("commands"),
|
|
|
|
at: 1,
|
|
|
|
},
|
|
|
|
ValueResource {
|
|
|
|
loc: PathBuf::from("tests"),
|
|
|
|
at: 1,
|
|
|
|
},
|
|
|
|
ValueResource {
|
|
|
|
loc: PathBuf::from("helpers"),
|
|
|
|
at: 2,
|
|
|
|
},
|
|
|
|
ValueResource {
|
|
|
|
loc: PathBuf::from("plugins"),
|
|
|
|
at: 2,
|
|
|
|
},
|
|
|
|
]
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn recognizes_if_path_exists_in_value_filesystemlike_sources() {
|
|
|
|
let mut res = ValueStructure::new();
|
|
|
|
|
|
|
|
res.walk_decorate(&sample_nushell_source_code())
|
|
|
|
.expect("Can not decorate values traversal.");
|
|
|
|
|
|
|
|
assert!(res.exists(&PathBuf::from("/")));
|
|
|
|
|
|
|
|
assert!(res.exists(&PathBuf::from("src/commands/plugins")));
|
|
|
|
assert!(res.exists(&PathBuf::from("src/commands")));
|
|
|
|
assert!(res.exists(&PathBuf::from("src/tests")));
|
|
|
|
assert!(res.exists(&PathBuf::from("src/tests/helpers")));
|
|
|
|
assert!(res.exists(&PathBuf::from("src")));
|
|
|
|
|
|
|
|
assert!(res.exists(&PathBuf::from("/src/commands/plugins")));
|
|
|
|
assert!(res.exists(&PathBuf::from("/src/commands")));
|
|
|
|
assert!(res.exists(&PathBuf::from("/src/tests")));
|
|
|
|
assert!(res.exists(&PathBuf::from("/src/tests/helpers")));
|
|
|
|
assert!(res.exists(&PathBuf::from("/src")));
|
|
|
|
|
|
|
|
assert!(!res.exists(&PathBuf::from("/not_valid")));
|
|
|
|
assert!(!res.exists(&PathBuf::from("/src/not_valid")));
|
|
|
|
}
|
|
|
|
|
2019-08-14 22:05:27 +02:00
|
|
|
#[test]
|
2019-09-03 09:43:37 +02:00
|
|
|
fn prepares_and_decorates_filesystem_source_files() {
|
2019-08-14 22:05:27 +02:00
|
|
|
let mut res = FileStructure::new();
|
2019-08-19 02:12:28 +02:00
|
|
|
|
2019-09-03 09:43:37 +02:00
|
|
|
res.walk_decorate(&fixtures())
|
Add support for ~ expansion
This ended up being a bit of a yak shave. The basic idea in this commit is to
expand `~` in paths, but only in paths.
The way this is accomplished is by doing the expansion inside of the code that
parses literal syntax for `SyntaxType::Path`.
As a quick refresher: every command is entitled to expand its arguments in a
custom way. While this could in theory be used for general-purpose macros,
today the expansion facility is limited to syntactic hints.
For example, the syntax `where cpu > 0` expands under the hood to
`where { $it.cpu > 0 }`. This happens because the first argument to `where`
is defined as a `SyntaxType::Block`, and the parser coerces binary expressions
whose left-hand-side looks like a member into a block when the command is
expecting one.
This is mildly more magical than what most programming languages would do,
but we believe that it makes sense to allow commands to fine-tune the syntax
because of the domain nushell is in (command-line shells).
The syntactic expansions supported by this facility are relatively limited.
For example, we don't allow `$it` to become a bare word, simply because the
command asks for a string in the relevant position. That would quickly
become more confusing than it's worth.
This PR adds a new `SyntaxType` rule: `SyntaxType::Path`. When a command
declares a parameter as a `SyntaxType::Path`, string literals and bare
words passed as an argument to that parameter are processed using the
path expansion rules. Right now, that only means that `~` is expanded into
the home directory, but additional rules are possible in the future.
By restricting this expansion to a syntactic expansion when passed as an
argument to a command expecting a path, we avoid making `~` a generally
reserved character. This will also allow us to give good tab completion
for paths with `~` characters in them when a command is expecting a path.
In order to accomplish the above, this commit changes the parsing functions
to take a `Context` instead of just a `CommandRegistry`. From the perspective
of macro expansion, you can think of the `CommandRegistry` as a dictionary
of in-scope macros, and the `Context` as the compile-time state used in
expansion. This could gain additional functionality over time as we find
more uses for the expansion system.
2019-08-26 21:21:03 +02:00
|
|
|
.expect("Can not decorate files traversal.");
|
2019-08-14 22:05:27 +02:00
|
|
|
|
|
|
|
assert_eq!(
|
|
|
|
res.resources,
|
|
|
|
vec![
|
|
|
|
Res {
|
|
|
|
loc: fixtures().join("appveyor.yml"),
|
|
|
|
at: 0
|
|
|
|
},
|
|
|
|
Res {
|
|
|
|
loc: fixtures().join("caco3_plastics.csv"),
|
|
|
|
at: 0
|
|
|
|
},
|
2019-08-29 11:02:16 +02:00
|
|
|
Res {
|
|
|
|
loc: fixtures().join("caco3_plastics.tsv"),
|
|
|
|
at: 0
|
|
|
|
},
|
2019-08-14 22:05:27 +02:00
|
|
|
Res {
|
|
|
|
loc: fixtures().join("cargo_sample.toml"),
|
|
|
|
at: 0
|
|
|
|
},
|
|
|
|
Res {
|
|
|
|
loc: fixtures().join("jonathan.xml"),
|
|
|
|
at: 0
|
|
|
|
},
|
2019-08-25 15:40:46 +02:00
|
|
|
Res {
|
|
|
|
loc: fixtures().join("sample.bson"),
|
|
|
|
at: 0
|
|
|
|
},
|
2019-08-27 23:45:18 +02:00
|
|
|
Res {
|
|
|
|
loc: fixtures().join("sample.db"),
|
|
|
|
at: 0
|
|
|
|
},
|
2019-08-14 22:05:27 +02:00
|
|
|
Res {
|
|
|
|
loc: fixtures().join("sample.ini"),
|
|
|
|
at: 0
|
|
|
|
},
|
|
|
|
Res {
|
|
|
|
loc: fixtures().join("sgml_description.json"),
|
|
|
|
at: 0
|
|
|
|
},
|
|
|
|
Res {
|
|
|
|
loc: fixtures().join("utf16.ini"),
|
|
|
|
at: 0
|
|
|
|
}
|
|
|
|
]
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|