Bug: lineBreak inside Interpolated-Placeholder was deleting the whole line (before placeholder) due to a bug in TrimCurrentLineEnd; CodegenCS.Core bumped to 3.3.1

Author: Drizin

src/Core/CodegenCS/CodegenCS.Core.csproj

@@ -8,7 +8,7 @@
     <Description>Class Library and Toolkit for Code Generation using plain C#</Description>
     <Copyright>Rick Drizin</Copyright>
     <Company>Rick Drizin</Company>
-    <Version>3.3.0</Version>
+    <Version>3.3.1</Version>
     <DocumentationFile>CodegenCS.xml</DocumentationFile>
     <PackageTags>code generation;code generator;templating;codegencs</PackageTags>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>

src/Core/CodegenCS/CodegenTextWriter.ScopeContext.cs

@@ -53,9 +53,9 @@ protected internal static ScopeContext CreateRootContext(CodegenTextWriter write
             protected internal string IndentString { get; protected set; }
 
             /// <summary>
-            /// Indent was written to current line
+            /// Indent State regarding the current line (if <see cref="IndentString"/> was already written to current line)
             /// </summary>
-            protected internal bool IndentWritten { get; set; } = false;
+            protected internal IndentStateEnum IndentState { get; set; } = IndentStateEnum.None;
 
             protected internal int StartingPos { get; protected set; }
 
@@ -67,11 +67,6 @@ protected internal static ScopeContext CreateRootContext(CodegenTextWriter write
             /// </summary>
             protected internal string ImplicitIndentBeforeFirstPlaceHolder { get; set; } = null;
 
-            /// <summary>
-            /// When we're in the middle of a line and start an inline block (which could be multiline string), the first line don't need to be indented - only the next ones
-            /// </summary>
-            internal bool DontIndentFirstLine = false;
-
             protected internal int IndentLevel { get; set; }
 
             #endregion
@@ -84,17 +79,36 @@ protected internal static ScopeContext CreateRootContext(CodegenTextWriter write
             /// </summary>
             protected internal void InnerIndentCurrentLine()
             {
-                if (IndentWritten)
+                if (IndentState != IndentStateEnum.None)
                     return;
                 if (string.IsNullOrEmpty(this.IndentString))
                     return;
-                // if DontIndentFirstLine is set it's because we're starting an inner block right "at cursor position"-  no need to indent again - we're already positioned!
-                if (DontIndentFirstLine && WhitespaceLines == 0 && NonWhitespaceLines == 0)
-                    return;
                 ParentTextWriter.InnerWriteRaw(this.IndentString);
-                IndentWritten = true;
+                IndentState = IndentStateEnum.None;
+            }
+            #endregion
+
+            #region IndentStateEnum
+            protected internal enum IndentStateEnum
+            {
+                /// <summary>
+                /// Indent wasn't written to current line
+                /// </summary>
+                None,
+
+                /// <summary>
+                /// Indent was implicitly captured from the current line (no need to write it while in this same line)
+                /// </summary>
+                ImplicitlyCaptured,
+
+
+                /// <summary>
+                /// Indent was written
+                /// </summary>
+                Written
             }
             #endregion
+
         }
     }
 }

src/Core/CodegenCS/CodegenTextWriter.cs

@@ -679,23 +679,32 @@ protected virtual void TrimCurrentLineEnd(bool onlyIfLineIsAllWhitespace = true)
             int len = _currentLine.Length;
             char c;
 
-            // Remove everything until we find last linebreak
-            while (remove < len && ((c = _currentLine[len - remove - 1]) == '\r' || c == '\n' || c == '\t' || c == ' '))
+            // Trim all trailing whitespace from _currentLine
+            while (remove < len && ((c = _currentLine[len - remove - 1]) == '\r' || c == '\n' || c == '\t' || c == ' ')) //TODO: support for onlyIfLineIsAllWhitspace=false
                 remove++;
-
             if (remove != 0)
                 _currentLine.Remove(_currentLine.Length - remove, remove);
 
-            // If the whole "real content" of the line was removed (or if the line didn't had any real content), then we should also remove the automatic added indent
-            if (remove == len && _scopeContexts.Peek().IndentWritten)
+            // If the whole "real content" of the line was removed (or if the line didn't had any real content), then we should also remove the automatic added indent(s) (if any)
+            if (remove == len) //TODO: should also loop to remove PARENT scopes if they match contents
             {
-                string indentString = _scopeContexts.Peek().IndentString;
-                bool match = true;
-                for (int i = 0; match && i < indentString.Length; i++)
-                    if (sb[sb.Length - remove - i - 1] != indentString[indentString.Length - i - 1])
-                        match = false;
-                if (match)
-                    remove += indentString.Length;
+                // Loop through all parent scopes, and while the indent of each scope matches what was written to the line we "revert" that indent written by each scope
+                ScopeContext scope;
+                for (int j = 0; j < _scopeContexts.Count && (scope = _scopeContexts.ElementAt(j)) != null && scope.IndentState == ScopeContext.IndentStateEnum.Written; j++)
+                {
+                    string indentString = scope.IndentString;
+
+                    bool match = true;
+                    for (int i = 0; match && i < indentString.Length; i++)
+                        if (sb[sb.Length - remove - i - 1] != indentString[indentString.Length - i - 1])
+                            match = false;
+
+                    if (match)
+                    {
+                        remove += indentString.Length;
+                        scope.IndentState = ScopeContext.IndentStateEnum.None;
+                    }
+                }
             }
 
             if (remove != 0)
@@ -712,10 +721,9 @@ protected virtual void TrimEnd()
             int len = sb.Length;
             char c;
 
-            // Remove everything until we find last linebreak
+            // Trim all trailing whitespace from _innerWriter
             while (remove < len && ((c = sb[len - remove - 1]) == '\r' || c == '\n' || c == '\t' || c == ' '))
                 remove++;
-
             if (remove == 0)
                 return;
             sb.Remove(sb.Length - remove, remove);
@@ -745,7 +753,10 @@ protected virtual void InnerWriteNewLine(string newLine = null)
                 foreach (var scope in _scopeContexts)
                     scope.WhitespaceLines++;
             foreach (var scope in _scopeContexts)
-                scope.IndentWritten = false;
+            {
+                if (scope.IndentState == ScopeContext.IndentStateEnum.ImplicitlyCaptured)
+                    scope.IndentState = ScopeContext.IndentStateEnum.None; // subsequent lines should get indent added
+            }
             _currentLine.Clear();
             _scopeContexts.Peek().ImplicitIndentBeforeFirstPlaceHolder = null;
             _nextWriteRequiresLineBreak = false;
@@ -832,8 +843,8 @@ protected virtual void InnerInlineAction(Action action)
 
             if (implicitIndent != null)
             {
-                // implicit indent was captured and we're starting a new scope - but the first line should not have indent written (it was already explicitly written)
-                _scopeContexts.Push(new ScopeContext(this, implicitIndent) { IndentWritten = true });
+                // implicit indent was captured and we're starting a new scope - but the first line should not have indent written (it was already explicitly written) - only the subsequent lines
+                _scopeContexts.Push(new ScopeContext(this, implicitIndent) { IndentState = ScopeContext.IndentStateEnum.ImplicitlyCaptured });
                 _currentLine.Clear(); // implicitIndent will be added to all subsequent lines written by action
             }
 
@@ -1717,7 +1728,6 @@ public virtual void ClearLastLine(bool onlyIfAllWhitespace = false)
 
             sb.Remove(sb.Length - remove, remove);
 
-
             _currentLine.Clear();
         }
         #endregion