fix parameter mapping for provider namespace (#3070)

fengzhou-msft · web-flow · commit 9e378453f9b7 · 2023-02-07T00:01:43.000+08:00
diff --git a/src/AutoRest.CSharp/Mgmt/Decorator/ParameterMappingBuilder.cs b/src/AutoRest.CSharp/Mgmt/Decorator/ParameterMappingBuilder.cs
@@ -77,6 +77,7 @@ private static void BuildContextualParameterMappingHierarchy(RequestPath current
                 // get the segment in pairs
                 var segmentPairs = SplitDiffIntoPairs(diffPath).ToList();
                 var indexOfProvidersPair = segmentPairs.FindIndex(pair => pair[0] == Segment.Providers);
+                var resourceTypeIdVariableName = idVariableName;
                 // from the tail, check these segments in pairs
                 for (int i = 0; i < segmentPairs.Count; i++)
                 {
@@ -99,7 +100,7 @@ private static void BuildContextualParameterMappingHierarchy(RequestPath current
                                 }
                                 else
                                 {
-                                    parameterMappingStack.Push(new ContextualParameterMapping(keySegment.ConstantValue, valueSegment, $"{idVariableName}.ResourceType.Namespace"));
+                                    parameterMappingStack.Push(new ContextualParameterMapping(keySegment.ConstantValue, valueSegment, $"{resourceTypeIdVariableName}.ResourceType.Namespace"));
                                 }
                                 // do not append a new .Parent to the id
                             }
@@ -120,6 +121,7 @@ private static void BuildContextualParameterMappingHierarchy(RequestPath current
                         if (keySegment.IsReference)
                         {
                             parameterMappingStack.Push(new ContextualParameterMapping(string.Empty, keySegment, $"{idVariableName}{invocationSuffix}.ResourceType.GetLastType()", new[] { "System.Linq" }));
+                            resourceTypeIdVariableName = $"{idVariableName}{invocationSuffix}";
                             appendParent = true;
                         }
                         else if (keySegment.IsExpandable)

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ private static void BuildContextualParameterMappingHierarchy(RequestPath current`
`77`	`77`	`// get the segment in pairs`
`78`	`78`	`var segmentPairs = SplitDiffIntoPairs(diffPath).ToList();`
`79`	`79`	`var indexOfProvidersPair = segmentPairs.FindIndex(pair => pair[0] == Segment.Providers);`
	`80`	`+ var resourceTypeIdVariableName = idVariableName;`
`80`	`81`	`// from the tail, check these segments in pairs`
`81`	`82`	`for (int i = 0; i < segmentPairs.Count; i++)`
`82`	`83`	`{`
`@@ -99,7 +100,7 @@ private static void BuildContextualParameterMappingHierarchy(RequestPath current`
`99`	`100`	`}`
`100`	`101`	`else`
`101`	`102`	`{`
`102`		`- parameterMappingStack.Push(new ContextualParameterMapping(keySegment.ConstantValue, valueSegment, $"{idVariableName}.ResourceType.Namespace"));`
	`103`	`+ parameterMappingStack.Push(new ContextualParameterMapping(keySegment.ConstantValue, valueSegment, $"{resourceTypeIdVariableName}.ResourceType.Namespace"));`
`103`	`104`	`}`
`104`	`105`	`// do not append a new .Parent to the id`
`105`	`106`	`}`
`@@ -120,6 +121,7 @@ private static void BuildContextualParameterMappingHierarchy(RequestPath current`
`120`	`121`	`if (keySegment.IsReference)`
`121`	`122`	`{`
`122`	`123`	`parameterMappingStack.Push(new ContextualParameterMapping(string.Empty, keySegment, $"{idVariableName}{invocationSuffix}.ResourceType.GetLastType()", new[] { "System.Linq" }));`
	`124`	`+ resourceTypeIdVariableName = $"{idVariableName}{invocationSuffix}";`
`123`	`125`	`appendParent = true;`
`124`	`126`	`}`
`125`	`127`	`else if (keySegment.IsExpandable)`