fb

Author: christothes

codegen/generator/src/Visitors/MetadataQueryParamVisitor.cs

@@ -103,10 +103,10 @@ dictionaryExpression.Original is VariableExpression variable &&
                         variable.Declaration.RequestedName == "metadata")
                     {
                         var formatString = new FormattableStringExpression("metadata[{0}]", [foreachStatement.ItemVariable.Property("Key")]);
-                        var appendQueryStatement = uri.Invoke("AppendQuery", [formatString, foreachStatement.ItemVariable.Property("Value"), new KeywordExpression("true", null)]);
+                        var appendQueryStatement = uri.Invoke("AppendQuery", [formatString, foreachStatement.ItemVariable.Property("Value"), Snippet.True]);
                         foreachStatement.Body.Clear();
                         foreachStatement.Body.Add(new SingleLineCommentStatement("Plugin customization: Properly handle metadata query parameters"));
-                        foreachStatement.Body.Add(new ExpressionStatement(appendQueryStatement));
+                        foreachStatement.Body.Add(appendQueryStatement.Terminate());
                     }
 
                     // Remove the call to AppendQueryDelimited for metadata

codegen/generator/src/Visitors/PaginationVisitor.cs

@@ -93,20 +93,20 @@ private bool TryHandlePaginationMethodWithOptions(MethodProvider method)
                 {
                     newParameters.Insert(
                         lastRemovedIndex,
-                        new ParameterProvider("options", $"The pagination options", optionsType.Type, defaultValue: new KeywordExpression("default", null)));
+                        new ParameterProvider("options", $"The pagination options", optionsType.Type, defaultValue: Snippet.Default));
 
                     var newSignature = new MethodSignature(
-                    methodSignature.Name,
-                    methodSignature.Description,
-                    methodSignature.Modifiers,
-                    methodSignature.ReturnType,
-                    methodSignature.ReturnDescription,
-                    newParameters,
-                    methodSignature.Attributes,
-                    methodSignature.GenericArguments,
-                    methodSignature.GenericParameterConstraints,
-                    methodSignature.ExplicitInterface,
-                    methodSignature.NonDocumentComment);
+                        methodSignature.Name,
+                        methodSignature.Description,
+                        methodSignature.Modifiers,
+                        methodSignature.ReturnType,
+                        methodSignature.ReturnDescription,
+                        newParameters,
+                        methodSignature.Attributes,
+                        methodSignature.GenericArguments,
+                        methodSignature.GenericParameterConstraints,
+                        methodSignature.ExplicitInterface,
+                        methodSignature.NonDocumentComment);
 
                     var optionsParam = newParameters[lastRemovedIndex];
 
@@ -212,7 +212,7 @@ binaryExpr.Right is KeywordExpression rightKeyword &&
                                     var hasMoreNullCheck = new BinaryOperatorExpression(
                                         "==",
                                         new MemberExpression(null, "hasMore"),
-                                        new KeywordExpression("false", null));
+                                        Snippet.False);
 
                                     // Return "nextToken == null || hasMore == null"
                                     return new BinaryOperatorExpression("||", binaryExpr, hasMoreNullCheck);
@@ -244,7 +244,7 @@ assignmentExpression.Value is MemberExpression memberExpression &&
                                     new MemberExpression(memberExpression.Inner, "HasMore"));
 
                                 // Insert the new assignment before the existing one
-                                statementList.Insert(i, new ExpressionStatement(hasMoreAssignment));
+                                statementList.Insert(i, hasMoreAssignment.Terminate());
                                 statementList.Insert(i, new SingleLineCommentStatement("Plugin customization: add hasMore assignment"));
                                 var updatedWhileStatement = new WhileStatement(whileStatement.Condition);
                                 foreach (MethodBodyStatement bodyStatement in statementList)