Fix quoted snippets validation

Author: niosus

lectures/move_semantics.md

@@ -94,6 +94,9 @@ It allocates this memory using some magic function `std::byte* AllocateMemory(st
 > At this point it is not important how exactly the memory allocation happens. We will talk about it in the future. We just have to remember that allocating, copying and freeing memory are all time-wise costly operations.
 > <!-- For the impatient, you can see example of such functions in the script, which is as always linked in the description below  -->
 > But for the impatient, here is one way to allocate the memory that we need in real code.
+> <!--
+> `CPP_SKIP_SNIPPET`
+> -->
 > ```cpp
 > // 😱 Please don't do this in real code, for illustration purposes only!
 > // 💡 We will talk about how to properly allocate and free memory later!

lectures/object_lifecycle.md

@@ -96,7 +96,9 @@ public:
 
 <!-- Talking head -->
 > :bulb: Note that when such default constructor is called it will leave the data uninitialized unless these data are initialized in-place:
-> <!-- B-roll add private part code  -->
+> <!--
+> `CPP_SKIP_SNIPPET`
+> -->
 > ```cpp
 > class Foo {
 > public:

scripts/validate_code_snippets.py

@@ -25,13 +25,13 @@
 
 # See a playground here: https://regex101.com/r/Tfwjsq/1
 REGEX_TEMPLATE = r"""
-(?:\s*<!--
-(:?\s*`CPP_SETUP_START`\n(?P<setup>[\s\S]*?)\s*`CPP_SETUP_END`\s*)*\s*
-(?P<skip>`CPP_SKIP_SNIPPET`)*\s*
-(?:`CPP_COPY_SNIPPET`\s*(?P<copy>.*$))*\s*
-(?:`CPP_RUN_CMD`\s*(?:CWD:(?P<cwd>[\w/]+))*\s*(?P<cmd>.*$))*\s*
--->\s*)*
-[> ]*```(?P<language>\w+)
+(?:\s*[> ]*<!--
+(:?\s*[> ]*`CPP_SETUP_START`\n(?P<setup>[\s\S]*?)\s*[> ]*`CPP_SETUP_END`\s*)*\s*
+(?P<skip>[> ]*`CPP_SKIP_SNIPPET`)*\s*
+(?:[> ]*`CPP_COPY_SNIPPET`\s*(?P<copy>.*$))*\s*
+(?:[> ]*`CPP_RUN_CMD`\s*(?:CWD:(?P<cwd>[\w/]+))*\s*(?P<cmd>.*$))*\s*
+[> ]*-->\s*)*
+(?P<quote>[> ]*)```(?P<language>\w+)
 (?P<code>[\s\S]*?)\n[> ]*```\s*
 """
 
@@ -163,6 +163,18 @@ def get_code_start_line(text, span):
           break
       return line_count
 
+    def clean_quoted_code(code, quote):
+        if not code or not quote or ">" not in quote:
+            return code
+        if quote.endswith(" "):
+            regex = "^" + re.escape(quote[:-1]) + r" ?"
+        else:
+            regex = "^" + re.escape(quote)
+        lines = []
+        for line in code.split('\n'):
+            lines.append(re.sub(regex, "", line))
+        return '\n'.join(lines)
+
     error_count = 0
     temp_folder = Path(tempfile.gettempdir())
     file_text = file.read_text()
@@ -171,9 +183,10 @@ def get_code_start_line(text, span):
         span_start_line = get_start_line_of_span(file_text, span)
         code_start_line = span_start_line + get_code_start_line(file_text, span)
         found_group_dict = match.groupdict()
+        quote = found_group_dict.get("quote", "")
         skip = found_group_dict["skip"]
-        setup = found_group_dict["setup"]
-        code = found_group_dict["code"]
+        setup = clean_quoted_code(found_group_dict["setup"], quote)
+        code = clean_quoted_code(found_group_dict["code"], quote)
         copy_destination = found_group_dict["copy"]
         cmd = found_group_dict["cmd"]
         cwd = found_group_dict["cwd"]