Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix LspFileChangeWatcher case sensitivity #72555

Merged
merged 4 commits into from
Mar 26, 2024
Merged

Fix LspFileChangeWatcher case sensitivity #72555

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8449799
Make file watcher dictionary lookup case insensitive on Windows and Mac
ryzngard Mar 15, 2024
d95e56e
Merge branch 'main' of https://github.com/dotnet/roslyn into lspfilew…
ryzngard Mar 15, 2024
3b8e904
Merge branch 'main' into lspfilewatcher_casesensitivity
ryzngard Mar 20, 2024
71768cf
Merge branch 'main' into lspfilewatcher_casesensitivity
ryzngard Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .../Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/FileWatching/LspFileChangeWatcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information.

using System.Collections.Immutable;
using System.Runtime.InteropServices;
using Microsoft.CodeAnalysis.LanguageServer.Handler;
using Microsoft.CodeAnalysis.LanguageServer.LanguageServer;
using Microsoft.CodeAnalysis.ProjectSystem;
Expand Down Expand Up @@ -64,7 +65,8 @@ private class FileChangeContext : IFileChangeContext
/// The list of file paths we're watching manually that were outside the directories being watched. The count in this case counts
/// the number of
/// </summary>
private readonly Dictionary<string, int> _watchedFiles = new Dictionary<string, int>(StringComparer.Ordinal);
private readonly Dictionary<string, int> _watchedFiles = new Dictionary<string, int>(_stringComparer);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wasn't sure exactly how to add a good test for this, am open to ideas + where it should go

private static readonly StringComparer _stringComparer = RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? StringComparer.Ordinal : StringComparer.OrdinalIgnoreCase;

public FileChangeContext(ImmutableArray<WatchedDirectory> watchedDirectories, LspFileChangeWatcher lspFileChangeWatcher)
{
Expand Down
Loading