Merge pull request #6014 from awb95/dev-4795-Indenter_Declare_PtrSafe

Fix Indenter "Declare PtrSafe"
rubberduck-vba · Aug 22, 2022 · b53f353 · b53f353
2 parents 5ff67f4 + fccbe4e
commit b53f353
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/Rubberduck.SmartIndenter/AbsoluteCodeLine.cs b/Rubberduck.SmartIndenter/AbsoluteCodeLine.cs
@@ -16,7 +16,7 @@ public class AbsoluteCodeLine
 
         private static readonly Regex PropertyStartRegex = new Regex(@"^(Public\s|Private\s|Friend\s)?(Static\s)?(Property\s(Let|Get|Set))\s", RegexOptions.IgnoreCase);
 
-        private static readonly Regex ProcedureStartIgnoreRegex = new Regex(@"^[LR]?Set\s|^Let\s|^(Public|Private)\sDeclare\s(Function|Sub)", RegexOptions.IgnoreCase);
+        private static readonly Regex ProcedureStartIgnoreRegex = new Regex(@"^[LR]?Set\s|^Let\s|^(Public\s|Private\s)?Declare\s(PtrSafe\s)?(Function|Sub)", RegexOptions.IgnoreCase);
         private static readonly Regex ProcedureEndRegex = new Regex(@"^End\s(Sub|Function|Property)", RegexOptions.IgnoreCase);
         private static readonly Regex TypeEnumStartRegex = new Regex(@"^(Public\s|Private\s)?(Enum\s|Type\s)", RegexOptions.IgnoreCase);
         private static readonly Regex TypeEnumEndRegex = new Regex(@"^End\s(Enum|Type)", RegexOptions.IgnoreCase);

diff --git a/Rubberduck.SmartIndenter/LogicalCodeLine.cs b/Rubberduck.SmartIndenter/LogicalCodeLine.cs
@@ -202,7 +202,7 @@ public override string ToString()
             return _lines.Aggregate(string.Empty, (x, y) => x + y.ToString());
         }
 
-        private static readonly Regex StartIgnoreRegex = new Regex(@"^(\d*\s)?\s*[LR]?Set\s|^(\d*\s)?\s*Let\s|^(\d*\s)?\s*(Public|Private)\sDeclare\s(Function|Sub)|^(\d*\s+)", RegexOptions.IgnoreCase);
+        private static readonly Regex StartIgnoreRegex = new Regex(@"^(\d*\s)?\s*[LR]?Set\s|^(\d*\s)?\s*Let\s|^(\d*\s)?\s*(Public\s|Private\s)?Declare\s(PtrSafe\s)?(Function|Sub)|^(\d*\s+)", RegexOptions.IgnoreCase);
         private readonly Stack<AlignmentToken> _alignment = new Stack<AlignmentToken>();
         private int _nestingDepth;
 

diff --git a/RubberduckTests/SmartIndenter/LineContinuationTests.cs b/RubberduckTests/SmartIndenter/LineContinuationTests.cs
@@ -29,6 +29,28 @@ public void DeclarationLineAlignsCorrectly()
             Assert.IsTrue(expected.SequenceEqual(actual));
         }
 
+        // https://github.com/rubberduck-vba/Rubberduck/issues/4795
+        [Test]
+        [Category("Indenter")]
+        public void DeclarationPtrSafeLineAlignsCorrectly()
+        {
+            var code = new[]
+            {
+                @"Private Declare PtrSafe Function Foo Lib ""bar.dll"" _",
+                 "(x As Long y As Long) As LongPtr"
+            };
+
+            var expected = new[]
+            {
+                @"Private Declare PtrSafe Function Foo Lib ""bar.dll"" _",
+                 "                                 (x As Long y As Long) As LongPtr"
+            };
+
+            var indenter = new Indenter(null, () => IndenterSettingsTests.GetMockIndenterSettings());
+            var actual = indenter.Indent(code);
+            Assert.IsTrue(expected.SequenceEqual(actual));
+        }
+
         [Test]
         [Category("Indenter")]
         public void FunctionParametersAlignCorrectly()