-
-
Notifications
You must be signed in to change notification settings - Fork 100
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.
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
Object creation still uses SpaceBrace #467
Merged
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
efddb53
Make sure new object does not space brace
belav 9b90aa9
Adding a way to try to find usages of different syntax
belav 1cafc8b
Go back to the start
belav 307e09f
Adding another test case
belav 5ed8743
Merge branch 'master' into leftover-space-brace
shocklateboy92 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,169 @@ | ||
| using System; | ||
| using System.IO; | ||
| using System.Linq; | ||
| using Microsoft.CodeAnalysis; | ||
| using Microsoft.CodeAnalysis.CSharp; | ||
| using Microsoft.CodeAnalysis.CSharp.Syntax; | ||
|
|
||
| namespace SyntaxFinder | ||
| { | ||
| // Customize this in some way to find variations of syntax | ||
| // csharpier-repos isn't a huge result set, but it can give you | ||
| // some idea what syntax people prefer | ||
| // make sure csharpier-repos is on main before running | ||
| class Program | ||
| { | ||
| static void Main(string[] args) | ||
| { | ||
| foreach ( | ||
| var file in Directory.EnumerateFiles( | ||
| "C:\\projects\\csharpier-repos", | ||
| "*.cs", | ||
| SearchOption.AllDirectories | ||
| ) | ||
| ) | ||
| { | ||
| if (Ignored.Is(file)) | ||
| { | ||
| continue; | ||
| } | ||
|
|
||
| var contents = File.ReadAllText(file); | ||
| var tree = CSharpSyntaxTree.ParseText(contents); | ||
|
|
||
| var customWalker = new CustomWalker(); | ||
| customWalker.Visit(tree.GetRoot()); | ||
| } | ||
|
|
||
| WriteResult("Matching", CustomWalker.Matching.ToString("n0")); | ||
| WriteResult("Total", CustomWalker.Total.ToString("n0")); | ||
| WriteResult( | ||
| "Percent", | ||
| (Convert.ToDecimal(CustomWalker.Matching) / CustomWalker.Total * 100).ToString("n") | ||
| + "%" | ||
| ); | ||
| } | ||
|
|
||
| private static void WriteResult(string label, string value) | ||
| { | ||
| Console.WriteLine((label + ":").PadRight(20) + value.PadLeft(10)); | ||
| } | ||
| } | ||
|
|
||
| public class CustomWalker : CSharpSyntaxWalker | ||
| { | ||
| public static int Total; | ||
| public static int Matching; | ||
|
|
||
| public override void VisitDoStatement(DoStatementSyntax node) | ||
| { | ||
| var fileLinePositionSpan = node.SyntaxTree.GetLineSpan(node.Span); | ||
| var sourceText = node.SyntaxTree.GetTextAsync().Result; | ||
| for ( | ||
| var line = fileLinePositionSpan.EndLinePosition.Line; | ||
| line >= fileLinePositionSpan.StartLinePosition.Line; | ||
| line-- | ||
| ) | ||
| { | ||
| var actualLine = sourceText.Lines[line].ToString(); | ||
| if (actualLine.Contains("} while")) | ||
| { | ||
| Total++; | ||
| Matching++; | ||
| break; | ||
| } | ||
| else if (actualLine.Contains("while")) | ||
| { | ||
| Total++; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| base.VisitDoStatement(node); | ||
| } | ||
| } | ||
|
|
||
| public static class Ignored | ||
| { | ||
| public static bool Is(string file) | ||
| { | ||
| return ignored.Any(file.Replace("\\", "/").Contains); | ||
| } | ||
|
|
||
| private static string[] ignored = new[] | ||
| { | ||
| "roslyn/src/Compilers/Test/Core/Assert/ConditionalFactAttribute.cs", | ||
| "roslyn/src/Compilers/Test/Core/Compilation/RuntimeUtilities.cs", | ||
| "runtime/src/libraries/System.Net.Primitives/tests/FunctionalTests/SocketAddressTest.cs", | ||
| "runtime/src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedDocuments.cs", | ||
| "aspnetcore/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Controllers/HomeController.cs", | ||
| "aspnetcore/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/Controllers/WeatherForecastController.cs", | ||
| "AspNetWebStack/test/System.Web.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyExplicitExpression.cs", | ||
| "AspNetWebStack/test/System.Web.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyImplicitExpression.cs", | ||
| "AspNetWebStack/test/System.Web.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyImplicitExpressionInCode.cs", | ||
| "AspNetWebStack/test/System.Web.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyImplicitExpressionInCode.Tabs.cs", | ||
| "AspNetWebStack/test/System.Web.Razor.Test/TestFiles/CodeGenerator/CS/Output/ExplicitExpressionAtEOF.cs", | ||
| "AspNetWebStack/test/System.Web.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingCloseParen.cs", | ||
| "AspNetWebStack/test/System.Web.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingOpenBrace.cs", | ||
| "AspNetWebStack/test/System.Web.Razor.Test/TestFiles/CodeGenerator/CS/Output/HiddenSpansInCode.cs", | ||
| "AspNetWebStack/test/System.Web.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingOpenParen.cs", | ||
| "AspNetWebStack/test/System.Web.Razor.Test/TestFiles/CodeGenerator/CS/Output/ImplicitExpressionAtEOF.cs", | ||
| "AspNetWebStack/test/System.Web.Razor.Test/TestFiles/CodeGenerator/CS/Output/Inherits.Designtime.cs", | ||
| "AspNetWebStack/test/System.Web.Razor.Test/TestFiles/CodeGenerator/CS/Output/Inherits.Runtime.cs", | ||
| "AspNetWebStack/test/System.Web.Razor.Test/TestFiles/CodeGenerator/CS/Output/OpenedIf.DesignTime.cs", | ||
| "AspNetWebStack/test/System.Web.Razor.Test/TestFiles/CodeGenerator/CS/Output/OpenedIf.DesignTime.Tabs.cs", | ||
| "AspNetWebStack/test/System.Web.Razor.Test/TestFiles/CodeGenerator/CS/Output/ParserError.cs", | ||
| "AspNetWebStack/test/System.Web.Razor.Test/TestFiles/CodeGenerator/CS/Output/RazorComments.cs", | ||
| "AspNetWebStack/test/System.Web.Razor.Test/TestFiles/CodeGenerator/CS/Output/RazorComments.DesignTime.cs", | ||
| "AspNetWebStack/test/System.Web.Razor.Test/TestFiles/CodeGenerator/CS/Output/Sections.cs", | ||
| "AspNetWebStack/test/System.Web.Razor.Test/TestFiles/CodeGenerator/CS/Output/UnfinishedExpressionInCode.cs", | ||
| "AspNetWebStack/test/System.Web.Razor.Test/TestFiles/CodeGenerator/CS/Output/UnfinishedExpressionInCode.Tabs.cs", | ||
| "runtime/src/libraries/System.Text.Encoding.CodePages/src/System/Text/EncodingTable.Data.cs", | ||
| "runtime/src/libraries/System.Text.Json/tests/TrimmingTests/Collections/ICollection.cs", | ||
| "runtime/src/tests/JIT/jit64/opt/cse/HugeArray.cs", | ||
| "runtime/src/tests/JIT/jit64/opt/rngchk/RngchkStress2.cs", | ||
| "runtime/src/tests/JIT/jit64/opt/cse/HugeArray1.cs", | ||
| "runtime/src/tests/JIT/Methodical/largeframes/skip2/skippage2.cs", | ||
| "runtime/src/tests/JIT/Methodical/largeframes/skip6/skippage6.cs", | ||
| "runtime/src/tests/JIT/Performance/CodeQuality/Bytemark/neural-dat.cs", | ||
| "runtime/src/tests/JIT/Regression/JitBlue/GitHub_10215/GitHub_10215.cs", | ||
| "aspnetcore/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Controllers/WeatherForecastController.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_Runtime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_DesignTime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ComplexTagHelpers_Runtime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_Runtime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyAttributeTagHelpers_DesignTime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_Runtime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_Runtime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_Runtime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_Runtime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_Runtime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_DesignTime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_Runtime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.codegen.cs", | ||
| "aspnetcore/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TransitionsInTagHelperAttributes_Runtime.codegen.cs", | ||
| "runtime/src/tests/JIT/jit64/opt/cse/hugeSimpleExpr1.cs", | ||
| "runtime/src/tests/JIT/jit64/opt/cse/HugeField1.cs", | ||
| "runtime/src/tests/JIT/jit64/opt/cse/HugeField2.cs", | ||
| "roslyn/src/Compilers/Test/Resources/Core/SymbolsTests/Metadata/public-and-private.cs", | ||
| "runtime/src/tests/JIT/jit64/opt/cse/hugeexpr1.cs", | ||
| "runtime/src/tests/Loader/classloader/generics/Instantiation/Nesting/NestedGenericClasses.cs", | ||
| "runtime/src/tests/Loader/classloader/generics/Instantiation/Nesting/NestedGenericTypesMix.cs", | ||
| "runtime/src/tests/Loader/classloader/generics/Instantiation/Nesting/NestedGenericStructs.cs", | ||
| }; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <OutputType>Exe</OutputType> | ||
| <TargetFramework>net5.0</TargetFramework> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0" /> | ||
| <PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Woah... this one took me for a ride. Maybe introducing tools like this should be done in their own PRs in future 😉