Skip to content

Commit 7fe5c05

Browse files
committed
Remove duplicate filtering in UsingCodeFixProvider
Fixes #2000
1 parent 0b37962 commit 7fe5c05

3 files changed

Lines changed: 3 additions & 14 deletions

File tree

StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/OrderingRules/UsingCodeFixProvider.cs

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -710,20 +710,7 @@ private List<UsingDirectiveSyntax> GenerateUsings(List<UsingDirectiveSyntax> usi
710710
processedUsing = processedUsing.WithAdditionalAnnotations(FileHeaderStrippedAnnotation);
711711
}
712712

713-
// filter duplicate using declarations, preferring to keep the one with an alias
714-
var existingUsing = result.Find(u => string.Equals(u.Name.ToNormalizedString(), processedUsing.Name.ToNormalizedString(), StringComparison.Ordinal));
715-
if (existingUsing != null)
716-
{
717-
if (!existingUsing.HasNamespaceAliasQualifier() && processedUsing.HasNamespaceAliasQualifier())
718-
{
719-
result.Remove(existingUsing);
720-
result.Add(processedUsing);
721-
}
722-
}
723-
else
724-
{
725-
result.Add(processedUsing);
726-
}
713+
result.Add(processedUsing);
727714
}
728715

729716
result.Sort(this.CompareUsings);

StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1210CombinedSystemDirectivesUnitTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ namespace Food
138138
{
139139
using Food;
140140
using global::Food;
141+
using global::Food;
141142
using global::System;
142143
using global::System.IO;
143144
using global::System.Linq;

StyleCop.Analyzers/StyleCop.Analyzers.Test/OrderingRules/SA1210UnitTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ namespace Foo
198198
using corlib::System;
199199
using Foo;
200200
using global::Foo;
201+
using global::Foo;
201202
using global::System;
202203
using global::System.IO;
203204
using global::System.Linq;

0 commit comments

Comments
 (0)