Refactor and simplify handling of single quotes in module completions

Azure · Dec 20, 2024 · cca9277 · cca9277
1 parent 81e0d13
commit cca9277
Show file tree

Hide file tree

Showing 4 changed files with 150 additions and 120 deletions.
diff --git a/src/Bicep.Cli.IntegrationTests/UseRecentModuleVersionsIntegrationTests.cs b/src/Bicep.Cli.IntegrationTests/UseRecentModuleVersionsIntegrationTests.cs
@@ -96,7 +96,7 @@ private async Task<CliResult> Test(Options options)
         // compile and publish modules using throwaway file system
         var clientFactory = await RegistryHelper.CreateMockRegistryClientWithPublishedModulesAsync(
             new MockFileSystem(),
-            options.PublishedModules.Select(x => (x, "", true)).ToArray());
+            [.. options.PublishedModules.Select(x => (x, "", true))]);
 
         // create files
         var mainFile = FileHelper.SaveResultFile(TestContext, "main.bicep", options.Bicep, testOutputPath);

diff --git a/src/Bicep.Core/Registry/PublicRegistry/PublicRegistryModuleMetadataProvider.cs b/src/Bicep.Core/Registry/PublicRegistry/PublicRegistryModuleMetadataProvider.cs
@@ -87,9 +87,7 @@ public ImmutableArray<PublicRegistryModuleMetadata> GetModulesMetadata()
     {
         StartCacheUpdateInBackgroundIfNeeded();
 
-        return this.cachedIndex
-            .Select(x => new PublicRegistryModuleMetadata(x.ModulePath, x.GetDescription(), x.GetDocumentationUri()))
-            .ToImmutableArray();
+        return [.. this.cachedIndex.Select(x => new PublicRegistryModuleMetadata(x.ModulePath, x.GetDescription(), x.GetDocumentationUri()))];
     }
 
     public ImmutableArray<PublicRegistryModuleVersionMetadata> GetModuleVersionsMetadata(string modulePath)
@@ -103,9 +101,7 @@ public ImmutableArray<PublicRegistryModuleVersionMetadata> GetModuleVersionsMeta
             return [];
         }
 
-        return entry.Versions
-            .Select(version => new PublicRegistryModuleVersionMetadata(version, entry.GetDescription(version), entry.GetDocumentationUri(version)))
-            .ToImmutableArray();
+        return [.. entry.Versions.Select(version => new PublicRegistryModuleVersionMetadata(version, entry.GetDescription(version), entry.GetDocumentationUri(version)))];
     }
 
     private void StartCacheUpdateInBackgroundIfNeeded(bool initialDelay = false)

diff --git a/src/Bicep.LangServer.UnitTests/Completions/ModuleReferenceCompletionProviderTests.cs b/src/Bicep.LangServer.UnitTests/Completions/ModuleReferenceCompletionProviderTests.cs
@@ -211,6 +211,14 @@ public async Task GetFilteredCompletions_WithInvalidTextInCompletionContext_Retu
         [DataRow("module test 'br/public:app/dapr-containerapp:1.0.1|'")]
         [DataRow("module test |'br/public:app/dapr-containerapp:1.0.1'")]
         [DataRow("module test 'br/public:app/dapr-containerapp:1.0.1'|")]
+        [DataRow("module test 'br:mcr.microsoft.com/bicep/app/dapr-containerapp:1.0.1|")]
+        [DataRow("module test 'br:mcr.microsoft.com/bicep/app/dapr-containerapp:1.0.1|'")]
+        [DataRow("module test |'br:mcr.microsoft.com/bicep/app/dapr-containerapp:1.0.1'")]
+        [DataRow("module test 'br:mcr.microsoft.com/bicep/app/dapr-containerapp:1.0.1'|")]
+        [DataRow("module test 'br:contoso.com/app/dapr-containerapp:1.0.1|")]
+        [DataRow("module test 'br:contoso.com/app/dapr-containerapp:1.0.1|'")]
+        [DataRow("module test |'br:contoso.com/app/dapr-containerapp:1.0.1'")]
+        [DataRow("module test 'br:contoso.com/app/dapr-containerapp:1.0.1'|")]
         public async Task GetFilteredCompletions_WithInvalidCompletionContext_ReturnsEmptyList(string inputWithCursors)
         {
             var publicRegistryModuleMetadataProvider = StrictMock.Of<IPublicRegistryModuleMetadataProvider>();