CodegenCS.Core 3.3.0:

CodegenTextWriter.PreserveNonWhitespaceIndentBehaviorType:
- PreserveAnything (previously PreserveNonWhitespaceIndent=true): will preserve any implicit indent (like "//" or "#" etc) across subsequent lines under same scope
- PreservePosition: doesn't preserve characters (which are not whitespace) but will convert them into equivalent number of spaces, so the starting position is preserved
- Trim: will not implicily preserve any indent unless it's only whitespace
Added GetImplicitIndent
Added virtual modifier to many methods

Refs #16 : TrimEnd() was incorrectly recalculating _currentLine, so implicit indent was writing wrong blocks.

Author: Drizin

src/Core/CodegenCS.Tests/CoreTests/01-BasicTests.cs

@@ -315,9 +315,9 @@ void MyMethod()
         }
 
         [Test]
-        public void AutoIndentSQLComments()
+        public void AutoIndentSQLComments_PreserveNonWhitespaceIndentBehaviorType_PreserveAnything()
         {
-        	_w.PreserveNonWhitespaceIndent = true;
+            //_w.PreserveNonWhitespaceIndentBehavior = CodegenTextWriter.PreserveNonWhitespaceIndentBehaviorType.PreserveAnything; // default.
             string myMultilineBlock = "My\r\nMultiline\r\nstring";
             _w.Write($$"""
                 -- {{myMultilineBlock}}
@@ -331,6 +331,43 @@ INSERT INTO MyTable (...)
                 """;
             Assert.AreEqual(expected, _w.GetContents());
         }
+
+        [Test]
+        public void AutoIndentSQLComments_PreserveNonWhitespaceIndentBehaviorType_Trim()
+        {
+            _w.PreserveNonWhitespaceIndentBehavior = CodegenTextWriter.PreserveNonWhitespaceIndentBehaviorType.Trim;
+            string myMultilineBlock = "My\r\nMultiline\r\nstring";
+            _w.Write($$"""
+                -- {{myMultilineBlock}}
+                INSERT INTO MyTable (...)
+                """);
+            string expected = $$"""
+                -- My
+                Multiline
+                string
+                INSERT INTO MyTable (...)
+                """;
+            Assert.AreEqual(expected, _w.GetContents());
+        }
+
+        [Test]
+        public void AutoIndentSQLComments_PreserveNonWhitespaceIndentBehaviorType_()
+        {
+            _w.PreserveNonWhitespaceIndentBehavior = CodegenTextWriter.PreserveNonWhitespaceIndentBehaviorType.PreservePosition;
+            string myMultilineBlock = "My\r\nMultiline\r\nstring";
+            _w.Write($$"""
+                -- {{myMultilineBlock}}
+                INSERT INTO MyTable (...)
+                """);
+            string expected = $$"""
+                -- My
+                   Multiline
+                   string
+                INSERT INTO MyTable (...)
+                """;
+            Assert.AreEqual(expected, _w.GetContents());
+        }
+
         #endregion
 
         #region Text-Manipulation

src/Core/CodegenCS.Tests/CoreTests/03-WhitespaceControlTests.cs

@@ -136,6 +136,76 @@ My paragraphThe end.
                 """, _w.GetContents());
         }
 
+        [Test]
+        public void TestTLW2()
+        {
+            FormattableString code = $"""
+                var a = 1;
+                var b = 2;
+                """;
+
+            _w.Write($$"""
+                public void Test()
+                {
+                    {{TLW}}{{code}}
+                }
+                """);
+
+            Assert.AreEqual("""
+                public void Test()
+                {var a = 1;
+                {var b = 2;
+                }
+                """, _w.GetContents());
+        }
+
+        [Test]
+        public void TestTLW3()
+        {
+            FormattableString code = $"""
+                var a = 1;
+                var b = 2;
+                """;
+
+            _w.PreserveNonWhitespaceIndentBehavior = CodegenTextWriter.PreserveNonWhitespaceIndentBehaviorType.Trim;
+            _w.Write($$"""
+                public void Test()
+                {
+                    {{TLW}}{{code}}
+                }
+                """);
+
+            Assert.AreEqual("""
+                public void Test()
+                {var a = 1;
+                var b = 2;
+                }
+                """, _w.GetContents());
+        }
+
+        [Test]
+        public void TestTLW4()
+        {
+            FormattableString code = $"""
+                var a = 1;
+                var b = 2;
+                """;
+
+            _w.PreserveNonWhitespaceIndentBehavior = CodegenTextWriter.PreserveNonWhitespaceIndentBehaviorType.PreservePosition;
+            _w.Write($$"""
+                public void Test()
+                {{{code}}
+                }
+                """);
+
+            Assert.AreEqual("""
+                public void Test()
+                {var a = 1;
+                 var b = 2;
+                }
+                """, _w.GetContents());
+        }
+
         [Test]
         public void TestTTW()
         {

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.2.2</Version>
+    <Version>3.3.0</Version>
     <DocumentationFile>CodegenCS.xml</DocumentationFile>
     <PackageTags>code generation;code generator;templating;codegencs</PackageTags>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>