Skip to content

Commit 249ba06

Browse files
levimatherilevimatheri
committed
Formatting
1 parent a60b239 commit 249ba06

File tree

2 files changed

+53
-60
lines changed

2 files changed

+53
-60
lines changed

‎src/Bicep.Core.IntegrationTests/Extensibility/NamespaceFunctionTests.cs‎

Lines changed: 51 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ [new NamespaceFunctionParameter("configKey", factory.GetReference(types.StringTy
3636
var services = new ServiceBuilder();
3737
var result = await CompilationHelper.RestoreAndCompile(services,
3838
("main.bicep", new("""
39-
extension '../extension.tgz' as ext
40-
var foo = ext.config('redis')
41-
""")),
39+
extension '../extension.tgz' as ext
40+
var foo = ext.config('redis')
41+
""")),
4242
("../extension.tgz", extensionTgz));
4343

4444
result.ExcludingLinterDiagnostics().Should().HaveDiagnostics(new[]
@@ -65,9 +65,9 @@ [new NamespaceFunctionParameter("myParam", factory.GetReference(types.StringType
6565
var services = new ServiceBuilder();
6666
var result = await CompilationHelper.RestoreAndCompile(services,
6767
("main.bicep", new("""
68-
extension '../extension.tgz' as ext
69-
var foo = ext.foo()
70-
""")),
68+
extension '../extension.tgz' as ext
69+
var foo = ext.foo()
70+
""")),
7171
("../extension.tgz", extensionTgz));
7272

7373
result.ExcludingLinterDiagnostics().Should().HaveDiagnostics(new[]
@@ -101,14 +101,13 @@ [new NamespaceFunctionParameter("sasUriConfig", factory.GetReference(sasUriConfi
101101
var services = new ServiceBuilder();
102102
var result = await CompilationHelper.RestoreAndCompileParams(services,
103103
("parameters.bicepparam", new("""
104-
using none
105-
106-
extension '../extension.tgz' as ext
107-
param servicePackageLink = ext.sasUri({
108-
pth: 'bin/service.sfpkg' // typo here
109-
isDirectory: 'false'
110-
})
111-
""")),
104+
using none
105+
extension '../extension.tgz' as ext
106+
param servicePackageLink = ext.sasUri({
107+
pth: 'bin/service.sfpkg' // typo here
108+
isDirectory: 'false'
109+
})
110+
""")),
112111
("../extension.tgz", extensionTgz));
113112

114113
result.ExcludingLinterDiagnostics().Should().ContainDiagnostic("BCP089", DiagnosticLevel.Error, "The property \"pth\" is not allowed on objects of type \"myConfig\". Did you mean \"path\"?");
@@ -133,16 +132,13 @@ public async Task Function_evaluation_failure_when_collecting_external_inputs_re
133132
var services = new ServiceBuilder();
134133
var result = await CompilationHelper.RestoreAndCompileParams(services,
135134
("parameters.bicepparam", new("""
136-
using none
137-
extension '../extension.tgz' as ext
138-
param myParam = ext.foo()
139-
""")),
135+
using none
136+
extension '../extension.tgz' as ext
137+
param myParam = ext.foo()
138+
""")),
140139
("../extension.tgz", extensionTgz));
141140

142-
result.ExcludingLinterDiagnostics().Should().HaveDiagnostics(new[]
143-
{
144-
("BCP338", DiagnosticLevel.Error, "Failed to evaluate function \"ext.foo()\": The template function 'unknown' is not valid. Please see https://aka.ms/arm-functions for usage details."),
145-
});
141+
result.Should().ContainDiagnostic("BCP338", DiagnosticLevel.Error, "Failed to evaluate function \"ext.foo()\": The template function 'unknown' is not valid. Please see https://aka.ms/arm-functions for usage details.");
146142
}
147143

148144
[TestMethod]
@@ -178,15 +174,15 @@ [new NamespaceFunctionParameter("sasUriConfig", factory.GetReference(sasUriConfi
178174
var services = new ServiceBuilder();
179175
var result = await CompilationHelper.RestoreAndCompileParams(services,
180176
("parameters.bicepparam", new("""
181-
using none
182-
extension '../extension.tgz' as ext
183-
param bar = ext.config('redis')
184-
param servicePackageLink = ext.sasUri({
185-
path: 'bin/service.sfpkg'
186-
isDirectory: false
187-
enableReplacements: true
188-
})
189-
""")),
177+
using none
178+
extension '../extension.tgz' as ext
179+
param bar = ext.config('redis')
180+
param servicePackageLink = ext.sasUri({
181+
path: 'bin/service.sfpkg'
182+
isDirectory: false
183+
enableReplacements: true
184+
})
185+
""")),
190186
("../extension.tgz", extensionTgz));
191187

192188
result.ExcludingLinterDiagnostics().Should().NotHaveAnyDiagnostics();
@@ -217,11 +213,9 @@ public async Task Function_with_multiple_external_input_request_compiles()
217213
{
218214
var extensionTgz = await GetExtensionTgz((factory, types) =>
219215
{
220-
var sasUriConfigType = factory.Create(() => new ObjectType("myConfig", new Dictionary<string, ObjectTypeProperty>
216+
var objectType = factory.Create(() => new ObjectType("myConfig", new Dictionary<string, ObjectTypeProperty>
221217
{
222218
["path"] = new(factory.GetReference(types.StringType), ObjectTypePropertyFlags.Required, "Path to artifact"),
223-
["isDirectory"] = new(factory.GetReference(types.BoolType), ObjectTypePropertyFlags.None, "Is a directory"),
224-
["enableReplacements"] = new(factory.GetReference(types.BoolType), ObjectTypePropertyFlags.None, "Enable replacements")
225219
}, null));
226220

227221
var concatConfigFunctionType = factory.Create(() => new NamespaceFunctionType(
@@ -231,7 +225,7 @@ public async Task Function_with_multiple_external_input_request_compiles()
231225
[
232226
new NamespaceFunctionParameter("config1", factory.GetReference(types.StringType), "The first configuration key parameter", NamespaceFunctionParameterFlags.Required),
233227
new NamespaceFunctionParameter("config2", factory.GetReference(types.IntType), "The second configuration key parameter", NamespaceFunctionParameterFlags.Required),
234-
new NamespaceFunctionParameter("config3", factory.GetReference(sasUriConfigType), "The third configuration key parameter", NamespaceFunctionParameterFlags.Required),
228+
new NamespaceFunctionParameter("config3", factory.GetReference(objectType), "The third configuration key parameter", NamespaceFunctionParameterFlags.Required),
235229
],
236230
factory.GetReference(types.AnyType),
237231
BicepSourceFileKind.ParamsFile));
@@ -241,14 +235,14 @@ public async Task Function_with_multiple_external_input_request_compiles()
241235
var services = new ServiceBuilder();
242236
var result = await CompilationHelper.RestoreAndCompileParams(services,
243237
("parameters.bicepparam", new("""
244-
using none
245-
246-
extension '../extension.tgz' as ext
247-
var lifeMeaning = 42
248-
param baz = ext.concatConfig(substring('hello world', 0, 5), lifeMeaning, {
249-
path: '/path/to/something'
250-
})
251-
""")),
238+
using none
239+
240+
extension '../extension.tgz' as ext
241+
var lifeMeaning = 42
242+
param baz = ext.concatConfig(substring('hello world', 0, 5), lifeMeaning, {
243+
path: '/path/to/something'
244+
})
245+
""")),
252246
("../extension.tgz", extensionTgz));
253247

254248
result.ExcludingLinterDiagnostics().Should().NotHaveAnyDiagnostics();
@@ -295,14 +289,13 @@ [new NamespaceFunctionParameter("config", factory.GetReference(endpointConfigTyp
295289
var services = new ServiceBuilder();
296290
var result = await CompilationHelper.RestoreAndCompileParams(services,
297291
("parameters.bicepparam", new("""
298-
using none
299-
300-
extension '../extension.tgz' as ext
301-
param endpoint = ext.getEndpoint({
302-
endpointId: 'endpointId'
303-
endpointName: 'endpointName'
304-
})
305-
""")),
292+
using none
293+
extension '../extension.tgz' as ext
294+
param endpoint = ext.getEndpoint({
295+
endpointId: 'endpointId'
296+
endpointName: 'endpointName'
297+
})
298+
""")),
306299
("../extension.tgz", extensionTgz));
307300

308301
result.ExcludingLinterDiagnostics().Should().NotHaveAnyDiagnostics();
@@ -334,10 +327,10 @@ [new NamespaceFunctionParameter("myParam", factory.GetReference(types.StringType
334327
var services = new ServiceBuilder();
335328
var result = await CompilationHelper.RestoreAndCompile(services,
336329
("main.bicep", new("""
337-
extension '../extension.tgz' as ext
338-
var result = ext.foo('myValue')
339-
var numberValue = result + 42
340-
""")),
330+
extension '../extension.tgz' as ext
331+
var result = ext.foo('myValue')
332+
var numberValue = result + 42
333+
""")),
341334
("../extension.tgz", extensionTgz));
342335

343336
result.ExcludingLinterDiagnostics().Should().HaveDiagnostics(new[]
@@ -372,9 +365,9 @@ [new NamespaceFunctionParameter("configKey", factory.GetReference(types.StringTy
372365
var services = new ServiceBuilder();
373366
var result = await CompilationHelper.RestoreAndCompile(services,
374367
("main.bicep", new("""
375-
extension '../extension.tgz' as ext
376-
var nested = ext.baz(ext.foo('innerValue'))
377-
""")),
368+
extension '../extension.tgz' as ext
369+
var nested = ext.baz(ext.foo('innerValue'))
370+
""")),
378371
("../extension.tgz", extensionTgz));
379372

380373
result.ExcludingLinterDiagnostics().Should().NotHaveAnyDiagnostics();

‎src/Bicep.Core/Emit/ExpressionConverter.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ public LanguageExpression ConvertExpression(Expression expression)
102102
function.Parameters.Select(ConvertExpression));
103103

104104
if (function.SourceSyntax is FunctionCallSyntaxBase functionCall &&
105-
context.SemanticModel.TypeManager.GetMatchedFunctionOverload(functionCall) is { ArmExpressionEvaluator: { } armExpressionEvaluator })
105+
context.SemanticModel.TypeManager.GetMatchedFunctionOverload(functionCall) is { ArmExpressionEvaluator: { } evaluator })
106106
{
107-
return armExpressionEvaluator(converted);
107+
return evaluator(converted);
108108
}
109109

110110
return converted;

0 commit comments

Comments
 (0)