extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-15 01:02:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve the simplified parse form. (#1875)

Browse Source
This commit is contained in:
Jason Gedge
2020-05-25 14:19:49 -04:00
committed by GitHub
parent 07996ea93d
commit cb6ccc3c5a
2 changed files with 71 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
crates/nu_plugin_parse/src/nu/mod.rs
View File

@ -6,7 +6,7 @@ use nu_protocol::{
};
use crate::{ColumnNames, Parse};
use regex::Regex;
use regex::{self, Regex};
impl Plugin for Parse {
fn config(&mut self) -> Result<Signature, ShellError> {
@ -125,13 +125,18 @@ fn parse(input: &str) -> Vec<ParseCommand> {
let mut output = vec![];
//let mut loop_input = input;
let mut loop_input = input.chars();
let mut loop_input = input.chars().peekable();
loop {
let mut before = String::new();
while let Some(c) = loop_input.next() {
if c == '{' {
break;
// If '{{', still creating a plaintext parse command, but just for a single '{' char
if loop_input.peek() == Some(&'{') {
let _ = loop_input.next();
} else {
break;
}
}
before.push(c);
}
@ -188,19 +193,21 @@ impl From<&Regex> for ColumnNames {
}
fn build_regex(commands: &[ParseCommand]) -> String {
let mut output = String::new();
let mut output = "(?s)\\A".to_string();
for command in commands {
match command {
ParseCommand::Text(s) => {
output.push_str(&s.replace("(", "\\("));
output.push_str(&regex::escape(&s));
}
ParseCommand::Column(_) => {
output.push_str("(.*)");
output.push_str("(.*?)");
}
}
}
output.push_str("\\z");
output
}