Imported Upstream version 5.18.0.142

Former-commit-id: 7467d4b717762eeaf652d77f1486dd11ffb1ff1f
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-10-09 08:20:59 +00:00
parent e52655b4dc
commit 0abdbe5a7d
1547 changed files with 93792 additions and 47893 deletions

View File

@ -30,10 +30,15 @@ using System.Reflection;
using System.Text;
using System.Xml.Linq;
namespace Xamarin.ApiDiff {
namespace Mono.ApiTools {
// MethodComparer inherits from this one
public class ConstructorComparer : MemberComparer {
class ConstructorComparer : MemberComparer {
public ConstructorComparer (State state)
: base (state)
{
}
public override string GroupName {
get { return "constructors"; }
@ -50,8 +55,8 @@ namespace Xamarin.ApiDiff {
void RenderReturnType (XElement source, XElement target, ApiChange change)
{
var srcType = source.GetTypeName ("returntype");
var tgtType = target.GetTypeName ("returntype");
var srcType = source.GetTypeName ("returntype", State);
var tgtType = target.GetTypeName ("returntype", State);
if (srcType != tgtType) {
change.AppendModified (srcType, tgtType, true);
@ -68,7 +73,7 @@ namespace Xamarin.ApiDiff {
if (base.Equals (source, target, changes))
return true;
var change = new ApiChange (GetDescription (source));
var change = new ApiChange (GetDescription (source), State);
change.Header = "Modified " + GroupName;
RenderMethodAttributes (source, target, change);
RenderReturnType (source, target, change);
@ -106,7 +111,7 @@ namespace Xamarin.ApiDiff {
string name = e.GetAttribute ("name");
var r = e.GetTypeName ("returntype");
var r = e.GetTypeName ("returntype", State);
if (r != null) {
// ctor dont' have a return type
sb.Append (r).Append (' ');
@ -123,7 +128,7 @@ namespace Xamarin.ApiDiff {
if (genericp != null) {
var list = new List<string> ();
foreach (var p in genericp.Elements ("generic-parameter")) {
list.Add (p.GetTypeName ("name"));
list.Add (p.GetTypeName ("name", State));
}
sb.Append (Formatter.LesserThan).Append (String.Join (", ", list)).Append (Formatter.GreaterThan);
}
@ -133,7 +138,7 @@ namespace Xamarin.ApiDiff {
if (parameters != null) {
var list = new List<string> ();
foreach (var p in parameters.Elements ("parameter")) {
var param = p.GetTypeName ("type");
var param = p.GetTypeName ("type", State);
if (!State.IgnoreParameterNameChanges)
param += " " + p.GetAttribute ("name");