- fixes a conflict when adding types wrappers

microsoft · Sep 20, 2023 · 771fbf1 · 771fbf1
1 parent c909ca7
commit 771fbf1
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/src/Kiota.Builder/CodeDOM/CodeBlock.cs b/src/Kiota.Builder/CodeDOM/CodeBlock.cs
@@ -75,6 +75,7 @@ private T HandleDuplicatedExceptions<T>(T element, CodeElement returnedValue) wh
         if (returnedValue == element)
             return element;
         if (element is CodeMethod currentMethod)
+        {
             if (currentMethod.IsOfKind(CodeMethodKind.IndexerBackwardCompatibility) &&
                 returnedValue is CodeProperty cProp &&
                 cProp.IsOfKind(CodePropertyKind.RequestBuilder) &&
@@ -99,6 +100,21 @@ returnedValue is CodeProperty cProp &&
                         return result2;
                 }
             }
+        }
+        else if (element is CodeProperty currentProperty)
+        {
+            if (currentProperty.Kind is CodePropertyKind.Custom &&
+                returnedValue is CodeClass returnedClass && returnedClass.Kind is CodeClassKind.Model &&
+                InnerChildElements.TryAdd($"{element.Name}-property", currentProperty))
+                return element; // inline type property: transforming union type to wrapper class
+        }
+        else if (element is CodeClass currentClass)
+        {
+            if (currentClass.Kind is CodeClassKind.Model &&
+                returnedValue is CodeProperty returnedProperty && returnedProperty.Kind is CodePropertyKind.Custom &&
+                InnerChildElements.TryAdd($"{element.Name}-model", currentClass))
+                return element; // inline type property: transforming wrapper class to union type
+        }
 
         if (element.GetType() == returnedValue.GetType())
             return (T)returnedValue;