Fix lstrip space control behavour

Author: flexferrum

src/template_parser.h

@@ -428,20 +428,26 @@ class TemplateParser : public LexerHelper
     size_t StripBlockLeft(TextBlockInfo& currentBlockInfo, size_t ctrlCharPos, size_t endOffset)
     {
         bool doStrip = m_settings.lstripBlocks;
+        bool doTotalStrip = false;
         if (ctrlCharPos < m_template->size())
         {
             auto ctrlChar = (*m_template)[ctrlCharPos];
-            doStrip = ctrlChar == '+' ? false : (ctrlChar == '-' ? true : doStrip);
+            if (ctrlChar == '+')
+                doStrip = false;
+            else
+                doTotalStrip = ctrlChar == '-';
+
+            doStrip |= doTotalStrip;
         }
         if (!doStrip || currentBlockInfo.type != TextBlockType::RawText)
             return endOffset;
 
         auto locale = std::locale();
         auto& tpl = *m_template;
-        for (; endOffset > 0; -- endOffset)
+        for (; endOffset != currentBlockInfo.range.startOffset && endOffset > 0; -- endOffset)
         {
             auto ch = tpl[endOffset - 1];
-            if (!std::isspace(ch, locale) || ch == '\n')
+            if (!std::isspace(ch, locale) || (!doTotalStrip && ch == '\n'))
                 break;
         }
         return endOffset;

test/basic_tests.cpp

@@ -127,8 +127,7 @@ from Parser!)";
 
     std::string result = tpl.RenderAsString(ValuesMap{});
     std::cout << result << std::endl;
-    std::string expectedResult = R"(Hello World
- --
+    std::string expectedResult = R"(Hello World --
 from Parser!)";
     EXPECT_STREQ(expectedResult.c_str(), result.c_str());
 }
@@ -161,15 +160,14 @@ from Parser!)";
 
     std::string result = tpl.RenderAsString(ValuesMap{});
     std::cout << result << std::endl;
-    std::string expectedResult = R"(Hello World
- --<
+    std::string expectedResult = R"(Hello World --<
 from Parser!)";
     EXPECT_STREQ(expectedResult.c_str(), result.c_str());
 }
 
 TEST(BasicTests, StripLSpaces_4)
 {
-    std::string source = R"(Hello World
+    std::string source = "Hello World\t\t   \t" R"(
       {%- set delim = ' --' %} {{+delim}}<
 from Parser!)";
 
@@ -178,25 +176,22 @@ from Parser!)";
 
     std::string result = tpl.RenderAsString(ValuesMap{});
     std::cout << result << std::endl;
-    std::string expectedResult = R"(Hello World
-  --<
+    std::string expectedResult = R"(Hello World  --<
 from Parser!)";
     EXPECT_STREQ(expectedResult.c_str(), result.c_str());
 }
 
 TEST(BasicTests, StripLSpaces_5)
 {
-    std::string source = R"(Hello World
-      {%- set delim = ' --' %} {{-delim}}<
+    std::string source = R"(Hello World{%- set delim = ' --' %} {{-delim}}<
 from Parser!)";
 
     Template tpl;
     ASSERT_TRUE(tpl.Load(source));
 
     std::string result = tpl.RenderAsString(ValuesMap{});
     std::cout << result << std::endl;
-    std::string expectedResult = R"(Hello World
- --<
+    std::string expectedResult = R"(Hello World --<
 from Parser!)";
     EXPECT_STREQ(expectedResult.c_str(), result.c_str());
 }
@@ -229,8 +224,7 @@ from Parser!)";
 
     std::string result = tpl.RenderAsString(ValuesMap{});
     std::cout << result << std::endl;
-    std::string expectedResult = R"(Hello World
- --
+    std::string expectedResult = R"(Hello World --
 from Parser!)";
     EXPECT_STREQ(expectedResult.c_str(), result.c_str());
 }
@@ -246,8 +240,7 @@ from Parser!)";
 
     std::string result = tpl.RenderAsString(ValuesMap{});
     std::cout << result << std::endl;
-    std::string expectedResult = R"(Hello World
- --
+    std::string expectedResult = R"(Hello World --
 from Parser!)";
     EXPECT_STREQ(expectedResult.c_str(), result.c_str());
 }

test/extends_test.cpp

@@ -226,3 +226,25 @@ Some Stuff
 -><-->SCOPEDMACROTEXT<-)";
     EXPECT_STREQ(expectedResult.c_str(), result.c_str());
 }
+
+TEST_F(ExtendsTest, MacroUsageWithTrimming)
+{
+    m_templateFs->AddFile("base.j2tpl", R"({% macro testMacro(str) -%}
+#{{ str | upper }}#
+{%- endmacro %}
+{%- block body scoped%}{% endblock body%})");
+    m_templateFs->AddFile("derived.j2tpl",
+R"({% extends "base.j2tpl" %}{% block body %}->{{ testMacro('RegularMacroText') }}<-{% endblock %})");
+
+    auto baseTpl = m_env.LoadTemplate("base.j2tpl").value();
+    auto tpl = m_env.LoadTemplate("derived.j2tpl").value();
+
+    std::string baseResult = baseTpl.RenderAsString(jinja2::ValuesMap{});
+    std::cout << baseResult << std::endl;
+    std::string expectedResult = "";
+    EXPECT_STREQ(expectedResult.c_str(), baseResult.c_str());
+    std::string result = tpl.RenderAsString(jinja2::ValuesMap{});
+    std::cout << result << std::endl;
+    expectedResult = R"(->#REGULARMACROTEXT#<-)";
+    EXPECT_STREQ(expectedResult.c_str(), result.c_str());
+}