Visitor fixes (#4217)

microsoft · Aug 20, 2024 · 1fba540 · 1fba540
1 parent 9961dbe
commit 1fba540
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/LibraryVisitor.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/LibraryVisitor.cs
@@ -96,17 +96,17 @@ internal virtual void Visit(OutputLibrary library)
 
         protected internal virtual TypeProvider? Visit(InputModelType model, TypeProvider? type)
         {
-            return new ModelProvider(model);
+            return type;
         }
 
         protected internal virtual PropertyProvider? Visit(InputModelProperty property, PropertyProvider? propertyProvider)
         {
-            return new PropertyProvider(property);
+            return propertyProvider;
         }
 
         protected internal virtual TypeProvider? Visit(InputEnumType enumType, TypeProvider? type)
         {
-            return EnumProvider.Create(enumType, type);
+            return type;
         }
 
         protected virtual TypeProvider? Visit(TypeProvider type)

diff --git a/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/TypeFactory.cs b/packages/http-client-csharp/generator/Microsoft.Generator.CSharp/src/TypeFactory.cs
@@ -206,7 +206,7 @@ internal CSharpType CreatePrimitiveCSharpType(InputType inputType)
             }
             foreach (var visitor in Visitors)
             {
-                type = visitor.Visit(enumType, declaringType);
+                type = visitor.Visit(enumType, type);
             }
             return type;
         }

diff --git a/.../http-client-csharp/generator/Microsoft.Generator.CSharp/test/InputLibraryVisitorTests.cs b/.../http-client-csharp/generator/Microsoft.Generator.CSharp/test/InputLibraryVisitorTests.cs
@@ -57,7 +57,7 @@ public void PreVisitsEnum()
 
             _mockVisitor.Protected().Verify<TypeProvider>("Visit", Times.Once(), inputModel, ItExpr.Is<ModelProvider>(m => m.Name == new ModelProvider(inputModel).Name));
 
-            _mockVisitor.Protected().Verify<TypeProvider>("Visit", Times.Once(), inputEnum, ItExpr.IsNull<EnumProvider>());
+            _mockVisitor.Protected().Verify<TypeProvider>("Visit", Times.Once(), inputEnum, ItExpr.Is<EnumProvider>(m => m.Name == EnumProvider.Create(inputEnum, null).Name));
         }
 
         [Test]
@@ -117,7 +117,7 @@ public PreVisitor(bool cleanupReference = false)
                 {
                     return null;
                 }
-                return base.Visit(inputModelProperty, propertyProvider);
+                return new PropertyProvider(inputModelProperty);
             }
         }
     }