Merge remote-tracking branch 'origin/main' into ant/refactor

src/Bicep.Core.UnitTests/Utils/IServiceCollectionExtensions.cs

@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Bicep.Core.Analyzers.Interfaces;
@@ -10,6 +11,8 @@
 using Bicep.Core.Semantics.Namespaces;
 using Bicep.Core.TypeSystem;
 using Bicep.Core.TypeSystem.Az;
+using Bicep.Core.UnitTests.Configuration;
+using Bicep.Core.UnitTests.Features;
 using Bicep.Core.Workspaces;
 using Bicep.LanguageServer.Providers;
 using Microsoft.Extensions.DependencyInjection;
@@ -28,23 +31,21 @@ public static IServiceCollection WithFileResolver(this IServiceCollection servic
  public static IServiceCollection WithWorkspace(this IServiceCollection services, IWorkspace workspace)
  => Register(services, workspace);
 
- public static IServiceCollection WithFeatureProvider(this IServiceCollection services, IFeatureProvider featureProvider)
- => Register(services, IFeatureProviderFactory.WithStaticFeatureProvider(featureProvider));
-
- public static IServiceCollection WithFeatureProviderFactory(this IServiceCollection services, IFeatureProviderFactory featureProviderFactory)
- => Register(services, featureProviderFactory);
+ public static IServiceCollection WithFeatureOverrides(this IServiceCollection services, FeatureProviderOverrides overrides)
+ => Register(services, overrides)
+ .AddSingleton<FeatureProviderFactory>()
+ .AddSingleton<IFeatureProviderFactory, OverriddenFeatureProviderFactory>();
 
  public static IServiceCollection WithNamespaceProvider(this IServiceCollection services, INamespaceProvider namespaceProvider)
  => Register(services, namespaceProvider);
 
- public static IServiceCollection WithConfigurationManager(this IServiceCollection services, IConfigurationManager configurationManager)
- => Register(services, configurationManager);
-
- public static IServiceCollection WithConfiguration(this IServiceCollection services, RootConfiguration configuration)
- => Register(services, IConfigurationManager.WithStaticConfiguration(configuration));
+ public static IServiceCollection WithConfigurationPatch(this IServiceCollection services, Func<RootConfiguration, RootConfiguration> patchFunc)
+ => Register(services, patchFunc)
+ .AddSingleton<ConfigurationManager>()
+ .AddSingleton<IConfigurationManager, PatchingConfigurationManager>();
 
  public static IServiceCollection WithDisabledAnalyzersConfiguration(this IServiceCollection services)
- => services.WithConfiguration(BicepTestConstants.BuiltInConfigurationWithAllAnalyzersDisabled);
+ => services.WithConfigurationPatch(c => c.WithAllAnalyzersDisabled());
 
  public static IServiceCollection WithApiVersionProviderFactory(this IServiceCollection services, IApiVersionProviderFactory apiVersionProviderFactory)
  => Register(services, apiVersionProviderFactory);
@@ -66,4 +67,13 @@ public static IServiceCollection WithAzResourceProvider(this IServiceCollection
 
  public static IServiceCollection WithEmptyAzResources(this IServiceCollection services)
  => services.WithAzResources(Enumerable.Empty<ResourceTypeComponents>());
+
+ public static IServiceCollection WithWorkspaceFiles(this IServiceCollection services, IReadOnlyDictionary<Uri, string> fileContentsByUri)
+ {
+ var workspace = new Workspace();
+ var sourceFiles = fileContentsByUri.Select(kvp => SourceFileFactory.CreateSourceFile(kvp.Key, kvp.Value));
+ workspace.UpsertSourceFiles(sourceFiles);
+
+ return services.WithWorkspace(workspace);
+ }
 }

src/Bicep.Core.UnitTests/Utils/ServiceBuilderExtensions.cs

@@ -2,81 +2,59 @@
 // Licensed under the MIT License.
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Bicep.Core.Analyzers.Interfaces;
 using Bicep.Core.Analyzers.Linter.ApiVersions;
 using Bicep.Core.Configuration;
-using Bicep.Core.Features;
 using Bicep.Core.FileSystem;
 using Bicep.Core.Semantics;
 using Bicep.Core.Semantics.Namespaces;
 using Bicep.Core.TypeSystem;
 using Bicep.Core.TypeSystem.Az;
-using Bicep.Core.UnitTests.Configuration;
 using Bicep.Core.UnitTests.Features;
 using Bicep.Core.Workspaces;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace Bicep.Core.UnitTests.Utils;
 
 public static class ServiceBuilderExtensions
 {
- private static ServiceBuilder Register<TService>(ServiceBuilder serviceBuilder, TService service)
- where TService : class
- => serviceBuilder.WithRegistration(x => x.AddSingleton<TService>(service));
-
  public static ServiceBuilder WithFileResolver(this ServiceBuilder serviceBuilder, IFileResolver fileResolver)
- => Register(serviceBuilder, fileResolver);
+ => serviceBuilder.WithRegistration(x => x.WithFileResolver(fileResolver));
 
  public static ServiceBuilder WithWorkspace(this ServiceBuilder serviceBuilder, IWorkspace workspace)
- => Register(serviceBuilder, workspace);
+ => serviceBuilder.WithRegistration(x => x.WithWorkspace(workspace));
 
  public static ServiceBuilder WithFeatureOverrides(this ServiceBuilder serviceBuilder, FeatureProviderOverrides overrides)
- {
- Register(serviceBuilder, overrides);
- serviceBuilder.WithRegistration(x => x.AddSingleton<FeatureProviderFactory>());
- return serviceBuilder.WithRegistration(x => x.AddSingleton<IFeatureProviderFactory, OverriddenFeatureProviderFactory>());
- }
+ => serviceBuilder.WithRegistration(x => x.WithFeatureOverrides(overrides));
 
  public static ServiceBuilder WithNamespaceProvider(this ServiceBuilder serviceBuilder, INamespaceProvider namespaceProvider)
- => Register(serviceBuilder, namespaceProvider);
+ => serviceBuilder.WithRegistration(x => x.WithNamespaceProvider(namespaceProvider));
 
  public static ServiceBuilder WithConfigurationPatch(this ServiceBuilder serviceBuilder, Func<RootConfiguration, RootConfiguration> patchFunc)
- {
- Register(serviceBuilder, patchFunc);
- serviceBuilder.WithRegistration(x => x.AddSingleton<ConfigurationManager>());
- return serviceBuilder.WithRegistration(x => x.AddSingleton<IConfigurationManager, PatchingConfigurationManager>());
- }
+ => serviceBuilder.WithRegistration(x => x.WithConfigurationPatch(patchFunc));
 
  public static ServiceBuilder WithDisabledAnalyzersConfiguration(this ServiceBuilder serviceBuilder)
- => serviceBuilder.WithConfigurationPatch(c => c.WithAllAnalyzersDisabled());
+ => serviceBuilder.WithRegistration(x => x.WithDisabledAnalyzersConfiguration());
 
  public static ServiceBuilder WithApiVersionProviderFactory(this ServiceBuilder serviceBuilder, IApiVersionProviderFactory apiVersionProviderFactory)
- => Register(serviceBuilder, apiVersionProviderFactory);
+ => serviceBuilder.WithRegistration(x => x.WithApiVersionProviderFactory(apiVersionProviderFactory));
 
  public static ServiceBuilder WithApiVersionProvider(this ServiceBuilder serviceBuilder, IApiVersionProvider apiVersionProvider)
- => serviceBuilder.WithApiVersionProviderFactory(IApiVersionProviderFactory.WithStaticApiVersionProvider(apiVersionProvider));
+ => serviceBuilder.WithRegistration(x => x.WithApiVersionProvider(apiVersionProvider));
 
  public static ServiceBuilder WithBicepAnalyzer(this ServiceBuilder serviceBuilder, IBicepAnalyzer bicepAnalyzer)
- => Register(serviceBuilder, bicepAnalyzer);
+ => serviceBuilder.WithRegistration(x => x.WithBicepAnalyzer(bicepAnalyzer));
 
  public static ServiceBuilder WithAzResources(this ServiceBuilder serviceBuilder, IEnumerable<ResourceTypeComponents> resourceTypes)
- => serviceBuilder.WithAzResourceTypeLoader(TestTypeHelper.CreateAzResourceTypeLoaderWithTypes(resourceTypes));
+ => serviceBuilder.WithRegistration(x => x.WithAzResources(resourceTypes));
 
  public static ServiceBuilder WithAzResourceTypeLoader(this ServiceBuilder serviceBuilder, IAzResourceTypeLoader azResourceTypeLoader)
- => serviceBuilder.WithRegistration(x => x.AddSingleton<IAzResourceTypeLoader>(azResourceTypeLoader));
+ => serviceBuilder.WithRegistration(x => x.WithAzResourceTypeLoader(azResourceTypeLoader));
 
  public static ServiceBuilder WithEmptyAzResources(this ServiceBuilder serviceBuilder)
- => serviceBuilder.WithAzResources(Enumerable.Empty<ResourceTypeComponents>());
+ => serviceBuilder.WithRegistration(x => x.WithEmptyAzResources());
 
  public static ServiceBuilder WithWorkspaceFiles(this ServiceBuilder serviceBuilder, IReadOnlyDictionary<Uri, string> fileContentsByUri)
- {
- var workspace = new Workspace();
- var sourceFiles = fileContentsByUri.Select(kvp => SourceFileFactory.CreateSourceFile(kvp.Key, kvp.Value));
- workspace.UpsertSourceFiles(sourceFiles);
-
- return serviceBuilder.WithWorkspace(workspace);
- }
+ => serviceBuilder.WithRegistration(x => x.WithWorkspaceFiles(fileContentsByUri));
 
  public static Compilation BuildCompilation(this ServiceBuilder services, IReadOnlyDictionary<Uri, string> fileContentsByUri, Uri entryFileUri)
  {

src/Bicep.LangServer.IntegrationTests/BuildCommandTests.cs

@@ -32,7 +32,7 @@ public async Task Build_command_should_generate_template()
  using var helper = await LanguageServerHelper.StartServer(
  this.TestContext,
  options => options.OnPublishDiagnostics(diagnosticsListener.AddMessage),
- services => services.WithNamespaceProvider(BuiltInTestTypes.Create()).WithFeatureProvider(features));
+ services => services.WithNamespaceProvider(BuiltInTestTypes.Create()).WithFeatureOverrides(new(TestContext)));
  var client = helper.Client;
 
  var outputDirectory = FileHelper.SaveEmbeddedResourcesWithPathPrefix(
@@ -66,7 +66,7 @@ public async Task Build_command_should_generate_template_with_symbolic_names_if_
  using var helper = await LanguageServerHelper.StartServer(
  this.TestContext,
  options => options.OnPublishDiagnostics(diagnosticsListener.AddMessage),
- services => services.WithNamespaceProvider(BuiltInTestTypes.Create()).WithFeatureProvider(features));
+ services => services.WithNamespaceProvider(BuiltInTestTypes.Create()).WithFeatureOverrides(new(TestContext, SymbolicNameCodegenEnabled: true)));
  var client = helper.Client;
 
  var outputDirectory = FileHelper.SaveEmbeddedResourcesWithPathPrefix(

src/Bicep.LangServer.IntegrationTests/CompletionTests.cs

@@ -79,7 +79,7 @@ public static void ClassInitialize(TestContext testContext)
  ServerWithImportsEnabled.Initialize(
  async () => await MultiFileLanguageServerHelper.StartLanguageServer(
  testContext,
- services => services.WithFeatureProvider(BicepTestConstants.CreateFeatureProvider(testContext, importsEnabled: true))));
+ services => services.WithFeatureOverrides(new(testContext, ImportsEnabled: true))));
 
  ServerWithBuiltInTypes.Initialize(
  async () => await MultiFileLanguageServerHelper.StartLanguageServer(

src/Bicep.LangServer.IntegrationTests/GenerateParamsCommandTests.cs

@@ -32,7 +32,7 @@ public async Task GenerateParams_command_should_generate_paramsfile()
  using var helper = await LanguageServerHelper.StartServer(
  this.TestContext,
  options => options.OnPublishDiagnostics(diagnosticsListener.AddMessage),
- services => services.WithNamespaceProvider(BuiltInTestTypes.Create()).WithFeatureProvider(features));
+ services => services.WithNamespaceProvider(BuiltInTestTypes.Create()).WithFeatureOverrides(new(TestContext)));
  var client = helper.Client;
 
  var outputDirectory = FileHelper.SaveEmbeddedResourcesWithPathPrefix(

src/Bicep.LangServer.IntegrationTests/ImportKubernetesManifestTests.cs

@@ -46,12 +46,10 @@ public async Task ImportKubernetesManifest_generates_valid_bicep_files_from_kube
  var yamlFile = baselineFolder.EntryFile;
  var bicepFile = baselineFolder.GetFileOrEnsureCheckedIn(Path.ChangeExtension(embeddedYml.FileName, ".bicep"));
 
- var features = BicepTestConstants.Features with { ImportsEnabled = true, };
-
  using var helper = await LanguageServerHelper.StartServer(
  this.TestContext,
  options => options.OnTelemetryEvent(telemetryEventsListener.AddMessage),
- services => services.WithFeatureProvider(features));
+ services => services.WithFeatureOverrides(new(TestContext, ImportsEnabled: true)));
  var client = helper.Client;
 
  var response = await client.SendRequest(new ImportKubernetesManifestRequest(yamlFile.OutputFilePath), default);

src/Bicep.LangServer.IntegrationTests/ParamsCompletionTests.cs

@@ -137,7 +137,7 @@ public async Task Request_for_parameter_identifier_completions_should_return_cor
  paramUri,
  services => services
  .WithNamespaceProvider(BuiltInTestTypes.Create())
- .WithFeatureProvider(BicepTestConstants.CreateFeatureProvider(TestContext, paramsFilesEnabled: true)));
+ .WithFeatureOverrides(new(TestContext, ParamsFilesEnabled: true)));
 
  var file = new FileRequestHelper(helper.Client, paramFile);
 
@@ -235,7 +235,7 @@ public async Task Request_for_parameter_allowed_value_completions_should_return_
  paramUri,
  services => services
  .WithNamespaceProvider(BuiltInTestTypes.Create())
- .WithFeatureProvider(BicepTestConstants.CreateFeatureProvider(TestContext, paramsFilesEnabled: true)));
+ .WithFeatureOverrides(new(TestContext, ParamsFilesEnabled: true)));
 
  var file = new FileRequestHelper(helper.Client, paramFile);
 
@@ -276,7 +276,7 @@ public async Task Request_for_using_declaration_path_completions_should_return_c
  paramUri,
  services => services
  .WithNamespaceProvider(BuiltInTestTypes.Create())
- .WithFeatureProvider(BicepTestConstants.CreateFeatureProvider(TestContext, paramsFilesEnabled: true)));
+ .WithFeatureOverrides(new(TestContext, ParamsFilesEnabled: true)));
 
  var file = new FileRequestHelper(helper.Client, paramFile);
 
@@ -322,7 +322,7 @@ public async Task Request_for_using_declaration_path_completions_should_return_c
  paramUri,
  services => services
  .WithNamespaceProvider(BuiltInTestTypes.Create())
- .WithFeatureProvider(BicepTestConstants.CreateFeatureProvider(TestContext, paramsFilesEnabled: true)));
+ .WithFeatureOverrides(new(TestContext, ParamsFilesEnabled: true)));
 
  var file = new FileRequestHelper(helper.Client, paramFile);
 

src/Bicep.LangServer.IntegrationTests/SemanticTokenTests.cs

@@ -103,7 +103,7 @@ public async Task Correct_semantic_tokens_are_returned_for_params_file(string pa
  paramFileUri,
  services => services
  .WithNamespaceProvider(BuiltInTestTypes.Create())
- .WithFeatureProvider(BicepTestConstants.CreateFeatureProvider(TestContext, paramsFilesEnabled: true)));
+ .WithFeatureOverrides(new(TestContext, ParamsFilesEnabled: true)));
 
  var semanticTokens = await helper.Client.TextDocument.RequestSemanticTokens(new SemanticTokensParams
  {