ResourceIdentifier => IOResourceIdentifier (#15746)

This PR incorporates feedback from @anthony-c-martin in my previous PR regarding the potential ambiguity of the term ResourceIdentifier within the Bicep context. I renamed the type to `IOUri` rather than the initially suggested `FileUri`, as this choice accommodates future scenarios where we may need to handle storage blobs with URI schemes such as `https`, rather than being limited to `file`. ###### Microsoft Reviewers: [Open in CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/Azure/bicep/pull/15746)
Azure · Dec 3, 2024 · 2b8c6f9 · 2b8c6f9
1 parent 8e81fc8
commit 2b8c6f9
Show file tree

Hide file tree

Showing 89 changed files with 366 additions and 368 deletions.
diff --git a/src/Bicep.Cli.IntegrationTests/TestBase.cs b/src/Bicep.Cli.IntegrationTests/TestBase.cs
@@ -120,7 +120,7 @@ protected static async Task<IEnumerable<string>> GetAllDiagnostics(string bicepF
                 {
                     var (line, character) = TextCoordinateConverter.GetPosition(bicepFile.LineStarts, diagnostic.Span.Position);
                     var codeDescription = diagnostic.Uri == null ? string.Empty : $" [{diagnostic.Uri.AbsoluteUri}]";
-                    output.Add($"{bicepFile.Identifier.LocalPath}({line + 1},{character + 1}) : {diagnostic.Level} {diagnostic.Code}: {diagnostic.Message}{codeDescription}");
+                    output.Add($"{bicepFile.Uri.LocalPath}({line + 1},{character + 1}) : {diagnostic.Level} {diagnostic.Code}: {diagnostic.Message}{codeDescription}");
                 }
             }
 

diff --git a/src/Bicep.Cli/Helpers/ExperimentalFeatureWarningProvider.cs b/src/Bicep.Cli/Helpers/ExperimentalFeatureWarningProvider.cs
@@ -12,7 +12,7 @@ public static class ExperimentalFeatureWarningProvider
     public static string? TryGetEnabledExperimentalFeatureWarningMessage(SourceFileGrouping sourceFileGrouping, IFeatureProviderFactory featureProviderFactory)
     {
         var experimentalFeaturesEnabled = sourceFileGrouping.SourceFiles
-            .Select(file => featureProviderFactory.GetFeatureProvider(file.Identifier))
+            .Select(file => featureProviderFactory.GetFeatureProvider(file.Uri))
             .SelectMany(static features => features.EnabledFeatureMetadata.Where(f => f.impactsCompilation).Select(f => f.name))
             .Distinct()
             .ToImmutableArray();

diff --git a/src/Bicep.Cli/Helpers/ParamsFileHelper.cs b/src/Bicep.Cli/Helpers/ParamsFileHelper.cs
@@ -85,6 +85,6 @@ public static BicepParamFile ApplyParameterOverrides(BicepParamFile sourceFile,
             return sourceFile;
         }
 
-        return SourceFileFactory.CreateBicepParamFile(sourceFile.Identifier, newProgramSyntax.ToString());
+        return SourceFileFactory.CreateBicepParamFile(sourceFile.Uri, newProgramSyntax.ToString());
     }
 }
diff --git a/src/Bicep.Cli/Logging/DiagnosticLogger.cs b/src/Bicep.Cli/Logging/DiagnosticLogger.cs
@@ -71,7 +71,7 @@ private static void LogDefaultDiagnostics(ILogger logger, ImmutableDictionary<Bi
                 // build a a code description link if the Uri is assigned
                 var codeDescription = diagnostic.Uri == null ? string.Empty : $" [{diagnostic.Uri.AbsoluteUri}]";
 
-                var message = $"{bicepFile.Identifier.LocalPath}({line + 1},{character + 1}) : {diagnostic.Level} {diagnostic.Code}: {diagnostic.Message}{codeDescription}";
+                var message = $"{bicepFile.Uri.LocalPath}({line + 1},{character + 1}) : {diagnostic.Level} {diagnostic.Code}: {diagnostic.Message}{codeDescription}";
 
                 logger.Log(ToLogLevel(diagnostic.Level), message);
             }
@@ -136,7 +136,7 @@ private static Result GetSarifDiagnostic(BicepSourceFile sourceFile, IDiagnostic
                     {
                         ArtifactLocation = new ArtifactLocation
                         {
-                            Uri = sourceFile.Identifier,
+                            Uri = sourceFile.Uri,
                         },
                         Region = new Region
                         {

diff --git a/src/Bicep.Cli/Rpc/CliJsonRpcServer.cs b/src/Bicep.Cli/Rpc/CliJsonRpcServer.cs
@@ -75,7 +75,7 @@ public async Task<CompileParamsResponse> CompileParams(CompileParamsRequest requ
 
         var workspace = new Workspace();
         workspace.UpsertSourceFile(paramFile);
-        compilation = await compiler.CreateCompilation(paramFile.Identifier, workspace);
+        compilation = await compiler.CreateCompilation(paramFile.Uri, workspace);
         var paramsResult = compilation.Emitter.Parameters();
 
         return new(
@@ -96,9 +96,9 @@ public async Task<GetFileReferencesResponse> GetFileReferences(GetFileReferences
         var fileUris = new HashSet<Uri>();
         foreach (var otherModel in compilation.GetAllBicepModels())
         {
-            fileUris.Add(otherModel.SourceFile.Identifier);
+            fileUris.Add(otherModel.SourceFile.Uri);
             fileUris.UnionWith(otherModel.GetAuxiliaryFileReferences());
-            if (otherModel.Configuration.ConfigFileIdentifier is { } configFileIdentifier)
+            if (otherModel.Configuration.ConfigFileUri is { } configFileIdentifier)
             {
                 var uri = new UriBuilder
                 {
@@ -235,7 +235,7 @@ private static IEnumerable<DiagnosticDefinition> GetDiagnostics(Compilation comp
         {
             foreach (var diagnostic in diagnostics)
             {
-                yield return new(bicepFile.Identifier.LocalPath, GetRange(bicepFile, diagnostic), diagnostic.Level.ToString(), diagnostic.Code, diagnostic.Message);
+                yield return new(bicepFile.Uri.LocalPath, GetRange(bicepFile, diagnostic), diagnostic.Level.ToString(), diagnostic.Code, diagnostic.Message);
             }
         }
     }

diff --git a/src/Bicep.Core.IntegrationTests/DecoratorTests.cs b/src/Bicep.Core.IntegrationTests/DecoratorTests.cs
@@ -74,7 +74,7 @@ param inputb string
             };
 
             var compilation = Services.BuildCompilation(files, mainUri);
-            var diagnosticsByFile = compilation.GetAllDiagnosticsByBicepFile().ToDictionary(kvp => kvp.Key.Identifier, kvp => kvp.Value);
+            var diagnosticsByFile = compilation.GetAllDiagnosticsByBicepFile().ToDictionary(kvp => kvp.Key.Uri, kvp => kvp.Value);
             var success = diagnosticsByFile.Values.SelectMany(x => x).All(d => !d.IsError());
 
             using (new AssertionScope())
@@ -215,7 +215,7 @@ param inputb string
             };
 
             var compilation = Services.BuildCompilation(files, mainUri);
-            var diagnosticsByFile = compilation.GetAllDiagnosticsByBicepFile().ToDictionary(kvp => kvp.Key.Identifier, kvp => kvp.Value);
+            var diagnosticsByFile = compilation.GetAllDiagnosticsByBicepFile().ToDictionary(kvp => kvp.Key.Uri, kvp => kvp.Value);
             var success = diagnosticsByFile.Values.SelectMany(x => x).All(d => !d.IsError());
 
             using (new AssertionScope())

diff --git a/src/Bicep.Core.IntegrationTests/ExamplesTests.cs b/src/Bicep.Core.IntegrationTests/ExamplesTests.cs
@@ -42,7 +42,7 @@ private async Task RunExampleTest(EmbeddedFile embeddedBicep, FeatureProviderOve
                     diagnostics.Where(d => !IsPermittedMissingTypeDiagnostic(d)),
                     diagnostics =>
                     {
-                        diagnostics.Should().BeEmpty("{0} should not have warnings or errors", file.Identifier.LocalPath);
+                        diagnostics.Should().BeEmpty("{0} should not have warnings or errors", file.Uri.LocalPath);
                     });
             }
 

diff --git a/src/Bicep.Core.IntegrationTests/ModuleTests.cs b/src/Bicep.Core.IntegrationTests/ModuleTests.cs
@@ -652,7 +652,7 @@ param p resource 'Some.Fake/Type@2019-06-01'
 
 output storage resource 'Another.Fake/Type@2019-06-01' = fake
 "));
-            var diagnosticsMap = result.Compilation.GetAllDiagnosticsByBicepFile().ToDictionary(kvp => kvp.Key.Identifier, kvp => kvp.Value);
+            var diagnosticsMap = result.Compilation.GetAllDiagnosticsByBicepFile().ToDictionary(kvp => kvp.Key.Uri, kvp => kvp.Value);
             using (new AssertionScope())
             {
                 diagnosticsMap[InMemoryFileResolver.GetFileUri("/path/to/module.bicep")].Should().HaveDiagnostics(new[]
@@ -769,7 +769,7 @@ private static string GetTemplate(Compilation compilation)
 
         private static (bool success, IDictionary<Uri, ImmutableArray<IDiagnostic>> diagnosticsByFile) GetSuccessAndDiagnosticsByFile(Compilation compilation)
         {
-            var diagnosticsByFile = compilation.GetAllDiagnosticsByBicepFile().ToDictionary(kvp => kvp.Key.Identifier, kvp => kvp.Value);
+            var diagnosticsByFile = compilation.GetAllDiagnosticsByBicepFile().ToDictionary(kvp => kvp.Key.Uri, kvp => kvp.Value);
             var success = diagnosticsByFile.Values.SelectMany(x => x).All(d => !d.IsError());
 
             return (success, diagnosticsByFile);

diff --git a/src/Bicep.Core.IntegrationTests/Scenarios/LocalJsonModuleTests.cs b/src/Bicep.Core.IntegrationTests/Scenarios/LocalJsonModuleTests.cs
@@ -124,6 +124,6 @@ public void CompileWithLocalJsonModule_ValidTemplate_Succeeds()
         }
 
         private static ImmutableDictionary<string, ImmutableArray<IDiagnostic>> GetDiagnosticsByFileName(Compilation compilation) =>
-            compilation.GetAllDiagnosticsByBicepFile().ToImmutableDictionary(kvp => Path.GetFileName(kvp.Key.Identifier.LocalPath), kvp => kvp.Value);
+            compilation.GetAllDiagnosticsByBicepFile().ToImmutableDictionary(kvp => Path.GetFileName(kvp.Key.Uri.LocalPath), kvp => kvp.Value);
     }
 }
diff --git a/src/Bicep.Core.UnitTests/BicepTestConstants.cs b/src/Bicep.Core.UnitTests/BicepTestConstants.cs
@@ -129,7 +129,7 @@ public static RootConfiguration CreateMockConfiguration(Dictionary<string, objec
                 element = element.SetPropertyByPath(path, value);
             }
 
-            ResourceIdentifier? configFileIdentifier = configFilePath is not null ? new ResourceIdentifier("file", "", configFilePath) : null;
+            IOUri? configFileIdentifier = configFilePath is not null ? new IOUri("file", "", configFilePath) : null;
 
             return RootConfiguration.Bind(element, configFileIdentifier);
         }

diff --git a/src/Bicep.Core.UnitTests/Configuration/RootConfigurationTests.cs b/src/Bicep.Core.UnitTests/Configuration/RootConfigurationTests.cs
@@ -23,7 +23,7 @@ public void RootConfiguration_LeadingTildeInCacheRootDirectory_ExpandPath(string
                 cacheRootDirectory,
                 BicepTestConstants.BuiltInConfiguration.ExperimentalFeaturesEnabled,
                 BicepTestConstants.BuiltInConfiguration.Formatting,
-                BicepTestConstants.BuiltInConfiguration.ConfigFileIdentifier,
+                BicepTestConstants.BuiltInConfiguration.ConfigFileUri,
                 BicepTestConstants.BuiltInConfiguration.Diagnostics);
 
         configuration.CacheRootDirectory.Should().Be(expectedExpandedDirectory);

diff --git a/src/Bicep.Core.UnitTests/Diagnostics/ErrorBuilderTests.cs b/src/Bicep.Core.UnitTests/Diagnostics/ErrorBuilderTests.cs
@@ -216,9 +216,9 @@ private static object CreateMockParameter(ParameterInfo parameter, int index)
                 return ArtifactType.Module;
             }
 
-            if (parameter.ParameterType == typeof(ResourceIdentifier) || parameter.ParameterType == typeof(ResourceIdentifier?))
+            if (parameter.ParameterType == typeof(IOUri) || parameter.ParameterType == typeof(IOUri?))
             {
-                return new ResourceIdentifier("file", "", "/foo");
+                return new IOUri("file", "", "/foo");
             }
 
             throw new AssertFailedException($"Unable to generate mock parameter value of type '{parameter.ParameterType}' for the diagnostic builder method.");

diff --git a/src/Bicep.Core.UnitTests/SourceCode/SourceArchiveTests.cs b/src/Bicep.Core.UnitTests/SourceCode/SourceArchiveTests.cs
@@ -177,7 +177,7 @@ public void CanPackAndUnpackSourceFiles()
 
 
         using var stream = SourceArchive.PackSourcesIntoStream(
-            mainBicep.SourceFile.Identifier,
+            mainBicep.SourceFile.Uri,
             CacheRoot, mainBicep, mainJson, standaloneJson, templateSpecMainJson, localModuleJson, templateSpecMainJson2, externalModuleJson);
         stream.Length.Should().BeGreaterThan(0);
 
@@ -252,7 +252,7 @@ public void CanPackAndUnpackDocumentLinks()
                 }
             },
         };
-        using var stream = SourceArchive.PackSourcesIntoStream(mainBicep.SourceFile.Identifier, CacheRoot, linksInput, mainBicep, mainJson, standaloneJson, templateSpecMainJson, localModuleJson, localModuleBicep, externalModuleJson);
+        using var stream = SourceArchive.PackSourcesIntoStream(mainBicep.SourceFile.Uri, CacheRoot, linksInput, mainBicep, mainJson, standaloneJson, templateSpecMainJson, localModuleJson, localModuleBicep, externalModuleJson);
         stream.Length.Should().BeGreaterThan(0);
 
         SourceArchive? sourceArchive = SourceArchive.UnpackFromStream(stream).TryUnwrap();
@@ -433,7 +433,7 @@ string[] expectedArchivePaths
         }
         var files = inputPaths.Select(path => CreateSourceFile(fs, path, SourceArchive.SourceKind.Bicep, $"// {path}")).ToArray();
 
-        using var stream = SourceArchive.PackSourcesIntoStream(files[0].SourceFile.Identifier, CacheRoot, files);
+        using var stream = SourceArchive.PackSourcesIntoStream(files[0].SourceFile.Uri, CacheRoot, files);
         SourceArchive sourceArchive = SourceArchive.UnpackFromStream(stream).UnwrapOrThrow();
 
         sourceArchive.EntrypointRelativePath.Should().Be(expectedPaths[0], "entrypoint path should be correct");
@@ -495,8 +495,8 @@ public void DuplicateNamesAfterMunging_ShouldHaveSeparateEntries(
         var sutFile3 = inputBicepPath3 is null ? null : CreateSourceFile(fs, rootBicepFolder, inputBicepPath3, SourceArchive.SourceKind.Bicep, SecondaryDotBicepSource);
 
         using var stream = sutFile3 is null ?
-            SourceArchive.PackSourcesIntoStream(entrypointFile.SourceFile.Identifier, CacheRoot, entrypointFile, sutFile1, sutFile2) :
-            SourceArchive.PackSourcesIntoStream(entrypointFile.SourceFile.Identifier, CacheRoot, entrypointFile, sutFile1, sutFile2, sutFile3);
+            SourceArchive.PackSourcesIntoStream(entrypointFile.SourceFile.Uri, CacheRoot, entrypointFile, sutFile1, sutFile2) :
+            SourceArchive.PackSourcesIntoStream(entrypointFile.SourceFile.Uri, CacheRoot, entrypointFile, sutFile1, sutFile2, sutFile3);
 
         SourceArchive sourceArchive = SourceArchive.UnpackFromStream(stream).UnwrapOrThrow();
 

diff --git a/src/Bicep.Core.UnitTests/Utils/RegistryHelper.cs b/src/Bicep.Core.UnitTests/Utils/RegistryHelper.cs
@@ -68,7 +68,7 @@ public static async Task PublishModuleToRegistryAsync(
             throw new InvalidOperationException($"Module {moduleName} failed to produce a template.");
         }
 
-        var features = featureProviderFactory.GetFeatureProvider(result.BicepFile.Identifier);
+        var features = featureProviderFactory.GetFeatureProvider(result.BicepFile.Uri);
         BinaryData? sourcesStream = publishSource ? BinaryData.FromStream(SourceArchive.PackSourcesIntoStream(dispatcher, result.Compilation.SourceFileGrouping, features.CacheRootDirectory)) : null;
         await dispatcher.PublishModule(targetReference, BinaryData.FromString(result.Template.ToString()), sourcesStream, documentationUri);
     }

diff --git a/src/Bicep.Core.UnitTests/Utils/SourceArchiveBuilder.cs b/src/Bicep.Core.UnitTests/Utils/SourceArchiveBuilder.cs
@@ -61,7 +61,7 @@ public Stream BuildStream()
             SourceFiles[0].Should().BeOfType<BicepFile>("Entrypoint should be a bicep file");
 
             return SourceArchive.PackSourcesIntoStream(
-                EntrypointFile.Identifier,
+                EntrypointFile.Uri,
                 cacheRoot,
                 SourceFiles.Select(x => new SourceFileWithArtifactReference(x, null)).ToArray());
         }

diff --git a/src/Bicep.Core/Analyzers/Linter/LinterAnalyzer.cs b/src/Bicep.Core/Analyzers/Linter/LinterAnalyzer.cs
@@ -79,7 +79,7 @@ public IEnumerable<IDiagnostic> Analyze(SemanticModel semanticModel)
                         DiagnosticLevel.Info,
                         DiagnosticSource.CoreLinter,
                         "Linter Disabled",
-                        string.Format(CoreResources.LinterDisabledFormatMessage, semanticModel.Configuration.ConfigFileIdentifier?.ToString() ?? IConfigurationManager.BuiltInConfigurationResourceName)));
+                        string.Format(CoreResources.LinterDisabledFormatMessage, semanticModel.Configuration.ConfigFileUri?.ToString() ?? IConfigurationManager.BuiltInConfigurationResourceName)));
                 }
             }
 
@@ -90,7 +90,7 @@ private IDiagnostic GetConfigurationDiagnostic(SemanticModel model)
         {
             var configMessage = model.Configuration.IsBuiltIn
                 ? CoreResources.BicepConfigNoCustomSettingsMessage
-                : string.Format(CoreResources.BicepConfigCustomSettingsFoundFormatMessage, model.Configuration.ConfigFileIdentifier?.ToString());
+                : string.Format(CoreResources.BicepConfigCustomSettingsFoundFormatMessage, model.Configuration.ConfigFileUri?.ToString());
 
             return new Diagnostic(
                 TextSpan.TextDocumentStart,

diff --git a/src/Bicep.Core/Configuration/AnalyzersConfigurationExtensions.cs b/src/Bicep.Core/Configuration/AnalyzersConfigurationExtensions.cs
@@ -46,7 +46,7 @@ public static RootConfiguration WithAnalyzersConfiguration(this RootConfiguratio
                 current.CacheRootDirectory,
                 current.ExperimentalFeaturesEnabled,
                 current.Formatting,
-                current.ConfigFileIdentifier,
+                current.ConfigFileUri,
                 current.Diagnostics);
 
         public static RootConfiguration WithAllAnalyzersDisabled(this RootConfiguration current) =>

diff --git a/src/Bicep.Core/Configuration/ConfigurationManager.cs b/src/Bicep.Core/Configuration/ConfigurationManager.cs
@@ -35,8 +35,8 @@ public RootConfiguration GetConfiguration(Uri sourceFileUri)
                 return GetDefaultConfiguration();
             }
 
-            var sourceFileIdentifier = sourceFileUri.ToFileIdentifier();
-            var sourceDirectory = this.fileExplorer.GetFile(sourceFileIdentifier).GetParent();
+            var sourceFileIOUri = sourceFileUri.ToIOUri();
+            var sourceDirectory = this.fileExplorer.GetFile(sourceFileIOUri).GetParent();
 
             if (!configFileLookupCache.GetOrAdd(sourceDirectory, LookupConfigurationFile).IsSuccess(out var configFileHandle, out var lookupDiagnostic))
             {
@@ -64,7 +64,7 @@ public void PurgeCache()
 
         public void PurgeLookupCache() => configFileLookupCache.Clear();
 
-        public (RootConfiguration prevConfiguration, RootConfiguration newConfiguration)? RefreshConfigCacheEntry(ResourceIdentifier configFileIdentifier)
+        public (RootConfiguration prevConfiguration, RootConfiguration newConfiguration)? RefreshConfigCacheEntry(IOUri configFileIdentifier)
         {
             (RootConfiguration, RootConfiguration)? returnVal = null;
             var configFileHandle = this.fileExplorer.GetFile(configFileIdentifier);
@@ -81,7 +81,7 @@ public void PurgeCache()
             return returnVal;
         }
 
-        public void RemoveConfigCacheEntry(ResourceIdentifier identifier)
+        public void RemoveConfigCacheEntry(IOUri identifier)
         {
             var configFileHandle = this.fileExplorer.GetFile(identifier);
             if (loadedConfigCache.TryRemove(configFileHandle, out _))
@@ -100,19 +100,19 @@ private static ResultWithDiagnostic<RootConfiguration> LoadConfiguration(IFileHa
                 using var stream = configFileHandle.OpenRead();
                 var element = IConfigurationManager.BuiltInConfigurationElement.Merge(JsonElementFactory.CreateElementFromStream(stream));
 
-                return RootConfiguration.Bind(element, configFileHandle.Identifier);
+                return RootConfiguration.Bind(element, configFileHandle.Uri);
             }
             catch (ConfigurationException exception)
             {
-                return new(ConfigDiagnosticBuilder.InvalidBicepConfigFile(configFileHandle.Identifier, exception.Message));
+                return new(ConfigDiagnosticBuilder.InvalidBicepConfigFile(configFileHandle.Uri, exception.Message));
             }
             catch (JsonException exception)
             {
-                return new(ConfigDiagnosticBuilder.UnparsableBicepConfigFile(configFileHandle.Identifier, exception.Message));
+                return new(ConfigDiagnosticBuilder.UnparsableBicepConfigFile(configFileHandle.Uri, exception.Message));
             }
             catch (Exception exception)
             {
-                return new(ConfigDiagnosticBuilder.UnloadableBicepConfigFile(configFileHandle.Identifier, exception.Message));
+                return new(ConfigDiagnosticBuilder.UnloadableBicepConfigFile(configFileHandle.Uri, exception.Message));
             }
         }
 
@@ -134,7 +134,7 @@ private static ResultWithDiagnostic<RootConfiguration> LoadConfiguration(IFileHa
             }
             catch (IOException exception)
             {
-                return new(ConfigDiagnosticBuilder.PotentialConfigDirectoryCouldNotBeScanned(directoryToLookup?.Identifier, exception.Message));
+                return new(ConfigDiagnosticBuilder.PotentialConfigDirectoryCouldNotBeScanned(directoryToLookup?.Uri, exception.Message));
             }
 
             return new((IFileHandle?)null);

diff --git a/src/Bicep.Core/Configuration/ExperimentalFeaturesExtensions.cs b/src/Bicep.Core/Configuration/ExperimentalFeaturesExtensions.cs
@@ -15,7 +15,7 @@ public static RootConfiguration WithExperimentalFeaturesConfiguration(this RootC
                 current.CacheRootDirectory,
                 featuresEnabled,
                 current.Formatting,
-                current.ConfigFileIdentifier,
+                current.ConfigFileUri,
                 current.Diagnostics);
 
         public static RootConfiguration WithExperimentalFeaturesEnabled(this RootConfiguration current, ExperimentalFeaturesEnabled configuration) =>

diff --git a/src/Bicep.Core/Configuration/ExtensionsConfigurationExtensions.cs b/src/Bicep.Core/Configuration/ExtensionsConfigurationExtensions.cs
@@ -24,7 +24,7 @@ public static RootConfiguration WithExtensions(this RootConfiguration rootConfig
             rootConfiguration.CacheRootDirectory,
             rootConfiguration.ExperimentalFeaturesEnabled,
             rootConfiguration.Formatting,
-            rootConfiguration.ConfigFileIdentifier,
+            rootConfiguration.ConfigFileUri,
             rootConfiguration.Diagnostics);
     }
 
@@ -39,7 +39,7 @@ public static RootConfiguration WithImplicitExtensions(this RootConfiguration ro
             rootConfiguration.CacheRootDirectory,
             rootConfiguration.ExperimentalFeaturesEnabled,
             rootConfiguration.Formatting,
-            rootConfiguration.ConfigFileIdentifier,
+            rootConfiguration.ConfigFileUri,
             rootConfiguration.Diagnostics);
     }
 }