holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make lexing configurable wrt newlines (#3682)

Browse Source
This commit is contained in:
JT
2021-06-25 17:50:24 +12:00
committed by GitHub
parent cac2875c96
commit 93b5f3f421
14 changed files with 111 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crates/nu-completion/src/completer.rs
View File

@ -1,5 +1,6 @@
use std::borrow::Cow;
use nu_parser::NewlineMode;
use nu_source::{Span, Tag};
use crate::command::CommandCompleter;
@ -24,7 +25,7 @@ impl NuCompleter {
) -> (usize, Vec<Suggestion>) {
use engine::LocationType;
let tokens = nu_parser::lex(line, 0).0;
let tokens = nu_parser::lex(line, 0, NewlineMode::Normal).0;
let locations = Some(nu_parser::parse_block(tokens).0)
.map(|block| nu_parser::classify_block(&block, context.scope()))

2
crates/nu-completion/src/engine.rs
View File

@ -336,7 +336,7 @@ mod tests {
scope: &dyn ParserScope,
pos: usize,
) -> Vec<LocationType> {
let (tokens, _) = lex(line, 0);
let (tokens, _) = lex(line, 0, nu_parser::NewlineMode::Normal);
let (lite_block, _) = parse_block(tokens);
scope.enter_scope();