Bugfix method call changing overload wasn't removing the proper inputs and outputs

snakex64 · snakex64 · commit 379af0e6226d · 2023-11-09T20:30:59.000-05:00
diff --git a/src/NodeDev.Core/Nodes/MethodCall.cs b/src/NodeDev.Core/Nodes/MethodCall.cs
@@ -95,23 +95,24 @@ public override void SelectOverload(AlternateOverload overload, out List<Connect
 		}
 
 		// assumes that every parameters is a real type
-		var method = parentType.GetMethods().FirstOrDefault(x => x.Name == TargetMethod.Name && overload.Parameters.Select(x => x.ParameterType).SequenceEqual(overload.Parameters.Select(x => x.ParameterType))); ;
+		var method = parentType.GetMethods().FirstOrDefault(x => x.Name == TargetMethod.Name && overload.Parameters.Select(x => x.ParameterType).SequenceEqual(overload.Parameters.Select(x => x.ParameterType)));
 		if (method == null)
 			throw new Exception("Unable to find method overload");
 
 		if (method.ReturnType != overload.ReturnType)
 			throw new Exception("Return type mismatch");
 
 		// remove the old connections, except the Exec inputs and outputs
-		removedConnections = Inputs.Skip(1).Concat(Outputs.Skip(1)).ToList();
+		removedConnections = Inputs.Skip(2).Append(Inputs[0]).Concat(Outputs.Skip(1)).ToList();
+		Inputs.RemoveAt(0);
 		Inputs.RemoveRange(1, Inputs.Count - 1);
 		Outputs.RemoveRange(1, Outputs.Count - 1);
 
 		// Set the new method, this will add all the required inputs and outputs
 		SetMethodTarget(method);
 
 		// return the new connections
-		newConnections = Inputs.Skip(1).Concat(Outputs.Skip(1)).ToList();
+		newConnections = Inputs.Take(1).Concat(Inputs.Skip(2)).Concat(Outputs.Skip(1)).ToList();
 	}
 
 	public void SetMethodTarget(IMethodInfo methodInfo)
diff --git a/src/NodeDev.Core/Types/RealMethodParameterInfo.cs b/src/NodeDev.Core/Types/RealMethodParameterInfo.cs
@@ -40,7 +40,9 @@ public TypeBase ParameterType
 	{
 		get
 		{
-			if (ParameterInfo.ParameterType.IsGenericType)
+			if(ParameterInfo.ParameterType.IsGenericParameter)
+				return DeclaringRealType.Generics[ParameterInfo.ParameterType.GenericParameterPosition];
+			else if (ParameterInfo.ParameterType.IsGenericType)
 			{
 				var generics = ReplaceGenericsRecursively(ParameterInfo.ParameterType).ToArray();
 				return TypeFactory.Get(ParameterInfo.ParameterType, generics);

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,9 @@ public TypeBase ParameterType`
`40`	`40`	`{`
`41`	`41`	`get`
`42`	`42`	`{`
`43`		`- if (ParameterInfo.ParameterType.IsGenericType)`
	`43`	`+ if(ParameterInfo.ParameterType.IsGenericParameter)`
	`44`	`+ return DeclaringRealType.Generics[ParameterInfo.ParameterType.GenericParameterPosition];`
	`45`	`+ else if (ParameterInfo.ParameterType.IsGenericType)`
`44`	`46`	`{`
`45`	`47`	`var generics = ReplaceGenericsRecursively(ParameterInfo.ParameterType).ToArray();`
`46`	`48`	`return TypeFactory.Get(ParameterInfo.ParameterType, generics);`