C# -> VB: add partial methods

Author: Alexilia

ICSharpCode.CodeConverter/VB/CommonConversions.cs

@@ -405,24 +405,20 @@ public void ConvertBaseList(CSS.BaseTypeDeclarationSyntax type, List<InheritsSta
         }
 
 
-        private static IEnumerable<SyntaxToken> ConvertModifiersCore(IReadOnlyCollection<SyntaxToken> modifiers,
-            TokenContext context, bool isConstructor)
-        {
-            if (context != TokenContext.Local && context != TokenContext.MemberInInterface && context != TokenContext.MemberInProperty) {
-                bool visibility = false;
-                foreach (var token in modifiers) {
-                    if (token.IsCsVisibility(true, isConstructor)) { //TODO Don't always treat as variable or const, pass in more context to detect this
-                        visibility = true;
-                        break;
-                    }
-                }
-                if (!visibility)
-                    yield return CSharpDefaultVisibility(context);
-            }
-            foreach (var token in modifiers.Where(m => !IgnoreInContext(m, context))) {
-                var m = ConvertModifier(token, context);
-                if (m.HasValue) yield return m.Value;
-            }
+        private static IEnumerable<SyntaxToken> ConvertModifiersCore(IReadOnlyCollection<SyntaxToken> modifiers, TokenContext context, bool isConstructor) {
+            var needsExplicitVisibility = context != TokenContext.Local
+                && context != TokenContext.MemberInInterface
+                && context != TokenContext.MemberInProperty
+                && !modifiers.Any(x => x.IsCsVisibility(true, isConstructor)); //TODO Don't always treat as variable or const, pass in more context to detect this
+            var vbModifiers = modifiers
+                .Where(m => !IgnoreInContext(m, context))
+                .Select(x => ConvertModifier(x, context))
+                .Where(x => x.HasValue)
+                .Select(x => x.Value)
+                .ToList();
+            if(needsExplicitVisibility)
+                vbModifiers.Insert(vbModifiers.FirstOrDefault().IsKind(SyntaxKind.PartialKeyword) ? 1 : 0, CSharpDefaultVisibility(context));
+            return vbModifiers;
         }
 
         private static bool IgnoreInContext(SyntaxToken m, TokenContext context)

ICSharpCode.CodeConverter/VB/NodesVisitor.cs

@@ -431,7 +431,7 @@ public override VisualBasicSyntaxNode VisitDestructorDeclaration(CSS.DestructorD
         public override VisualBasicSyntaxNode VisitMethodDeclaration(CSS.MethodDeclarationSyntax node)
         {
             var isIteratorState = new MethodBodyExecutableStatementVisitor(_semanticModel, TriviaConvertingVisitor, TriviaConvertingVisitor.TriviaConverter, _commonConversions);
-            bool requiresBody = node.Body != null || node.ExpressionBody != null || node.Modifiers.Any(m => SyntaxTokenExtensions.IsKind(m, CS.SyntaxKind.ExternKeyword));
+            bool requiresBody = node.Body != null || node.ExpressionBody != null || node.Modifiers.Any(m => SyntaxTokenExtensions.IsKind(m, CS.SyntaxKind.ExternKeyword, CS.SyntaxKind.PartialKeyword));
             var block = _commonConversions.ConvertBody(node.Body, node.ExpressionBody, isIteratorState);
             var id = _commonConversions.ConvertIdentifier(node.Identifier);
             var attributes = SyntaxFactory.List(node.AttributeLists.Select(a => (AttributeListSyntax)a.Accept(TriviaConvertingVisitor)));

Tests/VB/MemberTests.cs

@@ -1293,5 +1293,17 @@ await TestConversionCSharpToVisualBasic(
     WriteOnly Property Parameters As IEnumerable(Of Object)
 End Interface");
         }
+        [Fact]
+        public async Task PartialMethod() {
+            await TestConversionCSharpToVisualBasic(
+@"public partial class Entities {
+    partial void OnContextCreated();
+}",
+@"Public Partial Class Entities
+    Partial Private Sub OnContextCreated()
+    End Sub
+End Class");
+        }
+
     }
 }