Skip to content

Switch to existing helpers for multi-dictionary use #78862

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

Merged
merged 2 commits into from
Jun 9, 2025
Merged

Switch to existing helpers for multi-dictionary use #78862

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e220432
Switch to existing helpers for multi-dictionary use
CyrusNajmabadi Jun 8, 2025
9ee7f1e
Merge remote-tracking branch 'upstream/main' into multiDictionary
CyrusNajmabadi Jun 9, 2025
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
33 changes: 5 additions & 28 deletions src/VisualStudio/Core/Impl/SolutionExplorer/SymbolTree/RootSymbolTreeItemSourceProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
using Microsoft.VisualStudio.Shell;
using Microsoft.VisualStudio.Shell.Interop;
using Microsoft.VisualStudio.Utilities;
using Roslyn.Utilities;

namespace Microsoft.VisualStudio.LanguageServices.Implementation.SolutionExplorer;

Expand Down Expand Up @@ -170,7 +171,7 @@ await source.UpdateIfEverExpandedAsync(cancellationToken)
var source = new RootSymbolTreeItemCollectionSource(this, item);
lock (_filePathToCollectionSources)
{
AddToDictionary(currentFilePath, source);
_filePathToCollectionSources.MultiAdd(currentFilePath, source);
}

// Register to hear about if this hierarchy is disposed. We'll stop watching it if so.
Expand All @@ -186,7 +187,7 @@ void OnItemPropertyChanged(object sender, PropertyChangedEventArgs e)
// event for the IsDisposed property. When this fires, we remove the filePath->sourcce mapping we're holding.
lock (_filePathToCollectionSources)
{
RemoveFromDictionary(currentFilePath, source);
_filePathToCollectionSources.MultiRemove(currentFilePath, source);
}

item.PropertyChanged -= OnItemPropertyChanged;
Expand All @@ -200,8 +201,8 @@ void OnItemPropertyChanged(object sender, PropertyChangedEventArgs e)
{

// Unlink the oldPath->source mapping, and add a new line for the newPath->source.
RemoveFromDictionary(currentFilePath, source);
AddToDictionary(newPath, source);
_filePathToCollectionSources.MultiRemove(currentFilePath, source);
_filePathToCollectionSources.MultiAdd(newPath, source);

// Keep track of the 'newPath'.
currentFilePath = newPath;
Expand All @@ -216,29 +217,5 @@ void OnItemPropertyChanged(object sender, PropertyChangedEventArgs e)
}
}
}

void AddToDictionary(string currentFilePath, RootSymbolTreeItemCollectionSource source)
{
if (!_filePathToCollectionSources.TryGetValue(currentFilePath, out var sources))
{
sources = [];
_filePathToCollectionSources[currentFilePath] = sources;
}

sources.Add(source);
}

void RemoveFromDictionary(string currentFilePath, RootSymbolTreeItemCollectionSource source)
{
if (_filePathToCollectionSources.TryGetValue(currentFilePath, out var sources))
{
sources.Remove(source);

if (sources.Count == 0)
{
_filePathToCollectionSources.Remove(currentFilePath);
}
}
}
}
}
Loading