From e7c4db393df2f881213cde9a195cb832fef0462c Mon Sep 17 00:00:00 2001 From: "microsoft-github-policy-service[bot]" <77245923+microsoft-github-policy-service[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 07:08:37 -0400 Subject: [PATCH] Reformat code (#13565) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update code to match the house style 😎 Co-authored-by: Bicep Automation --- .../ExtensibilityTests.cs | 2 +- .../SourceArchiveTests.cs | 4 +- .../Utils/OciRegistryHelper.cs | 2 +- src/Bicep.Core/BicepCompiler.cs | 2 +- .../Configuration/ProvidersConfiguration.cs | 6 +-- .../Emit/PlaceholderParametersJsonWriter.cs | 42 +++++++++---------- src/Bicep.Core/Registry/ArtifactRegistry.cs | 2 +- .../Registry/LocalModuleRegistry.cs | 2 +- .../Registry/TemplateSpecModuleRegistry.cs | 2 +- .../Semantics/DeclarationVisitor.cs | 2 +- .../SourceCodeDocumentLinkHelper.cs | 2 +- .../Providers/IProviderSpecification.cs | 2 +- .../Workspaces/SourceFileGroupingBuilder.cs | 8 ++-- .../BicepExternalSourceRequestHandlerTests.cs | 2 +- .../BicepExternalSourceDocumentLinkHandler.cs | 12 +++--- .../BicepExternalSourceRequestHandler.cs | 4 +- 16 files changed, 49 insertions(+), 47 deletions(-) diff --git a/src/Bicep.Core.IntegrationTests/ExtensibilityTests.cs b/src/Bicep.Core.IntegrationTests/ExtensibilityTests.cs index 0217089d8d5..72f8b1d7b0c 100644 --- a/src/Bicep.Core.IntegrationTests/ExtensibilityTests.cs +++ b/src/Bicep.Core.IntegrationTests/ExtensibilityTests.cs @@ -485,7 +485,7 @@ public void LegacyProvider_codefix_works() result.Should().HaveDiagnostics(new[] { ("BCP395", DiagnosticLevel.Warning, "Declaring provider namespaces using the '@' expression has been deprecated. Please use an identifier instead."), }); - + var diagnostic = result.Diagnostics.OfType().Single(); var fix = diagnostic.Fixes.Single(); diff --git a/src/Bicep.Core.IntegrationTests/SourceArchiveTests.cs b/src/Bicep.Core.IntegrationTests/SourceArchiveTests.cs index 44bb9d81314..a36aa9327b5 100644 --- a/src/Bicep.Core.IntegrationTests/SourceArchiveTests.cs +++ b/src/Bicep.Core.IntegrationTests/SourceArchiveTests.cs @@ -119,7 +119,7 @@ private SourceArchive CreateSourceArchive(IModuleDispatcher moduleDispatcher, So .UnwrapOrThrow(); } -#endregion + #endregion [TestMethod] public async Task SourceArtifactId_ForLocalModules_ShouldBeNull() @@ -313,7 +313,7 @@ public async Task SourceArtifactId_ShouldIgnoreModuleRefsWithErrors() result.Should().OnlyContainDiagnostic("BCP192", Diagnostics.DiagnosticLevel.Error, "Unable to restore the artifact with reference \"br:mockregistry.io/test/module2:v1\"*"); // act - var sourceArchive = CreateSourceArchive(moduleDispatcher,result); + var sourceArchive = CreateSourceArchive(moduleDispatcher, result); sourceArchive.SourceFiles.Select(sf => (sf.Path, sf.SourceArtifact?.FullyQualifiedReference)) .Should().BeEquivalentTo(new[] { diff --git a/src/Bicep.Core.UnitTests/Utils/OciRegistryHelper.cs b/src/Bicep.Core.UnitTests/Utils/OciRegistryHelper.cs index d2924d80328..6a22d092ec8 100644 --- a/src/Bicep.Core.UnitTests/Utils/OciRegistryHelper.cs +++ b/src/Bicep.Core.UnitTests/Utils/OciRegistryHelper.cs @@ -19,7 +19,7 @@ namespace Bicep.Core.UnitTests.Utils public static class OciRegistryHelper { public static OciArtifactReference CreateModuleReferenceMock(string registry, string repository, Uri parentModuleUri, string? digest, string? tag) - => new (ArtifactType.Module, registry, repository, tag, digest, parentModuleUri); + => new(ArtifactType.Module, registry, repository, tag, digest, parentModuleUri); public static OciArtifactReference ParseModuleReference(string moduleId /* with or without br: */, Uri? parentModuleUri = null) diff --git a/src/Bicep.Core/BicepCompiler.cs b/src/Bicep.Core/BicepCompiler.cs index dee878e5ae9..8cad1d5f6ec 100644 --- a/src/Bicep.Core/BicepCompiler.cs +++ b/src/Bicep.Core/BicepCompiler.cs @@ -115,7 +115,7 @@ static IEnumerable<(BicepSourceFile, IDiagnostic)> GetDiagnosticsForModulesToRes { foreach (var artifact in originalArtifactsToRestore) { - if (artifact.Syntax is {} && + if (artifact.Syntax is { } && DiagnosticForModule(grouping, artifact.Syntax) is { } diagnostic) { yield return (artifact.Origin, diagnostic); diff --git a/src/Bicep.Core/Configuration/ProvidersConfiguration.cs b/src/Bicep.Core/Configuration/ProvidersConfiguration.cs index 313a8d90d0a..f746b2ff752 100644 --- a/src/Bicep.Core/Configuration/ProvidersConfiguration.cs +++ b/src/Bicep.Core/Configuration/ProvidersConfiguration.cs @@ -16,7 +16,7 @@ public record ProviderConfigEntry public string Path { get; } - public string Scheme {get;} + public string Scheme { get; } public ProviderConfigEntry(string providerConfigEntry) { @@ -29,7 +29,7 @@ public ProviderConfigEntry(string providerConfigEntry) public override string ToString() { - return $"{this.Scheme}:{this.Path}"; + return $"{this.Scheme}:{this.Path}"; } } @@ -66,4 +66,4 @@ public override void WriteTo(Utf8JsonWriter writer) public bool IsSysOrBuiltIn(string providerName) => providerName == SystemNamespaceType.BuiltInName || this.Data.TryGetValue(providerName)?.BuiltIn == true; -} \ No newline at end of file +} diff --git a/src/Bicep.Core/Emit/PlaceholderParametersJsonWriter.cs b/src/Bicep.Core/Emit/PlaceholderParametersJsonWriter.cs index b862bc020b7..2f154755546 100644 --- a/src/Bicep.Core/Emit/PlaceholderParametersJsonWriter.cs +++ b/src/Bicep.Core/Emit/PlaceholderParametersJsonWriter.cs @@ -95,28 +95,28 @@ private JToken GenerateTemplate(string contentVersion) foreach (var parameterSymbol in filteredParameterDeclarations) { - jsonWriter.WritePropertyName(parameterSymbol.Name); + jsonWriter.WritePropertyName(parameterSymbol.Name); - jsonWriter.WriteStartObject(); - switch (parameterSymbol.Type.Name) - { - case "string": - emitter.EmitProperty("value", ""); - break; - case "int": - emitter.EmitProperty("value", () => jsonWriter.WriteValue(0)); - break; - case "bool": - emitter.EmitProperty("value", () => jsonWriter.WriteValue(false)); - break; - case "object": - emitter.EmitProperty("value", () => { jsonWriter.WriteStartObject(); jsonWriter.WriteEndObject(); }); - break; - case "array": - emitter.EmitProperty("value", () => { jsonWriter.WriteStartArray(); jsonWriter.WriteEndArray(); }); - break; - } - jsonWriter.WriteEndObject(); + jsonWriter.WriteStartObject(); + switch (parameterSymbol.Type.Name) + { + case "string": + emitter.EmitProperty("value", ""); + break; + case "int": + emitter.EmitProperty("value", () => jsonWriter.WriteValue(0)); + break; + case "bool": + emitter.EmitProperty("value", () => jsonWriter.WriteValue(false)); + break; + case "object": + emitter.EmitProperty("value", () => { jsonWriter.WriteStartObject(); jsonWriter.WriteEndObject(); }); + break; + case "array": + emitter.EmitProperty("value", () => { jsonWriter.WriteStartArray(); jsonWriter.WriteEndArray(); }); + break; + } + jsonWriter.WriteEndObject(); } jsonWriter.WriteEndObject(); diff --git a/src/Bicep.Core/Registry/ArtifactRegistry.cs b/src/Bicep.Core/Registry/ArtifactRegistry.cs index 946cde1b470..02d94f8159e 100644 --- a/src/Bicep.Core/Registry/ArtifactRegistry.cs +++ b/src/Bicep.Core/Registry/ArtifactRegistry.cs @@ -58,7 +58,7 @@ public Task PublishProvider(ArtifactReference reference, BinaryData typesTgz) public string? GetDocumentationUri(ArtifactReference reference) => this.TryGetDocumentationUri(ConvertReference(reference)); - public async Task TryGetModuleDescription(ModuleSymbol module, ArtifactReference reference) => + public async Task TryGetModuleDescription(ModuleSymbol module, ArtifactReference reference) => await this.TryGetModuleDescription(module, ConvertReference(reference)); public ResultWithException TryGetSource(ArtifactReference reference) => this.TryGetSource(ConvertReference(reference)); diff --git a/src/Bicep.Core/Registry/LocalModuleRegistry.cs b/src/Bicep.Core/Registry/LocalModuleRegistry.cs index 1b3766a433f..0dd1613703c 100644 --- a/src/Bicep.Core/Registry/LocalModuleRegistry.cs +++ b/src/Bicep.Core/Registry/LocalModuleRegistry.cs @@ -83,7 +83,7 @@ public override Task PublishProvider(LocalModuleReference reference, BinaryData public override Task TryGetModuleDescription(ModuleSymbol module, LocalModuleReference moduleReference) { - if (module.TryGetSemanticModel().TryUnwrap() is {} model) + if (module.TryGetSemanticModel().TryUnwrap() is { } model) { return Task.FromResult(DescriptionHelper.TryGetFromSemanticModel(model)); } diff --git a/src/Bicep.Core/Registry/TemplateSpecModuleRegistry.cs b/src/Bicep.Core/Registry/TemplateSpecModuleRegistry.cs index dfc9d14ebf2..2f6f327b638 100644 --- a/src/Bicep.Core/Registry/TemplateSpecModuleRegistry.cs +++ b/src/Bicep.Core/Registry/TemplateSpecModuleRegistry.cs @@ -133,7 +133,7 @@ public override ResultWithDiagnostic TryGetLocalArtifactEntryPointUri(Templ public override Task TryGetModuleDescription(ModuleSymbol module, TemplateSpecModuleReference moduleReference) { - if (module.TryGetSemanticModel().TryUnwrap() is {} model) + if (module.TryGetSemanticModel().TryUnwrap() is { } model) { return Task.FromResult(DescriptionHelper.TryGetFromSemanticModel(model)); } diff --git a/src/Bicep.Core/Semantics/DeclarationVisitor.cs b/src/Bicep.Core/Semantics/DeclarationVisitor.cs index 38eb4d0efab..f711fb974a3 100644 --- a/src/Bicep.Core/Semantics/DeclarationVisitor.cs +++ b/src/Bicep.Core/Semantics/DeclarationVisitor.cs @@ -486,7 +486,7 @@ private ResultWithDiagnostic TryGetProviderDesc return new(x => x.ExpectedProviderSpecification()); } - if (syntax.Specification is ConfigurationManagedProviderSpecification configSpec && + if (syntax.Specification is ConfigurationManagedProviderSpecification configSpec && configuration.ProvidersConfig.IsSysOrBuiltIn(configSpec.NamespaceIdentifier)) { return new(ResourceTypesProviderDescriptor.CreateBuiltInProviderDescriptor( diff --git a/src/Bicep.Core/SourceCode/SourceCodeDocumentLinkHelper.cs b/src/Bicep.Core/SourceCode/SourceCodeDocumentLinkHelper.cs index 47e9fb546e3..7ca4d19bba4 100644 --- a/src/Bicep.Core/SourceCode/SourceCodeDocumentLinkHelper.cs +++ b/src/Bicep.Core/SourceCode/SourceCodeDocumentLinkHelper.cs @@ -39,7 +39,7 @@ public static class SourceCodeDocumentLinkHelper foreach (var artifact in grouping) { - if (artifact.Syntax is {} syntax && + if (artifact.Syntax is { } syntax && syntax.Path is { } && artifact.Result.IsSuccess(out var uri)) { diff --git a/src/Bicep.Core/TypeSystem/Providers/IProviderSpecification.cs b/src/Bicep.Core/TypeSystem/Providers/IProviderSpecification.cs index bd635a550d1..66bd6354e85 100644 --- a/src/Bicep.Core/TypeSystem/Providers/IProviderSpecification.cs +++ b/src/Bicep.Core/TypeSystem/Providers/IProviderSpecification.cs @@ -38,4 +38,4 @@ public record ProviderSpecificationTrivia(TextSpan Span) : IProviderSpecificatio public string NamespaceIdentifier => LanguageConstants.ErrorName; public bool IsValid => false; public string? Version => null; -} \ No newline at end of file +} diff --git a/src/Bicep.Core/Workspaces/SourceFileGroupingBuilder.cs b/src/Bicep.Core/Workspaces/SourceFileGroupingBuilder.cs index 259115f84c2..c887622931c 100644 --- a/src/Bicep.Core/Workspaces/SourceFileGroupingBuilder.cs +++ b/src/Bicep.Core/Workspaces/SourceFileGroupingBuilder.cs @@ -75,7 +75,7 @@ public static SourceFileGrouping Rebuild(IFileResolver fileResolver, IFeaturePro var sourceFilesToRebuild = artifactsToRestore .Select(artifact => { - if (artifact.Syntax is {}) + if (artifact.Syntax is { }) { builder.artifactLookup.Remove(artifact.Syntax); } @@ -177,7 +177,8 @@ private void PopulateRecursive(BicepSourceFile file, IFeatureProviderFactory fea { if (restorable is ProviderDeclarationSyntax providerDeclaration) { - var isBuiltInProvider = providerDeclaration.Specification switch { + var isBuiltInProvider = providerDeclaration.Specification switch + { LegacyProviderSpecification => true, ConfigurationManagedProviderSpecification configSpec => config.ProvidersConfig.IsSysOrBuiltIn(configSpec.NamespaceIdentifier), _ => false, @@ -303,7 +304,8 @@ private ArtifactResolutionInfo GetArtifactRestoreResult(BicepSourceFile sourceFi fileResultByUri[fileUri].IsSuccess(out var sourceFile) && cycles.TryGetValue(sourceFile, out var cycle)) { - ResultWithDiagnostic result = cycle switch { + ResultWithDiagnostic result = cycle switch + { { Length: 1 } when cycle[0] is BicepParamFile paramFile => new(x => x.CyclicParametersSelfReference()), { Length: 1 } => new(x => x.CyclicModuleSelfReference()), // the error message is generic so it should work for either bicep module or params diff --git a/src/Bicep.LangServer.UnitTests/BicepExternalSourceRequestHandlerTests.cs b/src/Bicep.LangServer.UnitTests/BicepExternalSourceRequestHandlerTests.cs index 839df04617a..d35cfa56a56 100644 --- a/src/Bicep.LangServer.UnitTests/BicepExternalSourceRequestHandlerTests.cs +++ b/src/Bicep.LangServer.UnitTests/BicepExternalSourceRequestHandlerTests.cs @@ -317,7 +317,7 @@ public async Task RestoredValidModule_WithSource_RequestingBicepFile_ShouldRetur var bicepSource = "metadata hi = 'This is the bicep source file'"; var bicepUri = PathHelper.FilePathToFileUrl(Root("foo/bar/entrypoint.bicep")); var sourceArchive = new SourceArchiveBuilder().WithBicepFile(bicepUri, bicepSource).Build(); - dispatcher.Setup(m => m.TryGetModuleSources(moduleReference!)).Returns(new ResultWithException(sourceArchive )); + dispatcher.Setup(m => m.TryGetModuleSources(moduleReference!)).Returns(new ResultWithException(sourceArchive)); var resolver = StrictMock.Of(); resolver.Setup(m => m.TryRead(compiledJsonUri)).Returns(ResultHelper.Create(compiledJsonContents, nullBuilder)); diff --git a/src/Bicep.LangServer/Handlers/BicepExternalSourceDocumentLinkHandler.cs b/src/Bicep.LangServer/Handlers/BicepExternalSourceDocumentLinkHandler.cs index 4cc246a8bbf..c96050a6182 100644 --- a/src/Bicep.LangServer/Handlers/BicepExternalSourceDocumentLinkHandler.cs +++ b/src/Bicep.LangServer/Handlers/BicepExternalSourceDocumentLinkHandler.cs @@ -170,14 +170,14 @@ public async Task> ResolveDocumentL } return request with - { - Target = new ExternalSourceReference(targetArtifactReference, sourceArchive).ToUri().ToString() - }; + { + Target = new ExternalSourceReference(targetArtifactReference, sourceArchive).ToUri().ToString() + }; DocumentLink GetAlternateLink() => request with - { - Target = data.CompiledJsonLink - }; + { + Target = data.CompiledJsonLink + }; } private void ShowMessage(string message) diff --git a/src/Bicep.LangServer/Handlers/BicepExternalSourceRequestHandler.cs b/src/Bicep.LangServer/Handlers/BicepExternalSourceRequestHandler.cs index 8d7fc14554c..82fc56c7635 100644 --- a/src/Bicep.LangServer/Handlers/BicepExternalSourceRequestHandler.cs +++ b/src/Bicep.LangServer/Handlers/BicepExternalSourceRequestHandler.cs @@ -60,14 +60,14 @@ public Task Handle(BicepExternalSourceParams reques if (!moduleReference.IsExternal) { telemetryProvider.PostEvent(ExternalSourceRequestFailure("localNotSupported")); - return Task.FromResult(new BicepExternalSourceResponse(null, + return Task.FromResult(new BicepExternalSourceResponse(null, $"The specified module reference '{request.Target}' refers to a local module which is not supported by {BicepExternalSourceLspMethodName} requests.")); } if (!moduleDispatcher.TryGetLocalArtifactEntryPointUri(moduleReference).IsSuccess(out var compiledJsonUri)) { telemetryProvider.PostEvent(ExternalSourceRequestFailure(nameof(moduleDispatcher.TryGetLocalArtifactEntryPointUri))); - return Task.FromResult(new BicepExternalSourceResponse(null, + return Task.FromResult(new BicepExternalSourceResponse(null, $"Unable to obtain the entry point URI for module '{moduleReference.FullyQualifiedReference}'.")); }