Merge pull request #6275 from tommy9/unicode-default-value

Unicode default value

Author: Vogel612

Rubberduck.Parsing/VBA/Extensions/StringExtensions.cs

@@ -170,7 +170,7 @@ public static string ToVbExpression(this string managed, bool useConsts = true)
                         tokens.Add($"\"{literal}\"");
                         literal = string.Empty;
                     }
-                    tokens.Add($"ChrW$(&H{Convert.ToInt16(character):X})");
+                    tokens.Add($"ChrW$(&H{Convert.ToInt32(character):X})");
                 }
 
             }

RubberduckTests/Symbols/ToVbExpressionTests.cs

@@ -128,6 +128,17 @@ public void UnicodeUsesChrWCallWithHexNotation()
             Assert.AreEqual(expected, actual, "Expected {0}, actual was {1}", expected, actual);
         }
 
+        [Test]
+        [Category("String Extensions")]
+        public void UnicodeOverMaxInt16UsesChrWCallWithHexNotation()
+        {
+            var managed = "耀";
+            var expected = "ChrW$(&H8000)";
+            var actual = managed.ToVbExpression();
+
+            Assert.AreEqual(expected, actual, "Expected {0}, actual was {1}", expected, actual);
+        }
+        
         [Test]
         [Category("String Extensions")]
         public void MixedAsciiAndUnicodeUsesChrAndChrWConstFlagOff()