Merge pull request #74741 from CyrusNajmabadi/useImmutableArray

Author: CyrusNajmabadi

src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer.UnitTests/LspFileChangeWatcherTests.cs

@@ -61,7 +61,7 @@ public async Task CreatingDirectoryWatchRequestsDirectoryWatch()
         var tempDirectory = tempRoot.CreateDirectory();
 
         // Try creating a context and ensure we created the registration
-        var context = lspFileChangeWatcher.CreateContext(new ProjectSystem.WatchedDirectory(tempDirectory.Path, extensionFilter: null));
+        var context = lspFileChangeWatcher.CreateContext([new ProjectSystem.WatchedDirectory(tempDirectory.Path, extensionFilter: null)]);
         await WaitForFileWatcherAsync(testLspServer);
 
         var watcher = GetSingleFileWatcher(dynamicCapabilitiesRpcTarget);
@@ -92,7 +92,7 @@ public async Task CreatingFileWatchRequestsFileWatch()
         var tempDirectory = tempRoot.CreateDirectory();
 
         // Try creating a single file watch and ensure we created the registration
-        var context = lspFileChangeWatcher.CreateContext();
+        var context = lspFileChangeWatcher.CreateContext([]);
         var watchedFile = context.EnqueueWatchingFile("Z:\\SingleFile.txt");
         await WaitForFileWatcherAsync(testLspServer);
 

src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/FileWatching/DelegatingFileChangeWatcher.cs

@@ -8,6 +8,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
+using System.Collections.Immutable;
 
 namespace Microsoft.CodeAnalysis.LanguageServer.HostWorkspace.FileWatching;
 
@@ -50,8 +51,6 @@ private IFileChangeWatcher CreateFileWatcher()
         }
     }
 
-    public IFileChangeContext CreateContext(params WatchedDirectory[] watchedDirectories)
-    {
-        return _underlyingFileWatcher.Value.CreateContext(watchedDirectories);
-    }
+    public IFileChangeContext CreateContext(ImmutableArray<WatchedDirectory> watchedDirectories)
+        => _underlyingFileWatcher.Value.CreateContext(watchedDirectories);
 }

src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/FileWatching/LspFileChangeWatcher.cs

@@ -40,12 +40,10 @@ public static bool SupportsLanguageServerHost(LanguageServerHost languageServerH
         return clientCapabilitiesProvider.GetClientCapabilities().Workspace?.DidChangeWatchedFiles?.DynamicRegistration ?? false;
     }
 
-    public IFileChangeContext CreateContext(params WatchedDirectory[] watchedDirectories)
-    {
-        return new FileChangeContext([.. watchedDirectories], this);
-    }
+    public IFileChangeContext CreateContext(ImmutableArray<WatchedDirectory> watchedDirectories)
+        => new FileChangeContext(watchedDirectories, this);
 
-    private class FileChangeContext : IFileChangeContext
+    private sealed class FileChangeContext : IFileChangeContext
     {
         private readonly ImmutableArray<WatchedDirectory> _watchedDirectories;
         private readonly LspFileChangeWatcher _lspFileChangeWatcher;

src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/FileWatching/SimpleFileChangeWatcher.cs

@@ -17,12 +17,10 @@ namespace Microsoft.CodeAnalysis.LanguageServer.HostWorkspace.FileWatching;
 /// </remarks>
 internal sealed class SimpleFileChangeWatcher : IFileChangeWatcher
 {
-    public IFileChangeContext CreateContext(params WatchedDirectory[] watchedDirectories)
-    {
-        return new FileChangeContext([.. watchedDirectories]);
-    }
+    public IFileChangeContext CreateContext(ImmutableArray<WatchedDirectory> watchedDirectories)
+        => new FileChangeContext(watchedDirectories);
 
-    private class FileChangeContext : IFileChangeContext
+    private sealed class FileChangeContext : IFileChangeContext
     {
         private readonly ImmutableArray<WatchedDirectory> _watchedDirectories;
 

src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/LoadedProject.cs

@@ -43,14 +43,12 @@ public LoadedProject(ProjectSystemProject projectSystemProject, SolutionServices
         // We'll watch the directory for all source file changes
         // TODO: we only should listen for add/removals here, but we can't specify such a filter now
         var projectDirectory = Path.GetDirectoryName(projectSystemProject.FilePath)!;
-        var watchedDirectories = new WatchedDirectory[]
-        {
+
+        _fileChangeContext = fileWatcher.CreateContext([
             new(projectDirectory, ".cs"),
             new(projectDirectory, ".cshtml"),
             new(projectDirectory, ".razor")
-        };
-
-        _fileChangeContext = fileWatcher.CreateContext(watchedDirectories);
+        ]);
         _fileChangeContext.FileChanged += FileChangedContext_FileChanged;
 
         // Start watching for file changes for the project file as well

src/VisualStudio/Core/Def/ProjectSystem/FileChangeWatcher.cs

@@ -83,10 +83,8 @@ static int FindCombinableRange(ImmutableSegmentedList<WatcherOperation> operatio
         }
     }
 
-    public IFileChangeContext CreateContext(params WatchedDirectory[] watchedDirectories)
-    {
-        return new Context(this, watchedDirectories.ToImmutableArray());
-    }
+    public IFileChangeContext CreateContext(ImmutableArray<WatchedDirectory> watchedDirectories)
+        => new Context(this, watchedDirectories);
 
     /// <summary>
     /// Represents an operation to subscribe or unsubscribe from <see cref="IVsAsyncFileChangeEx2"/> events. The

src/VisualStudio/Core/Def/ProjectSystem/RuleSets/VisualStudioRuleSetManager.RuleSetFile.cs

@@ -66,7 +66,7 @@ public void InitializeFileTracking(IFileChangeWatcher fileChangeWatcher)
                         includes = [FilePath];
                     }
 
-                    _fileChangeContext = fileChangeWatcher.CreateContext();
+                    _fileChangeContext = fileChangeWatcher.CreateContext([]);
                     _fileChangeContext.FileChanged += IncludeUpdated;
 
                     foreach (var include in includes)

src/Workspaces/Core/Portable/Workspace/ProjectSystem/FileWatchedPortableExecutableReferenceFactory.cs

@@ -87,7 +87,7 @@ public FileWatchedPortableExecutableReferenceFactory(
                 referenceDirectories.Add(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".nuget", "packages"));
             }
 
-            var directoriesToWatch = referenceDirectories.Select(static d => new WatchedDirectory(d, ".dll")).ToArray();
+            var directoriesToWatch = referenceDirectories.SelectAsArray(static d => new WatchedDirectory(d, ".dll"));
             var fileReferenceChangeContext = fileChangeWatcher.CreateContext(directoriesToWatch);
             fileReferenceChangeContext.FileChanged += FileReferenceChangeContext_FileChanged;
             return fileReferenceChangeContext;

src/Workspaces/Core/Portable/Workspace/ProjectSystem/IFileChangeWatcher.cs

@@ -9,7 +9,7 @@ namespace Microsoft.CodeAnalysis.ProjectSystem;
 
 internal interface IFileChangeWatcher
 {
-    IFileChangeContext CreateContext(params WatchedDirectory[] watchedDirectories);
+    IFileChangeContext CreateContext(ImmutableArray<WatchedDirectory> watchedDirectories);
 }
 
 /// <summary>

src/Workspaces/Core/Portable/Workspace/ProjectSystem/ProjectSystemProject.cs

@@ -203,18 +203,14 @@ internal ProjectSystemProject(
         _documentFileChangeContext = _projectSystemProjectFactory.FileChangeWatcher.CreateContext(watchedDirectories);
         _documentFileChangeContext.FileChanged += DocumentFileChangeContext_FileChanged;
 
-        static WatchedDirectory[] GetWatchedDirectories(string? language, string? filePath)
+        static ImmutableArray<WatchedDirectory> GetWatchedDirectories(string? language, string? filePath)
         {
             if (filePath is null)
-            {
                 return [];
-            }
 
             var rootPath = Path.GetDirectoryName(filePath);
             if (rootPath is null)
-            {
                 return [];
-            }
 
             return language switch
             {