Skip to content
This repository was archived by the owner on Jul 12, 2022. It is now read-only.

Commit 20595c9

Browse files
committed
Ignore .Generated.cs files
1 parent 4bb5fa0 commit 20595c9

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

src/Microsoft.DotNet.CodeFormatting/Extensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ namespace Microsoft.DotNet.CodeFormatting
1010
{
1111
internal static class Extensions
1212
{
13-
public static IEnumerable<SyntaxTrivia> AddTwoNewLines(this IEnumerable<SyntaxTrivia> trivia)
13+
internal static IEnumerable<SyntaxTrivia> AddTwoNewLines(this IEnumerable<SyntaxTrivia> trivia)
1414
{
1515
return trivia.Concat(new[] { SyntaxFactory.CarriageReturnLineFeed, SyntaxFactory.CarriageReturnLineFeed });
1616
}
1717

18-
public static IEnumerable<SyntaxTrivia> AddNewLine(this IEnumerable<SyntaxTrivia> trivia)
18+
internal static IEnumerable<SyntaxTrivia> AddNewLine(this IEnumerable<SyntaxTrivia> trivia)
1919
{
2020
return trivia.Concat(new[] { SyntaxFactory.CarriageReturnLineFeed });
2121
}

src/Microsoft.DotNet.CodeFormatting/Filters/IgnoreDesignerGeneratedCodeFilter.cs renamed to src/Microsoft.DotNet.CodeFormatting/Filters/IgnoreGeneratedFilesFilter.cs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
namespace Microsoft.DotNet.CodeFormatting.Filters
1111
{
1212
[Export(typeof(IFormattingFilter))]
13-
internal sealed class IgnoreDesignerGeneratedCodeFilter : IFormattingFilter
13+
internal sealed class IgnoreGeneratedFilesFilter : IFormattingFilter
1414
{
1515
public bool ShouldBeProcessed(Document document)
1616
{
@@ -19,8 +19,13 @@ public bool ShouldBeProcessed(Document document)
1919
return true;
2020
}
2121

22-
var isDesignerGenerated = document.FilePath.EndsWith(".Designer.cs", StringComparison.OrdinalIgnoreCase);
23-
return !isDesignerGenerated;
22+
if (document.FilePath.EndsWith(".Designer.cs", StringComparison.OrdinalIgnoreCase) ||
23+
document.FilePath.EndsWith(".Generated.cs", StringComparison.OrdinalIgnoreCase))
24+
{
25+
return false;
26+
}
27+
28+
return true;
2429
}
2530
}
2631
}

src/Microsoft.DotNet.CodeFormatting/Microsoft.DotNet.CodeFormatting.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<Compile Include="IFormattingEngine.cs" />
8181
<Compile Include="IFormattingFilter.cs" />
8282
<Compile Include="IFormattingRule.cs" />
83-
<Compile Include="Filters\IgnoreDesignerGeneratedCodeFilter.cs" />
83+
<Compile Include="Filters\IgnoreGeneratedFilesFilter.cs" />
8484
<Compile Include="Options.cs" />
8585
<Compile Include="RuleOrderAttribute.cs" />
8686
<Compile Include="Properties\AssemblyInfo.cs" />

0 commit comments

Comments
 (0)