Fix nested tags, closes #1

Author: malobre

src/lib.rs

@@ -18,10 +18,10 @@ mod test {
     use crate::{configuration::Configuration, plugin::VuePluginHandler};
 
     #[test]
-    fn ts() {
+    fn test_format_file() {
         let mut buffer = Vec::new();
 
-        let raw = include_str!("../test/ts.vue");
+        let raw = include_str!("../test/file.vue");
         let path = PathBuf::from("ts.vue");
 
         let result = VuePluginHandler::new().format_text(
@@ -40,6 +40,10 @@ mod test {
         assert_eq!(
             buffer,
             vec![
+                (
+                    PathBuf::from("file.html"),
+                    String::from("    <template>\n        <template></template>\n        <template></template>\n    </template>\n    <template></template>\n    <template></template>\n")
+                ),
                 (
                     PathBuf::from("file.ts"),
                     String::from("import { ExclamationIcon } from '@heroicons/vue/solid';\nimport { Dialog, DialogOverlay, DialogTitle, TransitionChild, TransitionRoot } from '@headlessui/vue';\nimport { watch } from \"vue\";\n\nimport type { NewQuoteRequest, QuoteRequest, QuoteRequestId, QuoteRequestPatch } from \"@/resources/quoteRequests\";\nimport type { ApiError, AbortError, NetworkError } from \"@/error\";\nimport { usePassport } from \"@/passport\";\nimport { createQuoteRequest, retrieveQuoteRequest, updateQuoteRequest, destroyQuoteRequest } from \"@/resources/quoteRequests\";\n\n"),

src/parser.rs

@@ -1,9 +1,9 @@
 use nom::{
     branch::alt,
-    bytes::complete::{tag, take_till, take_until, take_until1, take_while, take_while1},
+    bytes::complete::{tag, take_till, take_until, take_while, take_while1},
     character::complete::{char, newline},
-    combinator::{consumed, flat_map, map, opt, peek, recognize, rest},
-    complete::take,
+    combinator::{consumed, flat_map, opt, peek, recognize, rest},
+    error::ErrorKind,
     multi::{many0, many_till},
     sequence::{delimited, pair, preceded, terminated, tuple},
     IResult, Parser,
@@ -33,7 +33,7 @@ fn is_ascii_whitespace(char: char) -> bool {
     char.is_ascii_whitespace()
 }
 
-// https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
+/// See <https://html.spec.whatwg.org/multipage/syntax.html#attributes-2>.
 fn parse_attribute_name(input: &str) -> IResult<&str, &str> {
     take_while1(|char: char| {
         !matches!(char,
@@ -99,10 +99,12 @@ fn parse_attribute(input: &str) -> IResult<&str, (&str, Option<&str>)> {
     )(input)
 }
 
+/// See <https://html.spec.whatwg.org/multipage/syntax.html#syntax-tag-name>.
 fn parse_tag_name(input: &str) -> IResult<&str, &str> {
     take_till(|char: char| char.is_ascii_whitespace() || char == '/' || char == '>')(input)
 }
 
+/// See <https://html.spec.whatwg.org/multipage/syntax.html#start-tags>.
 fn parse_start_tag(input: &str) -> IResult<&str, StartTag> {
     let (input, _) = char('<')(input)?;
 
@@ -123,13 +125,56 @@ fn parse_start_tag(input: &str) -> IResult<&str, StartTag> {
     Ok((input, StartTag { name, lang }))
 }
 
+fn take_until_next<'a>(pat: &'a str) -> impl FnMut(&'a str) -> IResult<&'a str, &'a str> {
+    preceded(opt(tag(pat)), take_until(pat))
+}
+
 fn parse_tag_content<'a>(tag_name: &'a str) -> impl FnMut(&'a str) -> IResult<&'a str, &'a str> {
-    recognize(many_till(
-        preceded(opt(char('<')), take_until("<")),
-        peek(parse_end_tag(tag_name)),
-    ))
+    move |input: &str| {
+        let mut nesting_level = 0u16;
+        let mut index = match input.find('<') {
+            Some(index) => index,
+            None => {
+                return Err(nom::Err::Error(nom::error::Error::new(
+                    input,
+                    ErrorKind::TakeUntil,
+                )))
+            }
+        };
+
+        while !input[index..].is_empty() {
+            if let Ok((_, start_tag)) = parse_start_tag(&input[index..]) {
+                if start_tag.name == tag_name {
+                    nesting_level += 1;
+                }
+            } else if let Ok((_, _)) = parse_end_tag(tag_name)(&input[index..]) {
+                if nesting_level == 0 {
+                    return Ok((&input[index..], &input[..index]));
+                }
+
+                nesting_level -= 1;
+            }
+
+            index += match input.get((index + 1)..).and_then(|input| input.find('<')) {
+                Some(index) => index + 1,
+                None => {
+                    return Err(nom::Err::Error(nom::error::Error::new(
+                        input,
+                        ErrorKind::TakeUntil,
+                    )))
+                }
+            };
+        }
+
+        Err(nom::Err::Error(nom::error::Error::new(
+            input,
+            ErrorKind::TakeUntil,
+        )))
+    }
 }
 
+/// Parse an end tag with the given `tag_name`.
+/// See <https://html.spec.whatwg.org/multipage/syntax.html#end-tags>.
 fn parse_end_tag<'a>(tag_name: &'a str) -> impl FnMut(&'a str) -> IResult<&'a str, &'a str> {
     delimited(
         tag("</"),
@@ -150,9 +195,9 @@ fn parse_block(input: &str) -> IResult<&str, Block> {
             ))
             .map(move |(content, raw_end_tag)| Block {
                 start_tag,
-                content,
                 raw_start_tag,
                 raw_end_tag,
+                content,
             })
         },
     )
@@ -163,10 +208,7 @@ fn parse_section(input: &str) -> IResult<&str, Section> {
     alt((
         parse_block.map(Section::Block),
         alt((
-            recognize(many_till(
-                preceded(opt(char('<')), take_until("<")),
-                peek(parse_block),
-            )),
+            recognize(many_till(take_until_next("<"), peek(parse_block))),
             rest,
         ))
         .map(Section::Root),
@@ -177,7 +219,8 @@ pub fn parse_file(mut input: &str) -> Result<Vec<Section>, anyhow::Error> {
     let mut buffer = Vec::new();
 
     loop {
-        let (remaining, section) = parse_section(input).map_err(|err| err.to_owned())?;
+        let (remaining, section) =
+            parse_section(input).map_err(|err| anyhow::Error::from(err.to_owned()))?;
 
         buffer.push(section);
 
@@ -271,6 +314,11 @@ mod test {
                 "let value = Math.random();\nconsole.log(value < 0.5);\n"
             ))
         );
+
+        assert_eq!(
+            parse_tag_content("template")("<template></template></template>"),
+            Ok(("</template>", "<template></template>"))
+        );
     }
 
     #[test]

src/plugin.rs

@@ -93,7 +93,7 @@ impl PluginHandler<Configuration> for VuePluginHandler {
                             &HashMap::new(),
                         )?);
                     } else {
-                        buffer.push_str(&content);
+                        buffer.push_str(content);
                     }
 
                     match buffer.chars().last() {

test/ts.vue renamed to test/file.vue

@@ -1,3 +1,12 @@
+<template>
+    <template>
+        <template></template>
+        <template></template>
+    </template>
+    <template></template>
+    <template></template>
+</template>
+
 <script lang="ts" setup>
 import { ExclamationIcon } from '@heroicons/vue/solid';
 import { Dialog, DialogOverlay, DialogTitle, TransitionChild, TransitionRoot } from '@headlessui/vue';