Make FilePathNormalizer.GetHashCode case insensitive

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Cohost/CohostProjectSnapshot.cs

@@ -56,7 +56,7 @@ public CohostProjectSnapshot(Project project, DocumentSnapshotFactory documentSn
 
         _importsToRelatedDocumentsLazy = new Lazy<ImmutableDictionary<string, ImmutableArray<string>>>(() =>
         {
-            var importsToRelatedDocuments = ImmutableDictionary.Create<string, ImmutableArray<string>>(FilePathNormalizer.Comparer);
+            var importsToRelatedDocuments = ImmutableDictionary.Create<string, ImmutableArray<string>>(FilePathNormalizingComparer.Instance);
             foreach (var document in DocumentFilePaths)
             {
                 var importTargetPaths = ProjectState.GetImportDocumentTargetPaths(document, FileKinds.GetFileKindFromFilePath(document), _lazyProjectEngine.Value);

src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Utilities/FilePathNormalizer.cs

@@ -3,27 +3,17 @@
 
 using System;
 using System.Buffers;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Microsoft.CodeAnalysis.Razor;
+#if !NET
 using Microsoft.Extensions.Internal;
+#endif
 
 namespace Microsoft.AspNetCore.Razor.Utilities;
 
 internal static class FilePathNormalizer
 {
-    private static Lazy<IEqualityComparer<string>> _lazyComparer = new Lazy<IEqualityComparer<string>>(() => new FilePathNormalizingComparer());
-    public static IEqualityComparer<string> Comparer => _lazyComparer.Value;
-
-    private class FilePathNormalizingComparer : IEqualityComparer<string>
-    {
-        public bool Equals(string? x, string? y) => FilePathNormalizer.FilePathsEquivalent(x, y);
-
-        public int GetHashCode([DisallowNull] string obj) => FilePathNormalizer.GetHashCode(obj);
-    }
-
     public static string NormalizeDirectory(string? directoryFilePath)
     {
         if (directoryFilePath.IsNullOrEmpty())
@@ -131,7 +121,7 @@ public static bool FilePathsEquivalent(string? filePath1, string? filePath2)
         return normalizedSpan1.Equals(normalizedSpan2, FilePathComparison.Instance);
     }
 
-    public static int GetHashCode(string filePath)
+    public static int GetHashCode(string filePath, Func<char, char> charConverter)
     {
         if (filePath.Length == 0)
         {
@@ -143,14 +133,18 @@ public static int GetHashCode(string filePath)
         using var _ = ArrayPool<char>.Shared.GetPooledArray(filePathSpan.Length, out var array1);
         var normalizedSpan = NormalizeCoreAndGetSpan(filePathSpan, array1);
 
+#if NET
+        return string.GetHashCode(normalizedSpan, FilePathComparison.Instance);
+#else
         var hashCombiner = HashCodeCombiner.Start();
 
         foreach (var ch in normalizedSpan)
         {
-            hashCombiner.Add(ch);
+            hashCombiner.Add(charConverter(ch));
         }
 
         return hashCombiner.CombinedHash;
+#endif
     }
 
     private static ReadOnlySpan<char> NormalizeCoreAndGetSpan(ReadOnlySpan<char> source, Span<char> destination)

src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Utilities/FilePathNormalizingComparer.cs

@@ -0,0 +1,25 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.AspNetCore.Razor.Utilities;
+
+internal sealed class FilePathNormalizingComparer : IEqualityComparer<string>
+{
+    public static readonly FilePathNormalizingComparer Instance = new FilePathNormalizingComparer();
+
+    private static readonly Func<char, char> _charConverter = RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
+        ? c => c
+        : char.ToLowerInvariant;
+
+    private FilePathNormalizingComparer()
+    {
+    }
+
+    public bool Equals(string? x, string? y) => FilePathNormalizer.FilePathsEquivalent(x, y);
+
+    public int GetHashCode(string obj) => FilePathNormalizer.GetHashCode(obj, _charConverter);
+}

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectSnapshot.cs

@@ -26,7 +26,7 @@ public ProjectSnapshot(ProjectState state)
         State = state ?? throw new ArgumentNullException(nameof(state));
 
         _lock = new object();
-        _documents = new Dictionary<string, DocumentSnapshot>(FilePathNormalizer.Comparer);
+        _documents = new Dictionary<string, DocumentSnapshot>(FilePathNormalizingComparer.Instance);
     }
 
     public ProjectKey Key => State.HostProject.Key;

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectState.cs

@@ -31,8 +31,8 @@ internal class ProjectState
         ProjectDifference.DocumentAdded |
         ProjectDifference.DocumentRemoved;
 
-    private static readonly ImmutableDictionary<string, DocumentState> s_emptyDocuments = ImmutableDictionary.Create<string, DocumentState>(FilePathNormalizer.Comparer);
-    private static readonly ImmutableDictionary<string, ImmutableArray<string>> s_emptyImportsToRelatedDocuments = ImmutableDictionary.Create<string, ImmutableArray<string>>(FilePathNormalizer.Comparer);
+    private static readonly ImmutableDictionary<string, DocumentState> s_emptyDocuments = ImmutableDictionary.Create<string, DocumentState>(FilePathNormalizingComparer.Instance);
+    private static readonly ImmutableDictionary<string, ImmutableArray<string>> s_emptyImportsToRelatedDocuments = ImmutableDictionary.Create<string, ImmutableArray<string>>(FilePathNormalizingComparer.Instance);
     private readonly object _lock;
 
     private readonly IProjectEngineFactoryProvider _projectEngineFactoryProvider;
@@ -360,7 +360,7 @@ public ProjectState WithHostProject(HostProject hostProject)
             return this;
         }
 
-        var documents = Documents.ToImmutableDictionary(kvp => kvp.Key, kvp => kvp.Value.WithConfigurationChange(), FilePathNormalizer.Comparer);
+        var documents = Documents.ToImmutableDictionary(kvp => kvp.Key, kvp => kvp.Value.WithConfigurationChange(), FilePathNormalizingComparer.Instance);
 
         // If the host project has changed then we need to recompute the imports map
         var importsToRelatedDocuments = s_emptyImportsToRelatedDocuments;
@@ -388,7 +388,7 @@ public ProjectState WithProjectWorkspaceState(ProjectWorkspaceState projectWorks
         }
 
         var difference = ProjectDifference.ProjectWorkspaceStateChanged;
-        var documents = Documents.ToImmutableDictionary(kvp => kvp.Key, kvp => kvp.Value.WithProjectWorkspaceStateChange(), FilePathNormalizer.Comparer);
+        var documents = Documents.ToImmutableDictionary(kvp => kvp.Key, kvp => kvp.Value.WithProjectWorkspaceStateChange(), FilePathNormalizingComparer.Instance);
         var state = new ProjectState(this, difference, HostProject, projectWorkspaceState, documents, ImportsToRelatedDocuments);
         return state;
     }
@@ -448,7 +448,7 @@ internal static List<string> GetImportDocumentTargetPaths(string targetPath, str
         {
             var itemTargetPath = importItem.FilePath.Replace('/', '\\').TrimStart('\\');
 
-            if (FilePathNormalizer.Comparer.Equals(itemTargetPath, targetPath))
+            if (FilePathNormalizingComparer.Instance.Equals(itemTargetPath, targetPath))
             {
                 // We've normalized the original importItem.FilePath into the HostDocument.TargetPath. For instance, if the HostDocument.TargetPath
                 // was '/_Imports.razor' it'd be normalized down into '_Imports.razor'. The purpose of this method is to get the associated document

src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorProjectServiceTest.cs

@@ -1228,12 +1228,15 @@ await RunOnDispatcherAsync(() =>
         });
 
         // Assert
-        listener.AssertNotifications(
+
+        // AddProject iterates through a dictionary to migrate documents, so the order of the documents is not deterministic. In the real world
+        // the adds and removes are interleaved per document
+        listener.OrderBy(e => e.Kind).ThenBy(e => e.DocumentFilePath).AssertNotifications(
             x => x.ProjectAdded(ProjectFilePath, newProjectKey),
-            x => x.DocumentRemoved(DocumentFilePath2, miscProject.Key),
+            x => x.DocumentAdded(DocumentFilePath1, newProjectKey),
             x => x.DocumentAdded(DocumentFilePath2, newProjectKey),
             x => x.DocumentRemoved(DocumentFilePath1, miscProject.Key),
-            x => x.DocumentAdded(DocumentFilePath1, newProjectKey));
+            x => x.DocumentRemoved(DocumentFilePath2, miscProject.Key));
     }
 
     private static TextLoader CreateEmptyTextLoader()

src/Razor/test/Microsoft.AspNetCore.Razor.ProjectEngineHost.Test/FilePathNormalizerTest.cs

@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
+using System.Collections.Generic;
 using Microsoft.AspNetCore.Razor.Test.Common;
 using Microsoft.AspNetCore.Razor.Utilities;
 using Xunit;
@@ -240,4 +241,22 @@ public void Normalize_ReplacesBackSlashesWithForwardSlashes()
         // Assert
         Assert.Equal("C:/path/to/document.cshtml", normalized);
     }
+
+    [OSSkipConditionTheory(["OSX", "Linux"])]
+    [InlineData(@"C:\path\to\document.cshtml")]
+    [InlineData(@"c:\path\to\document.cshtml")]
+    [InlineData("C:/path/to/document.cshtml")]
+    [InlineData("c:/path/to/document.cshtml")]
+    public void Comparer_CaseInsensitiveDictionary(string fileName)
+    {
+        var dictionary = new Dictionary<string, bool>(FilePathNormalizingComparer.Instance)
+        {
+            { "C:/path/to/document.cshtml", true },
+            { "C:/path/to/document1.cshtml", true },
+            { "C:/path/to/document2.cshtml", true }
+        };
+
+        Assert.True(dictionary.ContainsKey(fileName));
+        Assert.True(dictionary.TryGetValue(fileName, out _));
+    }
 }

src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/ProjectSystem/NotificationAssertions.cs

@@ -0,0 +1,33 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.CodeAnalysis.Razor.ProjectSystem;
+using Xunit;
+using static Microsoft.AspNetCore.Razor.Test.Common.ProjectSystem.TestProjectSnapshotManager.Listener;
+
+namespace Microsoft.AspNetCore.Razor.Test.Common.ProjectSystem;
+
+internal static class NotificationAssertions
+{
+    public static void AssertNoNotifications(this IEnumerable<ProjectChangeEventArgs> notifications)
+    {
+        Assert.Empty(notifications);
+    }
+
+    public static void AssertNotifications(this IEnumerable<ProjectChangeEventArgs> notifications, params Action<Inspector>[] inspectors)
+    {
+        Assert.Equal(notifications.Count(), inspectors.Length);
+
+        var i = 0;
+        foreach (var notification in notifications)
+        {
+            var inspector = inspectors[i];
+            inspector(new(notification));
+
+            i++;
+        }
+    }
+}

src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/ProjectSystem/TestProjectSnapshotManager.Listener.cs

@@ -5,7 +5,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test.Common.ProjectSystem;
 
@@ -46,21 +45,5 @@ private void ProjectManager_Changed(object? sender, ProjectChangeEventArgs e)
         {
             _notifications.Add(e);
         }
-
-        public void AssertNoNotifications()
-        {
-            Assert.Empty(_notifications);
-        }
-
-        public void AssertNotifications(params Action<Inspector>[] inspectors)
-        {
-            Assert.Equal(_notifications.Count, inspectors.Length);
-
-            for (var i = 0; i < _notifications.Count; i++)
-            {
-                var inspector = inspectors[i];
-                inspector(new(_notifications[i]));
-            }
-        }
     }
 }