(GH-2665) Support blockless using statment

* fixes #2665
cake-build · Nov 27, 2021 · 16a35ce · 16a35ce
1 parent 0de2adc
commit 16a35ce
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/Cake.Core/Scripting/Processors/UsingStatementProcessor.cs b/src/Cake.Core/Scripting/Processors/UsingStatementProcessor.cs
@@ -30,13 +30,23 @@ public override bool Process(IScriptAnalyzerContext context, string line, out st
                 return false;
             }
 
-            // Using block?
+            // Using disposable block?
             var @namespace = tokens[1].TrimEnd(';');
             if (@namespace.StartsWith("("))
             {
                 return false;
             }
 
+            // Using disposable statement?
+            const int usingLength = 5;
+            int openParentheses = line.IndexOf('(', usingLength),
+                closeParentheses = openParentheses < usingLength ? -1 : line.IndexOf(')', openParentheses);
+
+            if (closeParentheses > openParentheses)
+            {
+                return false;
+            }
+
             // Using alias directive?
             if (tokens.Any(t => t == "="))
             {

diff --git a/tests/integration/Cake.Core/Scripting/UsingDirective.cake b/tests/integration/Cake.Core/Scripting/UsingDirective.cake
@@ -6,7 +6,17 @@ Task("Cake.Core.Scripting.UsingDirective.UsingStatic")
     Information(Round(1.1));
 });
 
+Task("Cake.Core.Scripting.UsingDirective.UsingDisposable")
+    .Does(() =>
+{
+    // Intentionally not indented
+using var @string = new StringReader("String");
+    using var reader = new StringReader("Reader");
+    Information("{0}{1}", @string.ReadLine(), reader.ReadLine());
+});
+
 //////////////////////////////////////////////////////////////////////////////
 
 Task("Cake.Core.Scripting.UsingDirective")
-    .IsDependentOn("Cake.Core.Scripting.UsingDirective.UsingStatic");
+    .IsDependentOn("Cake.Core.Scripting.UsingDirective.UsingStatic")
+    .IsDependentOn("Cake.Core.Scripting.UsingDirective.UsingDisposable");