GH-22 directives WIP

belav · Mar 1, 2021 · 1a23d08 · 1a23d08
1 parent 7894443
commit 1a23d08
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 25 deletions.
diff --git a/...les/Directives/BasicDirectives.actual.cst → ...estFiles/Directives/Directives.actual.cst b/...les/Directives/BasicDirectives.actual.cst → ...estFiles/Directives/Directives.actual.cst
@@ -11,3 +11,20 @@
 #undef foo
 #line 6
 class ClassName { }
+
+public class ClassName
+{
+    void MethodName()
+    {
+#if DEBUG
+        Console.WriteLine("Rosyln does not parse this because DEBUG is not defined");
+#endif
+    }
+}
+
+namespace Namespace
+{
+
+#pragma
+    class ExtraLineChecker { }
+}
diff --git a/.../TestFiles/Directives/BasicDirectives.cst → ...Tests/TestFiles/Directives/Directives.cst b/.../TestFiles/Directives/BasicDirectives.cst → ...Tests/TestFiles/Directives/Directives.cst
@@ -11,3 +11,19 @@
 #undef foo
 #line 6
 class ClassName { }
+
+public class ClassName
+{
+    void MethodName()
+    {
+#if DEBUG
+        Console.WriteLine("Rosyln does not parse this because DEBUG is not defined");
+#endif
+    }
+}
+
+namespace Namespace
+{
+#pragma
+    class ExtraLineChecker { }
+}
diff --git a/Src/CSharpier.Tests/TestFiles/Directives/IfDirectiveEmptyBlock.actual.cst b/Src/CSharpier.Tests/TestFiles/Directives/IfDirectiveEmptyBlock.actual.cst
diff --git a/Src/CSharpier.Tests/TestFiles/Directives/IfDirectiveEmptyBlock.cst b/Src/CSharpier.Tests/TestFiles/Directives/IfDirectiveEmptyBlock.cst
diff --git a/Src/CSharpier.Tests/TestFiles/Directives/_DirectivesTests.cs b/Src/CSharpier.Tests/TestFiles/Directives/_DirectivesTests.cs
@@ -6,14 +6,9 @@ namespace CSharpier.Tests.TestFiles
     public class DirectivesTests : BaseTest
     {
         [Test]
-        public void BasicDirectives()
+        public void Directives()
         {
-            this.RunTest("Directives", "BasicDirectives");
-        }
-        [Test]
-        public void IfDirectiveEmptyBlock()
-        {
-            this.RunTest("Directives", "IfDirectiveEmptyBlock");
+            this.RunTest("Directives", "Directives");
         }
         [Test]
         public void Regions()

diff --git a/Src/CSharpier/PrinterHelpers/SyntaxTrivia.cs b/Src/CSharpier/PrinterHelpers/SyntaxTrivia.cs
@@ -151,6 +151,8 @@ private Doc PrintLeadingTrivia(SyntaxTriviaList leadingTrivia)
                 )
                 {
                     hadDirective = true;
+                    // GH-22 the problem is that we have a hardline followed by a literalline. What we really mean by literalLine is, add a line and dedent if this isn't preceded by a hardline.... I think
+                    // we should probably figure out better new lines for directives, because that could affect this.
                     parts.Push(LiteralLine, trivia.ToString());
                 }
                 else if (