[mono-api-html] Fix bogus IgnoreParameterNameChanges behavior.
authorAtsushi Eno <atsushieno@gmail.com>
Tue, 1 Aug 2017 06:33:55 +0000 (15:33 +0900)
committerMarek Safar <marek.safar@gmail.com>
Wed, 2 Aug 2017 19:26:08 +0000 (21:26 +0200)
It never ignored parameter name changes. Make the entire code just simple.

mcs/tools/mono-api-html/MemberComparer.cs

index 2acb5ca3f5ac98c5c743ea4235ce938a46b4ecb9..72eed73390fec879e2d77b51835d648ec50c38d3 100644 (file)
@@ -374,7 +374,7 @@ namespace Xamarin.ApiDiff {
                                                change.Append (paramSourceType);
                                        }
                                        change.Append (" ");
-                                       if (paramSourceName != paramTargetName) {
+                                       if (!State.IgnoreParameterNameChanges && paramSourceName != paramTargetName) {
                                                change.AppendModified (paramSourceName, paramTargetName, true);
                                        } else {
                                                change.Append (paramSourceName);
@@ -404,12 +404,6 @@ namespace Xamarin.ApiDiff {
                        }
 
                        change.Append (")");
-
-                       // Ignore any parameter name changes if requested.
-                       if (State.IgnoreParameterNameChanges && !change.Breaking) {
-                               change.AnyChange = false;
-                               change.HasIgnoredChanges = true;
-                       }
                }
 
                void RenderVTable (MethodAttributes source, MethodAttributes target, ApiChange change)