Merge branch 'feature/v3' into phase1-of-additionalproperties

Azure · Apr 15, 2024 · 0c5b0df · 0c5b0df
2 parents 03fc0e3 + c8ab8cc
commit 0c5b0df
Show file tree

Hide file tree

Showing 9 changed files with 90 additions and 18 deletions.
diff --git a/src/AutoRest.CSharp/Common/Output/Expressions/Statements/CatchStatement.cs b/src/AutoRest.CSharp/Common/Output/Expressions/Statements/CatchStatement.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using AutoRest.CSharp.Common.Output.Expressions.ValueExpressions;
+using AutoRest.CSharp.Generation.Writers;
+
+namespace AutoRest.CSharp.Common.Output.Expressions.Statements
+{
+    internal record CatchStatement(ValueExpression? Exception, MethodBodyStatement Body)
+    {
+        public void Write(CodeWriter writer)
+        {
+            writer.AppendRaw("catch");
+            if (Exception != null)
+            {
+                writer.AppendRaw(" (");
+                Exception.Write(writer);
+                writer.AppendRaw(")");
+            }
+            writer.LineRaw("{");
+            Body.Write(writer);
+            writer.LineRaw("}");
+        }
+    }
+}
diff --git a/src/AutoRest.CSharp/Common/Output/Expressions/Statements/ForStatement.cs b/src/AutoRest.CSharp/Common/Output/Expressions/Statements/ForStatement.cs
@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using AutoRest.CSharp.Common.Output.Expressions.KnownValueExpressions;
 using AutoRest.CSharp.Common.Output.Expressions.ValueExpressions;
-using AutoRest.CSharp.Common.Output.Models;
 using AutoRest.CSharp.Generation.Writers;
 
 namespace AutoRest.CSharp.Common.Output.Expressions.Statements

diff --git a/src/AutoRest.CSharp/Common/Output/Expressions/Statements/TryCatchFinallyStatement.cs b/src/AutoRest.CSharp/Common/Output/Expressions/Statements/TryCatchFinallyStatement.cs
@@ -1,7 +1,32 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+using System.Collections.Generic;
+using AutoRest.CSharp.Generation.Writers;
+
 namespace AutoRest.CSharp.Common.Output.Expressions.Statements
 {
-    internal record TryCatchFinallyStatement(MethodBodyStatement Try, MethodBodyStatement? Catch, MethodBodyStatement? Finally) : MethodBodyStatement;
+    internal record TryCatchFinallyStatement(MethodBodyStatement Try, IReadOnlyList<CatchStatement> Catches, MethodBodyStatement? Finally) : MethodBodyStatement
+    {
+        public override void Write(CodeWriter writer)
+        {
+            writer.LineRaw("try");
+            writer.LineRaw("{");
+            Try.Write(writer);
+            writer.LineRaw("}");
+
+            foreach (var catchStatement in Catches)
+            {
+                catchStatement.Write(writer);
+            }
+
+            if (Finally != null)
+            {
+                writer.LineRaw("finally");
+                writer.LineRaw("{");
+                Finally.Write(writer);
+                writer.LineRaw("}");
+            }
+        }
+    }
 }
diff --git a/src/AutoRest.CSharp/Common/Output/Expressions/Statements/WhileStatement.cs b/src/AutoRest.CSharp/Common/Output/Expressions/Statements/WhileStatement.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System.Collections;
+using System.Collections.Generic;
+using AutoRest.CSharp.Common.Output.Expressions.KnownValueExpressions;
+using AutoRest.CSharp.Generation.Writers;
+
+namespace AutoRest.CSharp.Common.Output.Expressions.Statements
+{
+    internal record WhileStatement(BoolExpression Condition) : MethodBodyStatement, IEnumerable<MethodBodyStatement>
+    {
+        private readonly List<MethodBodyStatement> _body = new();
+        public IReadOnlyList<MethodBodyStatement> Body => _body;
+
+        public void Add(MethodBodyStatement statement) => _body.Add(statement);
+        public IEnumerator<MethodBodyStatement> GetEnumerator() => _body.GetEnumerator();
+        IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable)_body).GetEnumerator();
+
+        public sealed override void Write(CodeWriter writer)
+        {
+            using (writer.AmbientScope())
+            {
+                writer.AppendRaw("while (");
+                Condition.Write(writer);
+                writer.LineRaw(")");
+
+                writer.LineRaw("{");
+                foreach (var bodyStatement in Body)
+                {
+                    bodyStatement.Write(writer);
+                }
+                writer.LineRaw("}");
+            }
+        }
+    }
+}
diff --git a/...oRest.CSharp/Common/Output/Expressions/ValueExpressions/InvokeInstanceMethodExpression.cs b/...oRest.CSharp/Common/Output/Expressions/ValueExpressions/InvokeInstanceMethodExpression.cs
@@ -13,6 +13,8 @@ namespace AutoRest.CSharp.Common.Output.Expressions.ValueExpressions
     // [TODO]: AddConfigureAwaitFalse is needed only in docs. Consider removing.
     internal record InvokeInstanceMethodExpression(ValueExpression? InstanceReference, string MethodName, IReadOnlyList<ValueExpression> Arguments, IReadOnlyList<CSharpType>? TypeArguments, bool CallAsAsync, bool AddConfigureAwaitFalse = true) : ValueExpression
     {
+        public InvokeInstanceMethodExpression(ValueExpression? instanceReference, string methodName, IReadOnlyList<ValueExpression> arguments, bool callAsAsync) : this(instanceReference, methodName, arguments, null, callAsAsync) { }
+
         public InvokeInstanceMethodExpression(ValueExpression? instanceReference, MethodSignature signature, IReadOnlyList<ValueExpression> arguments, bool addConfigureAwaitFalse = true)
             : this(instanceReference, signature.Name, arguments, signature.GenericArguments, signature.Modifiers.HasFlag(MethodSignatureModifiers.Async), addConfigureAwaitFalse) { }
 

diff --git a/...itional-properties/src/Generated/Models/ExtendsModelAdditionalProperties.Serialization.cs b/...itional-properties/src/Generated/Models/ExtendsModelAdditionalProperties.Serialization.cs
@@ -30,7 +30,6 @@ void IJsonModel<ExtendsModelAdditionalProperties>.Write(Utf8JsonWriter writer, M
             foreach (var item in AdditionalProperties)
             {
                 writer.WritePropertyName(item.Key);
-<<<<<<< HEAD
 #if NET6_0_OR_GREATER
 				writer.WriteRawValue(item.Value);
 #else
@@ -39,9 +38,6 @@ <<<<<<< HEAD
                     JsonSerializer.Serialize(writer, document.RootElement);
                 }
 #endif
-=======
-                writer.WriteObjectValue(item.Value, options);
->>>>>>> origin/feature/v3
             }
             writer.WriteEndObject();
         }

diff --git a/...al-properties/src/Generated/Models/ExtendsModelArrayAdditionalProperties.Serialization.cs b/...al-properties/src/Generated/Models/ExtendsModelArrayAdditionalProperties.Serialization.cs
@@ -33,7 +33,6 @@ void IJsonModel<ExtendsModelArrayAdditionalProperties>.Write(Utf8JsonWriter writ
                 writer.WriteStartArray();
                 foreach (var item0 in item.Value)
                 {
-<<<<<<< HEAD
                     if (item0 == null)
                     {
                         writer.WriteNullValue();
@@ -47,9 +46,6 @@ <<<<<<< HEAD
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
 #endif
-=======
-                    writer.WriteObjectValue(item0, options);
->>>>>>> origin/feature/v3
                 }
                 writer.WriteEndArray();
             }

diff --git a/...y/additional-properties/src/Generated/Models/IsModelAdditionalProperties.Serialization.cs b/...y/additional-properties/src/Generated/Models/IsModelAdditionalProperties.Serialization.cs
@@ -30,7 +30,6 @@ void IJsonModel<IsModelAdditionalProperties>.Write(Utf8JsonWriter writer, ModelR
             foreach (var item in AdditionalProperties)
             {
                 writer.WritePropertyName(item.Key);
-<<<<<<< HEAD
 #if NET6_0_OR_GREATER
 				writer.WriteRawValue(item.Value);
 #else
@@ -39,9 +38,6 @@ <<<<<<< HEAD
                     JsonSerializer.Serialize(writer, document.RootElement);
                 }
 #endif
-=======
-                writer.WriteObjectValue(item.Value, options);
->>>>>>> origin/feature/v3
             }
             writer.WriteEndObject();
         }

diff --git a/...itional-properties/src/Generated/Models/IsModelArrayAdditionalProperties.Serialization.cs b/...itional-properties/src/Generated/Models/IsModelArrayAdditionalProperties.Serialization.cs
@@ -33,7 +33,6 @@ void IJsonModel<IsModelArrayAdditionalProperties>.Write(Utf8JsonWriter writer, M
                 writer.WriteStartArray();
                 foreach (var item0 in item.Value)
                 {
-<<<<<<< HEAD
                     if (item0 == null)
                     {
                         writer.WriteNullValue();
@@ -47,9 +46,6 @@ <<<<<<< HEAD
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
 #endif
-=======
-                    writer.WriteObjectValue(item0, options);
->>>>>>> origin/feature/v3
                 }
                 writer.WriteEndArray();
             }