Fix VB default value for class parameters bug (#499)

hiihellox10 · web-flow · commit 1e6bd541c0ae · 2020-05-27T11:52:44.000-04:00
* Fix VB default value for class parameters bug https://ceapex.visualstudio.com/Engineering/_workitems/edit/221125
diff --git a/mdoc/Mono.Documentation/Updater/Formatters/VBFullMemberFormatter.cs b/mdoc/Mono.Documentation/Updater/Formatters/VBFullMemberFormatter.cs
@@ -583,7 +583,8 @@ private StringBuilder AppendParameter(StringBuilder buf, ParameterDefinition par
             buf.Append(GetTypeName(parameter.ParameterType, new DynamicParserContext(parameter)));
             if (parameter.HasDefault && parameter.IsOptional && parameter.HasConstant)
             {
-                buf.AppendFormat(" = {0}", MDocUpdater.MakeAttributesValueString(parameter.Constant, parameter.ParameterType));
+                var parameterValue = MDocUpdater.MakeAttributesValueString(parameter.Constant, parameter.ParameterType);
+                buf.AppendFormat(" = {0}", parameterValue == "null" ? "Nothing" : parameterValue);
             }
             return buf;
         }
diff --git a/mdoc/mdoc.Test/VBFormatterTests.cs b/mdoc/mdoc.Test/VBFormatterTests.cs
@@ -124,6 +124,14 @@ public void Params()
             Assert.AreEqual("Public Sub DoSomethingWithParams (ParamArray values As Integer())", sig);
         }
 
+        [Test]
+        public void DefaultNullValueForParams()
+        {
+            var member = GetMethod(typeof(SomeGenericClass<>), m => m.Name == "SomeMethod4");
+            var sig = formatter.GetDeclaration(member);
+            Assert.AreEqual("Public Sub SomeMethod4 (ByRef a As String, t As T, Optional b As Object = Nothing)", sig);
+        }
+
         #region Helper Methods
         string RealTypeName(string name)
         {

Original file line number	Diff line number	Diff line change
`@@ -583,7 +583,8 @@ private StringBuilder AppendParameter(StringBuilder buf, ParameterDefinition par`
`583`	`583`	`buf.Append(GetTypeName(parameter.ParameterType, new DynamicParserContext(parameter)));`
`584`	`584`	`if (parameter.HasDefault && parameter.IsOptional && parameter.HasConstant)`
`585`	`585`	`{`
`586`		`- buf.AppendFormat(" = {0}", MDocUpdater.MakeAttributesValueString(parameter.Constant, parameter.ParameterType));`
	`586`	`+ var parameterValue = MDocUpdater.MakeAttributesValueString(parameter.Constant, parameter.ParameterType);`
	`587`	`+ buf.AppendFormat(" = {0}", parameterValue == "null" ? "Nothing" : parameterValue);`
`587`	`588`	`}`
`588`	`589`	`return buf;`
`589`	`590`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,14 @@ public void Params()`
`124`	`124`	`Assert.AreEqual("Public Sub DoSomethingWithParams (ParamArray values As Integer())", sig);`
`125`	`125`	`}`
`126`	`126`
	`127`	`+ [Test]`
	`128`	`+ public void DefaultNullValueForParams()`
	`129`	`+ {`
	`130`	`+ var member = GetMethod(typeof(SomeGenericClass<>), m => m.Name == "SomeMethod4");`
	`131`	`+ var sig = formatter.GetDeclaration(member);`
	`132`	`+ Assert.AreEqual("Public Sub SomeMethod4 (ByRef a As String, t As T, Optional b As Object = Nothing)", sig);`
	`133`	`+ }`
	`134`	`+`
`127`	`135`	`#region Helper Methods`
`128`	`136`	`string RealTypeName(string name)`
`129`	`137`	`{`