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

Remove unnecessary calls to Contains for sets #69179

Merged
merged 3 commits into from
Jul 25, 2023
Merged

Remove unnecessary calls to Contains for sets #69179

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3dac4bc
Remove unnecessary calls to Contains for sets
mpidash Jul 23, 2023
28f42ef
Move comment back inside If
mpidash Jul 24, 2023
98a0ae0
Enable CA1865: Unnecessary call to Contains
mpidash Jul 25, 2023
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
3 changes: 1 addition & 2 deletions src/Compilers/Core/CodeAnalysisTest/Collections/HashSet/ISet_Generic_Tests`1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,8 +592,7 @@ public void ISet_Generic_SymmetricExceptWith_AfterRemovingElements(EnumerableTyp
{
ISet<T> set = GenericISetFactory(setLength);
T value = CreateT(532);
if (!set.Contains(value))
set.Add(value);
set.Add(value);
set.Remove(value);
IEnumerable<T> enumerable = CreateEnumerable(enumerableType, set, enumerableLength, numberOfMatchingElements, numberOfDuplicateElements);
Debug.Assert(enumerable != null);
Expand Down
9 changes: 2 additions & 7 deletions src/Compilers/Core/Portable/MetadataReader/MetadataDecoder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2070,10 +2070,8 @@ private MethodSymbol FindMethodSymbolInSuperType(TypeDefinitionHandle searchType
TypeDefinitionHandle typeDef = typeDefsToSearch.Dequeue();
Debug.Assert(!typeDef.IsNil);

if (!visitedTypeDefTokens.Contains(typeDef))
if (visitedTypeDefTokens.Add(typeDef))
{
visitedTypeDefTokens.Add(typeDef);

foreach (MethodDefinitionHandle methodDef in Module.GetMethodsOfTypeOrThrow(typeDef))
{
if (methodDef == targetMethodDef)
Expand All @@ -2091,12 +2089,9 @@ private MethodSymbol FindMethodSymbolInSuperType(TypeDefinitionHandle searchType
TypeSymbol typeSymbol = typeSymbolsToSearch.Dequeue();
Debug.Assert(typeSymbol != null);

if (!visitedTypeSymbols.Contains(typeSymbol))
if (visitedTypeSymbols.Add(typeSymbol))
{
visitedTypeSymbols.Add(typeSymbol);

//we're looking for a method def but we're currently on a type *ref*, so just enqueue supertypes

EnqueueTypeSymbolInterfacesAndBaseTypes(typeDefsToSearch, typeSymbolsToSearch, typeSymbol);
}
}
Expand Down
3 changes: 1 addition & 2 deletions src/Compilers/VisualBasic/Portable/Symbols/Source/SourceMemberContainerTypeSymbol.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1802,9 +1802,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols
Dim candidateLocation As Location = candidate.NonMergedLocation
Debug.Assert(candidateLocation IsNot Nothing)

If partialMethods.Contains(candidate) Then
If partialMethods.Remove(candidate) Then
' partial-partial conflict
partialMethods.Remove(candidate)

' the 'best' partial method is the one with the 'smallest'
' location, we should report errors on the other
Expand Down
3 changes: 1 addition & 2 deletions src/EditorFeatures/Core/CodeDefinitionWindow/DefinitionContextTracker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,8 @@ void ITextViewConnectionListener.SubjectBuffersDisconnected(ITextView textView,
if (reason == ConnectionReason.TextViewLifetime ||
!textView.BufferGraph.GetTextBuffers(b => b.ContentType.IsOfType(ContentTypeNames.RoslynContentType)).Any())
{
if (_subscribedViews.Contains(textView))
if (_subscribedViews.Remove(textView))
{
_subscribedViews.Remove(textView);
textView.Caret.PositionChanged -= OnTextViewCaretPositionChanged;
}
}
Expand Down
6 changes: 1 addition & 5 deletions src/VisualStudio/Core/Def/ChangeSignature/ChangeSignatureDialogViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,11 +241,7 @@ internal void Remove()
{
var parameterToRemove = AllParameters[_selectedIndex!.Value];

if (_parametersWithoutDefaultValues.Contains(parameterToRemove))
{
_parametersWithoutDefaultValues.Remove(parameterToRemove);
}
else
if (!_parametersWithoutDefaultValues.Remove(parameterToRemove))
{
_parametersWithDefaultValues.Remove(parameterToRemove);
}
Expand Down
5 changes: 1 addition & 4 deletions src/VisualStudio/Core/Def/Interop/CleanableWeakComHandleTable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,7 @@ public TValue Remove(TKey key)
{
this.AssertIsForeground();

if (_deadKeySet.Contains(key))
{
_deadKeySet.Remove(key);
}
_deadKeySet.Remove(key);

if (_table.TryGetValue(key, out var handle))
{
Expand Down
4 changes: 1 addition & 3 deletions src/VisualStudio/VisualBasic/Impl/ProjectSystemShim/VisualBasicProject.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,9 +338,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.ProjectSystemShim
' To keep things simple, we'll just remove everything and add everything back in
For Each oldRuntimeLibrary In oldRuntimeLibraries
' If this one was added explicitly in addition to our computation, we don't have to remove it
If _explicitlyAddedRuntimeLibraries.Contains(oldRuntimeLibrary) Then
_explicitlyAddedRuntimeLibraries.Remove(oldRuntimeLibrary)
Else
If Not _explicitlyAddedRuntimeLibraries.Remove(oldRuntimeLibrary) Then
ProjectSystemProject.RemoveMetadataReference(oldRuntimeLibrary, MetadataReferenceProperties.Assembly)
End If
Next
Expand Down