[generator] Output correct formatting for binding warnings (#737)

jpobst · web-flow · commit 9c73dbff2d13 · 2020-10-15T10:54:31.000-04:00
In d664e90 we refactored some output around binding warning messages in order to better support localization. Unfortunately this refactoring left out a period between some type and member names: warning BG8700: Unknown return type 'Android.App.Admin.AppOpsManagerMode' for member 'Android.App.AppOpsManagerUnsafeCheckOp (java.lang.String, int, java.lang.String)'. `Android.App.AppOpsManagerUnsafeCheckOp` should instead be `Android.App.AppOpsManager.UnsafeCheckOp`. Fix `CodeGeneratorContext.GetContextTypeMember()` so that `.`s are inserted everywhere required.
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorContextTests.cs b/tests/generator-Tests/Unit-Tests/CodeGeneratorContextTests.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Linq;
+using MonoDroid.Generation;
+using NUnit.Framework;
+
+namespace generatortests
+{
+	[TestFixture]
+	public class CodeGeneratorContextTests
+	{
+		[Test]
+		public void GetContextTypeMember ()
+		{
+			var klass = new TestClass ("Object", "java.code.MyClass");
+
+			klass.AddMethod (SupportTypeBuilder.CreateMethod (klass, "Echo", new CodeGenerationOptions (), "uint", false, false, new Parameter ("value", "uint", "uint", false)));
+			klass.AddField (new TestField ("string", "Foo"));
+
+			var context = new CodeGeneratorContext ();
+			context.ContextTypes.Push (klass);
+
+			Assert.AreEqual ("java.code.MyClass", context.GetContextTypeMember ());
+
+			context.ContextMethod = klass.Methods.Single ();
+
+			Assert.AreEqual ("java.code.MyClass.Echo (uint)", context.GetContextTypeMember ());
+
+			context.ContextMethod = null;
+			context.ContextField = klass.Fields.Single ();
+
+			Assert.AreEqual ("java.code.MyClass.Foo", context.GetContextTypeMember ());
+
+			context.ContextMethod = klass.Methods.Single ();
+			context.ContextField = null;
+			context.ContextTypes.Clear ();
+
+			Assert.AreEqual ("Echo (uint)", context.GetContextTypeMember ());
+		}
+	}
+}
diff --git a/tools/generator/CodeGeneratorContext.cs b/tools/generator/CodeGeneratorContext.cs
@@ -19,14 +19,19 @@ public class CodeGeneratorContext
 
 		public string GetContextTypeMember ()
 		{
-			var output = ContextType?.FullName ?? string.Empty;
+			var parts = new List<string> ();
 
-			if (ContextMethod != null) {
-				output += $"{ContextMethod.Name} ({string.Join (", ", ContextMethod?.Parameters.Select (p => p.InternalType).ToArray ())})";
-				return output;
-			}
+			// Type name
+			if (!string.IsNullOrEmpty (ContextType?.FullName))
+				parts.Add (ContextType?.FullName);
 
-			return output + ContextField?.Name;
+			// Member name
+			if (ContextMethod != null)
+				parts.Add ($"{ContextMethod.Name} ({string.Join (", ", ContextMethod?.Parameters.Select (p => p.InternalType).ToArray ())})");
+			else if (ContextField != null)
+				parts.Add (ContextField.Name);
+
+			return string.Join (".", parts);
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,19 @@ public class CodeGeneratorContext`
`19`	`19`
`20`	`20`	`public string GetContextTypeMember ()`
`21`	`21`	`{`
`22`		`- var output = ContextType?.FullName ?? string.Empty;`
	`22`	`+ var parts = new List<string> ();`
`23`	`23`
`24`		`- if (ContextMethod != null) {`
`25`		`- output += $"{ContextMethod.Name} ({string.Join (", ", ContextMethod?.Parameters.Select (p => p.InternalType).ToArray ())})";`
`26`		`- return output;`
`27`		`- }`
	`24`	`+ // Type name`
	`25`	`+ if (!string.IsNullOrEmpty (ContextType?.FullName))`
	`26`	`+ parts.Add (ContextType?.FullName);`
`28`	`27`
`29`		`- return output + ContextField?.Name;`
	`28`	`+ // Member name`
	`29`	`+ if (ContextMethod != null)`
	`30`	`+ parts.Add ($"{ContextMethod.Name} ({string.Join (", ", ContextMethod?.Parameters.Select (p => p.InternalType).ToArray ())})");`
	`31`	`+ else if (ContextField != null)`
	`32`	`+ parts.Add (ContextField.Name);`
	`33`	`+`
	`34`	`+ return string.Join (".", parts);`
`30`	`35`	`}`
`31`	`36`	`}`
`32`	`37`	`}`