Look inside global statements

Author: GrahamTheCoder

CodeConverter/Common/LanguageConversionExtensions.cs

@@ -1,4 +1,5 @@
-using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
 
 namespace ICSharpCode.CodeConverter.Common;
 
@@ -7,7 +8,11 @@ public static SyntaxTree MakeFullCompilationUnit(this ILanguageConversion langua
         var tree= languageConversion.CreateTree(code);
         var root = tree.GetRoot();
         textSpan = null;
-        var rootChildren = root.ChildNodes().ToList();
+        
+        var rootChildren = root.ChildNodes()
+            //https://github.com/icsharpcode/CodeConverter/issues/825
+            .Select(c => c is GlobalStatementSyntax {Statement: var s} ? s : c)
+            .ToList();
         var requiresSurroundingClass = rootChildren.Any(languageConversion.MustBeContainedByClass);
         var requiresSurroundingMethod = rootChildren.All(languageConversion.CanBeContainedByMethod);
 

CodeConverter/VB/CSToVBConversion.cs

@@ -148,14 +148,13 @@ public bool CanBeContainedByMethod(SyntaxNode node)
                node is CSSyntax.StatementSyntax ||
                node.ContainsSkippedText ||
                node.IsMissing ||
-               ParsedAsFieldButCouldBeLocalVariableDeclaration(node); ;
+               ParsedAsFieldButCouldBeLocalVariableDeclaration(node);
     }
 
     public bool MustBeContainedByClass(SyntaxNode node)
     {
         return node is CSSyntax.BaseMethodDeclarationSyntax || node is CSSyntax.BaseFieldDeclarationSyntax ||
-               node is CSSyntax.BasePropertyDeclarationSyntax ||
-               node is CSSyntax.GlobalStatementSyntax; //https://github.com/icsharpcode/CodeConverter/issues/825
+               node is CSSyntax.BasePropertyDeclarationSyntax;
     }
 
     private static bool ParsedAsFieldButCouldBeLocalVariableDeclaration(SyntaxNode node)

Tests/VB/StandaloneStatementTests.cs

@@ -12,7 +12,7 @@ public async Task ReassignmentAsync()
         await TestConversionCSharpToVisualBasicAsync(
             @"int num = 4;
 num = 5;",
-            @"Dim num As Integer = 4
+            @"Dim num = 4
 num = 5",
             expectSurroundingMethodBlock: true);
     }