Output skipped text

Author: GrahamTheCoder

CodeConverter/Util/SyntaxNodeExtensions.cs

@@ -24,6 +24,8 @@ namespace ICSharpCode.CodeConverter.Util
 {
     internal static class SyntaxNodeExtensions
     {
+        private static SyntaxTrivia _endOfLine = SyntaxFactory.EndOfLine(Environment.NewLine);
+
         public static IEnumerable<SyntaxNode> GetAncestors(this SyntaxNode node)
         {
             var current = node.Parent;
@@ -370,7 +372,6 @@ public static IEnumerable<SyntaxTrivia> ConvertTrivia(this IReadOnlyCollection<S
 
         private static IEnumerable<SyntaxTrivia> ConvertVBTrivia(SyntaxTrivia t)
         {
-            var endOfLine = SyntaxFactory.EndOfLine(Environment.NewLine);
 
             if (t.IsKind(VBSyntaxKind.CommentTrivia)) {
                 yield return SyntaxFactory.SyntaxTrivia(CSSyntaxKind.SingleLineCommentTrivia, $"// {t.GetCommentText()}");
@@ -397,24 +398,38 @@ private static IEnumerable<SyntaxTrivia> ConvertVBTrivia(SyntaxTrivia t)
                 yield break;
             }
 
-            if (t.HasStructure && t.GetStructure() is VBSyntax.RegionDirectiveTriviaSyntax rdts) {
+            if (t.HasStructure) {
+                bool wasConverted = false;
+                foreach (var converted in ConvertStructuredVBTrivia(t)) {
+                    yield return converted;
+                    wasConverted = true;
+                }
+                if (wasConverted) yield break;
+            }
+
+            //Each of these would need its own method to recreate for C# with the right structure probably so let's just warn about them for now.
+            var convertedKind = t.GetCSKind();
+            yield return convertedKind.HasValue
+                ? SyntaxFactory.Comment(@$"/* TODO ERROR: Skipped {convertedKind.Value}
+{t.ToFullString()}*/")
+                : default(SyntaxTrivia);
+        }
+
+        private static IEnumerable<SyntaxTrivia> ConvertStructuredVBTrivia(SyntaxTrivia t)
+        {
+            var triviaStructure = t.GetStructure();
+            if (triviaStructure is VBSyntax.RegionDirectiveTriviaSyntax rdts) {
                 var regionDirective = SyntaxFactory.RegionDirectiveTrivia(true);
                 var regionKeyword = regionDirective.RegionKeyword.WithTrailingTrivia(SyntaxFactory.Space);
-                var endOfDirectiveToken = regionDirective.EndOfDirectiveToken.WithLeadingTrivia(SyntaxFactory.PreprocessingMessage(rdts.Name.Text.Trim('"'))).WithTrailingTrivia(endOfLine);
+                var endOfDirectiveToken = regionDirective.EndOfDirectiveToken.WithLeadingTrivia(SyntaxFactory.PreprocessingMessage(rdts.Name.Text.Trim('"'))).WithTrailingTrivia(_endOfLine);
                 yield return SyntaxFactory.Trivia(regionDirective.WithRegionKeyword(regionKeyword).WithEndOfDirectiveToken(endOfDirectiveToken));
                 yield break;
             }
 
             if (t.IsKind(VBSyntaxKind.EndRegionDirectiveTrivia)) {
-                yield return SyntaxFactory.Trivia(SyntaxFactory.EndRegionDirectiveTrivia(true).WithTrailingTrivia(endOfLine));
+                yield return SyntaxFactory.Trivia(SyntaxFactory.EndRegionDirectiveTrivia(true).WithTrailingTrivia(_endOfLine));
                 yield break;
             }
-
-            //Each of these would need its own method to recreate for C# with the right structure probably so let's just warn about them for now.
-            var convertedKind = t.GetCSKind();
-            yield return convertedKind.HasValue
-                ? SyntaxFactory.Comment($"/* TODO ERROR: Skipped {convertedKind.Value} */")
-                : default(SyntaxTrivia);
         }
 
         public static SyntaxTokenList GetModifiers(this CSharpSyntaxNode member)

Tests/CSharp/TriviaTests.cs

@@ -98,5 +98,57 @@ public static void Main(string[] args)
 #endregion",
 hasLineCommentConversionIssue: true);//Auto-test code doesn't know to avoid adding comment on same line as region
         }
+
+        [Fact]
+        public async Task Issue15_IfTrueAsync()
+        {
+            await TestConversionVisualBasicToCSharpAsync(
+@"Public Class AClass
+    #If TRUE
+    Private Sub AMethod()
+    End Sub
+    #End If
+End Class",
+@"
+public partial class AClass
+{
+    /* TODO ERROR: Skipped IfDirectiveTrivia
+#If TRUE
+*/
+    private void AMethod()
+    {
+    }
+    /* TODO ERROR: Skipped EndIfDirectiveTrivia
+#End If
+*/
+}
+");
+        }
+
+        [Fact]
+        public async Task Issue15_IfFalseAsync()
+        {
+            await TestConversionVisualBasicToCSharpAsync(
+@"Public Class AClass
+    #If FALSE
+    Private Sub AMethod()
+    End Sub
+    #End If
+End Class",
+@"
+public partial class AClass
+{
+    /* TODO ERROR: Skipped IfDirectiveTrivia
+#If TRUE
+*/
+    private void AMethod()
+    {
+    }
+    /* TODO ERROR: Skipped EndIfDirectiveTrivia
+#End If
+*/
+}
+");
+        }
     }
 }