Merge pull request #699 from BrianFreemanAtlanta/UnsignedIntegers

handle U32/U64 hex literals without suffix

Author: GrahamTheCoder

CHANGELOG.md

@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ### C# -> VB
 
+* Hex values in UInt32 and Uint64 ranges not converted properly. [#695](https://github.com/icsharpcode/CodeConverter/pull/695)
 
 ## [8.2.2] - 2021-01-23
 

CodeConverter/VB/CommonConversions.cs

@@ -596,7 +596,7 @@ internal static ExpressionSyntax GetLiteralExpression(object value, string value
             if (value is bool)
                 return (ExpressionSyntax)((bool)value ? generator.TrueLiteralExpression() : generator.FalseLiteralExpression());
 
-            valueText = valueText != null ? ConvertNumericLiteralValueText(valueText) : value.ToString();
+            valueText = valueText != null ? ConvertNumericLiteralValueText(valueText,value) : value.ToString();
 
             if (value is byte)
                 return SyntaxFactory.LiteralExpression(SyntaxKind.NumericLiteralExpression, SyntaxFactory.Literal(valueText, (byte)value));
@@ -629,7 +629,7 @@ internal static ExpressionSyntax GetLiteralExpression(object value, string value
         /// <summary>
         ///  https://docs.microsoft.com/en-us/dotnet/visual-basic/programming-guide/language-features/data-types/type-characters
         /// </summary>
-        private static string ConvertNumericLiteralValueText(string valueText)
+        private static string ConvertNumericLiteralValueText(string valueText,object value)
         {
             var replacements = new Dictionary<string, string> {
                 {"U", "UI"},
@@ -651,6 +651,16 @@ private static string ConvertNumericLiteralValueText(string valueText)
             if (valueText.Length <= 2) return valueText;
 
             if (valueText.StartsWith("0x")) {
+                if (value switch {
+                    ulong _ => "UL",
+                    uint _ => "UI",
+                    _ => default
+                } is { } suffix) {
+                    if (!valueText.EndsWith(suffix)) {
+                        valueText += suffix;
+                    }
+                }
+
                 return "&H" + valueText.Substring(2).Replace("R", "D"); // Undo any accidental replacements that assumed this was a decimal;
             }
 

Tests/VB/SpecialConversionTests.cs

@@ -474,6 +474,32 @@ await TestConversionCSharpToVisualBasicAsync(
 End Class");
         }
 
+        [Fact]
+        public async Task Issue695HexAndBinaryLiteralsAsync()
+        {
+            await TestConversionCSharpToVisualBasicAsync(
+                @"class Test
+{
+    public decimal Int32Start   = 0x0;
+    public decimal Int32End     = 0x7FFFFFFF;
+    public decimal UInt32Start  = 0x80000000;
+    public decimal UInt32End    = 0xFFFFFFFF;
+    public decimal Int64Start   = 0x100000000;
+    public decimal Int64End     = 0x7FFFFFFFFFFFFFFF;
+    public decimal UInt64Start  = 0x8000000000000000;
+    public decimal UInt64End    = 0xFFFFFFFFFFFFFFFF;
+}", @"Friend Class Test
+    Public Int32Start As Decimal = &H0
+    Public Int32End As Decimal = &H7FFFFFFF
+    Public UInt32Start As Decimal = &H80000000UI
+    Public UInt32End As Decimal = &HFFFFFFFFUI
+    Public Int64Start As Decimal = &H100000000
+    Public Int64End As Decimal = &H7FFFFFFFFFFFFFFF
+    Public UInt64Start As Decimal = &H8000000000000000UL
+    Public UInt64End As Decimal = &HFFFFFFFFFFFFFFFFUL
+End Class");
+        }
+
         [Fact]
         public async Task CaseConflict_LocalWithLocalAsync() {
             await TestConversionCSharpToVisualBasicAsync(