Enhance Scope Management: Introduce ScopeWithTrailingSemicolon class and update related documentation and tests

Author: matt-edmondson

CLAUDE.md

@@ -25,7 +25,7 @@ dotnet test --logger "console;verbosity=detailed"
 
 ## Architecture
 
-The library consists of two main classes:
+The library consists of three main classes:
 
 1. **`CodeBlocker`** (`CodeBlocker/CodeBlocker.cs`): Wraps `System.CodeDom.Compiler.IndentedTextWriter` to provide simplified code generation with:
    - Factory methods (`Create()`, `Create(string indentString)`) that manage `StringWriter` lifecycle
@@ -35,9 +35,14 @@ The library consists of two main classes:
 
 2. **`Scope`** (`CodeBlocker/Scope.cs`): Extends `ktsu.ScopedAction` to provide automatic brace handling:
    - On creation: writes `{` and increases indent
-   - On disposal: decreases indent and writes `};`
+   - On disposal: decreases indent and writes `}`
    - Used with C# `using` statements for clean nested code generation
 
+3. **`ScopeWithTrailingSemicolon`** (`CodeBlocker/Scope.cs`): Variant of `Scope` that appends a semicolon after the closing brace:
+   - On creation: writes `{` and increases indent
+   - On disposal: decreases indent and writes `};`
+   - Useful for C/C++ enum declarations, struct initializers, etc.
+
 ## SDK and Dependencies
 
 This project uses:

CodeBlocker.Test/IntegrationTests.cs

@@ -47,16 +47,16 @@ public void ComplexCodeGenerationShouldFormatCorrectly()
 					   "\t{\r\n" +
 					   "\t\tvar x = 1;\r\n" +
 					   "\t\tConsole.WriteLine(x);\r\n" +
-					   "\t};\r\n" +
+					   "\t}\r\n" +
 					   "\r\n" +
 					   "\tpublic void Method2()\r\n" +
 					   "\t{\r\n" +
 					   "\t\tif (true)\r\n" +
 					   "\t\t{\r\n" +
 					   "\t\t\treturn;\r\n" +
-					   "\t\t};\r\n" +
-					   "\t};\r\n" +
-					   "};\r\n";
+					   "\t\t}\r\n" +
+					   "\t}\r\n" +
+					   "}\r\n";
 
 		Assert.AreEqual(expected, result);
 	}
@@ -168,7 +168,7 @@ public void EmptyScopesShouldNotAffectOtherContent()
 		// Assert
 
 		string result = codeBlocker.ToString();
-		string expected = "before\r\n{\r\n};\r\nafter\r\n";
+		string expected = "before\r\n{\r\n}\r\nafter\r\n";
 		Assert.AreEqual(expected, result);
 	}
 
@@ -199,8 +199,8 @@ public void MultipleCodeBlockersShouldBeIndependent()
 		string result1 = codeBlocker1.ToString();
 		string result2 = codeBlocker2.ToString();
 
-		string expected1 = "codeBlocker1 content\r\n{\r\n\tinside scope1\r\n};\r\n";
-		string expected2 = "codeBlocker2 content\r\n{\r\n\tinside scope2\r\n};\r\n";
+		string expected1 = "codeBlocker1 content\r\n{\r\n\tinside scope1\r\n}\r\n";
+		string expected2 = "codeBlocker2 content\r\n{\r\n\tinside scope2\r\n}\r\n";
 
 		Assert.AreEqual(expected1, result1);
 		Assert.AreEqual(expected2, result2);
@@ -305,8 +305,8 @@ public void MixedWriteOperationsWithComplexIndentationShouldFormatCorrectly()
 			"\tpublic MyClass(string field)\r\n" +
 			"\t{\r\n" +
 			"\t\t_field = field ?? throw new ArgumentNullException(nameof(field));\r\n" +
-			"\t};\r\n" +
-			"};\r\n";
+			"\t}\r\n" +
+			"}\r\n";
 
 		Assert.AreEqual(expected, result);
 	}

CodeBlocker.Test/ScopeTests.cs

@@ -46,7 +46,7 @@ public void DisposeShouldCloseBraceAndDecreaseIndentation()
 
 		Assert.AreEqual(initialIndent, codeBlocker.CurrentIndent);
 		string result = codeBlocker.ToString();
-		Assert.IsTrue(result.EndsWith("};\r\n", StringComparison.Ordinal), "Result should end with closing brace, semicolon, and newline");
+		Assert.IsTrue(result.EndsWith("}\r\n", StringComparison.Ordinal), "Result should end with closing brace and newline");
 	}
 
 	[TestMethod]
@@ -66,7 +66,7 @@ public void UsingStatementShouldProperlyOpenAndCloseScope()
 		// Assert
 
 		string result = codeBlocker.ToString();
-		string expected = "{\r\n\tcontent inside scope\r\n};\r\n";
+		string expected = "{\r\n\tcontent inside scope\r\n}\r\n";
 		Assert.AreEqual(expected, result);
 	}
 
@@ -92,7 +92,7 @@ public void NestedScopesShouldMaintainProperIndentation()
 		// Assert
 
 		string result = codeBlocker.ToString();
-		string expected = "{\r\n\tlevel 1\r\n\t{\r\n\t\tlevel 2\r\n\t};\r\n\tback to level 1\r\n};\r\n";
+		string expected = "{\r\n\tlevel 1\r\n\t{\r\n\t\tlevel 2\r\n\t}\r\n\tback to level 1\r\n}\r\n";
 		Assert.AreEqual(expected, result);
 	}
 
@@ -128,7 +128,7 @@ public void ScopeWithoutContentShouldStillFormatCorrectly()
 		// Assert
 
 		string result = codeBlocker.ToString();
-		string expected = "{\r\n};\r\n";
+		string expected = "{\r\n}\r\n";
 		Assert.AreEqual(expected, result);
 	}
 
@@ -154,7 +154,7 @@ public void MultipleSequentialScopesShouldFormatCorrectly()
 		// Assert
 
 		string result = codeBlocker.ToString();
-		string expected = "{\r\n\tscope 1 content\r\n};\r\n{\r\n\tscope 2 content\r\n};\r\n";
+		string expected = "{\r\n\tscope 1 content\r\n}\r\n{\r\n\tscope 2 content\r\n}\r\n";
 		Assert.AreEqual(expected, result);
 	}
 
@@ -177,7 +177,7 @@ public void ScopeWithCustomIndentStringShouldWork()
 		// Assert
 
 		string result = codeBlocker.ToString();
-		string expected = "{\r\n  custom indented content\r\n};\r\n";
+		string expected = "{\r\n  custom indented content\r\n}\r\n";
 		Assert.AreEqual(expected, result);
 		Assert.AreEqual(customIndent, codeBlocker.IndentString);
 	}
@@ -268,7 +268,7 @@ public void ScopeWithMixedManualIndentAndScopeIndentShouldWork()
 		// Note: After manual Outdent within scope, the closing }; will be at the current indent level
 		// The scope ends at whatever the current indent is when Dispose() is called
 
-		string expected = "\t{\r\n\t\tdouble indented\r\n\tsingle indented\r\n};\r\nback to manual indent\r\n";
+		string expected = "\t{\r\n\t\tdouble indented\r\n\tsingle indented\r\n}\r\nback to manual indent\r\n";
 		Assert.AreEqual(expected, result);
 	}
 
@@ -297,7 +297,7 @@ public void ScopeWithCurrentIndentSetterShouldWork()
 		Assert.IsTrue(result.Contains("{\r\n", StringComparison.Ordinal), "Result should contain opening brace with newline");
 		Assert.IsTrue(result.Contains("\t\t\t\t\tlevel 5 content\r\n", StringComparison.Ordinal), "Result should contain content with 5 tabs indentation");
 
-		Assert.IsTrue(result.EndsWith("};\r\n", StringComparison.Ordinal), "Result should end with closing brace, semicolon, and newline");
+		Assert.IsTrue(result.EndsWith("}\r\n", StringComparison.Ordinal), "Result should end with closing brace and newline");
 	}
 
 	[TestMethod]
@@ -347,7 +347,7 @@ public void ScopeWithEmptyCustomIndentStringShouldWork()
 		// Assert
 
 		string result = codeBlocker.ToString();
-		string expected = "{\r\nno indent\r\n};\r\n";
+		string expected = "{\r\nno indent\r\n}\r\n";
 		Assert.AreEqual(expected, result);
 	}