- fixes reserved names replacement

Signed-off-by: Vincent Biret <vibiret@microsoft.com>
microsoft · Aug 9, 2023 · 5fe47b0 · 5fe47b0
1 parent b7bb9ff
commit 5fe47b0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/Kiota.Builder/Refiners/CommonLanguageRefiner.cs b/src/Kiota.Builder/Refiners/CommonLanguageRefiner.cs
@@ -118,16 +118,18 @@ protected static void CorrectNames(CodeElement current, Func<string, string> ref
         ArgumentNullException.ThrowIfNull(refineName);
         if (current is CodeClass currentClass && classNames &&
             refineName(currentClass.Name) is string refinedClassName &&
-            !currentClass.Name.Equals(refinedClassName, StringComparison.Ordinal))
+            !currentClass.Name.Equals(refinedClassName, StringComparison.Ordinal) &&
+            currentClass.Parent is IBlock parentBlock)
         {
-            currentClass.Name = refinedClassName;
+            parentBlock.RenameChildElement(currentClass.Name, refinedClassName);
         }
         else if (current is CodeEnum currentEnum &&
             enumNames &&
             refineName(currentEnum.Name) is string refinedEnumName &&
-            !currentEnum.Name.Equals(refinedEnumName, StringComparison.Ordinal))
+            !currentEnum.Name.Equals(refinedEnumName, StringComparison.Ordinal) &&
+            currentEnum.Parent is IBlock parentBlock2)
         {
-            currentEnum.Name = refinedEnumName;
+            parentBlock2.RenameChildElement(currentEnum.Name, refinedEnumName);
         }
         CrawlTree(current, x => CorrectNames(x, refineName));
     }
@@ -146,7 +148,7 @@ current.Parent is CodeClass parentClass &&
 
             var refinedName = refineAccessorName(currentProperty.Name);
             if (!parentClass.Properties.Any(property => refinedName.Equals(property.Name, StringComparison.OrdinalIgnoreCase)))// ensure the refinement won't generate a duplicate
-                currentProperty.Name = refinedName;
+                parentClass.RenameChildElement(currentProperty.Name, refinedName);
         }
         CrawlTree(current, x => ReplacePropertyNames(x, propertyKindsToReplace!, refineAccessorName));
     }

diff --git a/src/Kiota.Builder/Refiners/RubyReservedNamesProvider.cs b/src/Kiota.Builder/Refiners/RubyReservedNamesProvider.cs
@@ -43,6 +43,7 @@ public class RubyReservedNamesProvider : IReservedNamesProvider
         "self",
         "BaseRequestBuilder",
         "ObjectId",
+        "object_id",
     });
     public HashSet<string> ReservedNames => _reservedNames.Value;
 }