git.iko.soy/helix
on master help sign in
always parse the entire snippet
bbf4800Pascal Kuthe
helix-lsp/src/snippet.rs+29−2
compare with master
unifiedsplit
@@ -384,9 +384,14 @@ mod parser {
384 }
384 }
385
385
386 pub fn parse(s: &str) -> Result<Snippet, &str> {
386 pub fn parse(s: &str) -> Result<Snippet, &str> {
387− snippet().parse(s).map(|(_input, elements)| elements)
387+ snippet().parse(s).and_then(|(remainder, snippet)| {
388+ if remainder.is_empty() {
389+ Ok(snippet)
390+ } else {
391+ Err(remainder)
392+ }
393+ })
388 }
394 }
389−
390 #[cfg(test)]
395 #[cfg(test)]
391 mod test {
396 mod test {
392 use super::SnippetElement::*;
397 use super::SnippetElement::*;
@@ -414,6 +419,28 @@ mod parser {
414 )
419 )
415 }
420 }
416
421
422+ #[test]
423+ fn parse_unterminated_placeholder_error() {
424+ assert_eq!(Err("${1:)"), parse("match(${1:)"))
425+ }
426+
427+ #[test]
428+ fn parse_empty_placeholder() {
429+ assert_eq!(
430+ Ok(Snippet {
431+ elements: vec![
432+ Text("match(".into()),
433+ Placeholder {
434+ tabstop: 1,
435+ value: vec![],
436+ },
437+ Text(")".into())
438+ ]
439+ }),
440+ parse("match(${1:})")
441+ )
442+ }
443+
417 #[test]
444 #[test]
418 fn parse_placeholders_in_statement() {
445 fn parse_placeholders_in_statement() {
419 assert_eq!(
446 assert_eq!(