moving the fix introduced in last iteration from ExpressionBuilder an…

…d add it to the correct location
Azure · Feb 7, 2025 · dea5122 · dea5122
1 parent 4bc280e
commit dea5122
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/src/Bicep.Core/Emit/PlaceholderParametersBicepParamWriter.cs b/src/Bicep.Core/Emit/PlaceholderParametersBicepParamWriter.cs
@@ -109,10 +109,10 @@ public static SyntaxBase GetValueForParameter(ParameterDeclarationSyntax syntax,
                     {
                         if (e.Value is FunctionCallSyntax valueAsFunctionCall)
                         {
-                            return SyntaxFactory.CreateArrayItem(CreateCommentSyntaxForFunctionCallSyntax(valueAsFunctionCall.Name.IdentifierName, isJsonParamWriter));
+                            return SyntaxFactory.CreateArrayItem(CreateCommentSyntaxForFunctionCallSyntax(valueAsFunctionCall.Name.IdentifierName, isJsonParamWriter)).Value;
                         }
 
-                        return e;
+                        return e.Value;
                     }).ToList();
 
                     return SyntaxFactory.CreateArray(value);

diff --git a/src/Bicep.Core/Emit/PlaceholderParametersJsonWriter.cs b/src/Bicep.Core/Emit/PlaceholderParametersJsonWriter.cs
@@ -102,7 +102,8 @@ private JToken GenerateTemplate(string contentVersion)
 
                     jsonWriter.WriteStartObject();
 
-                    // emit value property only if the value is not a newline token
+                    // Emit value property only if the value is not a newline token.
+                    // GetValueForParameter return TokenType.NewLine when syntax of assigning the value is not correct
                     if (value is not Token { Type: TokenType.NewLine})
                     {
                         emitter.EmitProperty("value", value);

diff --git a/src/Bicep.Core/Intermediate/ExpressionBuilder.cs b/src/Bicep.Core/Intermediate/ExpressionBuilder.cs
@@ -735,17 +735,7 @@ void completePreviousChunk()
             }
             else if (child is ArrayItemSyntax arrayItem)
             {
-                if (arrayItem.Value is not null && arrayItem.Value is ArrayItemSyntax arrayItemInside)
-                {
-                    currentChunk.Add(ConvertWithoutLowering(arrayItemInside.Value));
-                }
-                else
-                {
-                    if (arrayItem.Value is not null)
-                    {
-                        currentChunk.Add(ConvertWithoutLowering(arrayItem.Value));
-                    }
-                }
+                currentChunk.Add(ConvertWithoutLowering(arrayItem.Value));
             }
         }
         completePreviousChunk();