VB -> C#: Convert date literals - fixes #159

icsharpcode · Nov 18, 2018 · b6ff932 · b6ff932
1 parent 3f24c1b
commit b6ff932
Show file tree

Hide file tree

Showing 5 changed files with 401 additions and 348 deletions.
diff --git a/ICSharpCode.CodeConverter/CSharp/CommonConversions.cs b/ICSharpCode.CodeConverter/CSharp/CommonConversions.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using ICSharpCode.CodeConverter.Shared;
 using ICSharpCode.CodeConverter.Util;
 using Microsoft.CodeAnalysis;
@@ -183,6 +184,11 @@ internal ExpressionSyntax GetLiteralExpression(object value, string fullText = n
             if (value is char)
                 return SyntaxFactory.LiteralExpression(Microsoft.CodeAnalysis.CSharp.SyntaxKind.CharacterLiteralExpression, SyntaxFactory.Literal((char)value));
 
+            if (value is DateTime dt) {
+                var valueToOutput = dt.Date.Equals(dt) ? dt.ToString("yyyy-MM-dd") : dt.ToString("yyyy-MM-dd HH:mm:ss");
+                return SyntaxFactory.ParseExpression("DateTime.Parse(\"" + valueToOutput + "\")");
+            }
+
 
             throw new ArgumentOutOfRangeException(nameof(value), value, null);
         }

diff --git a/ICSharpCode.CodeConverter/CSharp/NodesVisitor.cs b/ICSharpCode.CodeConverter/CSharp/NodesVisitor.cs
@@ -7,6 +7,7 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using SyntaxFactory = Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 using VBSyntax = Microsoft.CodeAnalysis.VisualBasic.Syntax;
 using VBasic = Microsoft.CodeAnalysis.VisualBasic;
 using SyntaxToken = Microsoft.CodeAnalysis.SyntaxToken;
@@ -821,17 +822,32 @@ public override CSharpSyntaxNode VisitParameter(VBSyntax.ParameterSyntax node)
                         returnType = arrayType.WithElementType(SyntaxFactory.NullableType(arrayType.ElementType));
                     }
                 }
-                EqualsValueClauseSyntax @default = null;
-                if (node.Default != null) {
-                    @default = SyntaxFactory.EqualsValueClause((ExpressionSyntax)node.Default?.Value.Accept(TriviaConvertingVisitor));
-                }
+
                 var attributes = node.AttributeLists.SelectMany(ConvertAttribute).ToList();
                 int outAttributeIndex = attributes.FindIndex(a => a.Attributes.Single().Name.ToString() == "Out");
                 var modifiers = CommonConversions.ConvertModifiers(node.Modifiers, TokenContext.Local);
                 if (outAttributeIndex > -1) {
                     attributes.RemoveAt(outAttributeIndex);
                     modifiers = modifiers.Replace(SyntaxFactory.Token(SyntaxKind.RefKeyword), SyntaxFactory.Token(SyntaxKind.OutKeyword));
                 }
+
+                EqualsValueClauseSyntax @default = null;
+                if (node.Default != null) {
+                    if (node.Default.Value is VBSyntax.LiteralExpressionSyntax les && les.Token.Value is DateTime dt)
+                    {
+                        var dateTimeAsLongCsLiteral = CommonConversions.GetLiteralExpression(dt.Ticks, dt.Ticks + "L");
+                        var dateTimeArg = CommonConversions.CreateAttributeArgumentList(SyntaxFactory.AttributeArgument(dateTimeAsLongCsLiteral));
+                        var optionalDateTimeAttributes = new[] {
+                            SyntaxFactory.Attribute(SyntaxFactory.ParseName("System.Runtime.InteropServices.Optional")),
+                            SyntaxFactory.Attribute(SyntaxFactory.ParseName("System.Runtime.CompilerServices.DateTimeConstant"), dateTimeArg)
+                        };
+                        attributes.Insert(0,
+                            SyntaxFactory.AttributeList(SyntaxFactory.SeparatedList(optionalDateTimeAttributes)));
+                    } else {
+                        @default = SyntaxFactory.EqualsValueClause(
+                            (ExpressionSyntax)node.Default.Value.Accept(TriviaConvertingVisitor));
+                    }
+                }
 
                 if (node.Parent.Parent is VBSyntax.MethodStatementSyntax mss
                     && mss.AttributeLists.Any(HasExtensionAttribute) && node.Parent.ChildNodes().First() == node) {