Skip to content

Use BatchFixer to fix all for naming violation #59452

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

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Use BatchFixer to fix all for naming violation #59452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
516b58b
Modify the CodeFixProvider to use BatchFixer
Cosifne Feb 8, 2022
eafa054
Clean the If Code_Style code
Cosifne Feb 10, 2022
b56d16d
Delete unused tests
Cosifne Feb 10, 2022
626d3f2
Add fix all tests
Cosifne Feb 22, 2022
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
190 changes: 109 additions & 81 deletions src/Analyzers/CSharp/Tests/NamingStyles/NamingStylesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1221,87 +1221,6 @@ internal interface
", new TestParameters(options: s_options.InterfaceNamesStartWithI));
}

#if CODE_STYLE
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/42218")]
#else
[Fact]
#endif
[Trait(Traits.Feature, Traits.Features.NamingStyle)]
[WorkItem(16562, "https://github.com/dotnet/roslyn/issues/16562")]
public async Task TestRefactorNotify()
{
var markup = @"public class [|c|] { }";
var testParameters = new TestParameters(options: s_options.ClassNamesArePascalCase);

using var workspace = CreateWorkspaceFromOptions(markup, testParameters);
var (_, action) = await GetCodeActionsAsync(workspace, testParameters);

var previewOperations = await action.GetPreviewOperationsAsync(CancellationToken.None);
Assert.Empty(previewOperations.OfType<TestSymbolRenamedCodeActionOperationFactoryWorkspaceService.Operation>());

var commitOperations = await action.GetOperationsAsync(CancellationToken.None);
Assert.Equal(2, commitOperations.Length);

var symbolRenamedOperation = (TestSymbolRenamedCodeActionOperationFactoryWorkspaceService.Operation)commitOperations[1];
Assert.Equal("c", symbolRenamedOperation._symbol.Name);
Assert.Equal("C", symbolRenamedOperation._newName);
}

#if CODE_STYLE
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/42218")]
#else
[Fact]
#endif
[Trait(Traits.Feature, Traits.Features.NamingStyle)]
[WorkItem(38513, "https://github.com/dotnet/roslyn/issues/38513")]
public async Task TestRefactorNotifyInterfaceNamesStartWithI()
{
var markup = @"public interface [|test|] { }";
var testParameters = new TestParameters(options: s_options.InterfaceNamesStartWithI);

using var workspace = CreateWorkspaceFromOptions(markup, testParameters);
var (_, action) = await GetCodeActionsAsync(workspace, testParameters);

var previewOperations = await action.GetPreviewOperationsAsync(CancellationToken.None);
Assert.Empty(previewOperations.OfType<TestSymbolRenamedCodeActionOperationFactoryWorkspaceService.Operation>());

var commitOperations = await action.GetOperationsAsync(CancellationToken.None);
Assert.Equal(2, commitOperations.Length);

var symbolRenamedOperation = (TestSymbolRenamedCodeActionOperationFactoryWorkspaceService.Operation)commitOperations[1];
Assert.Equal("test", symbolRenamedOperation._symbol.Name);
Assert.Equal("ITest", symbolRenamedOperation._newName);
}

#if CODE_STYLE
[Fact(Skip = "https://github.com/dotnet/roslyn/issues/42218")]
#else
[Fact]
#endif
[Trait(Traits.Feature, Traits.Features.NamingStyle)]
[WorkItem(38513, "https://github.com/dotnet/roslyn/issues/38513")]
public async Task TestRefactorNotifyTypeParameterNamesStartWithT()
{
var markup = @"public class A
{
void DoOtherThing<[|arg|]>() { }
}";
var testParameters = new TestParameters(options: s_options.TypeParameterNamesStartWithT);

using var workspace = CreateWorkspaceFromOptions(markup, testParameters);
var (_, action) = await GetCodeActionsAsync(workspace, testParameters);

var previewOperations = await action.GetPreviewOperationsAsync(CancellationToken.None);
Assert.Empty(previewOperations.OfType<TestSymbolRenamedCodeActionOperationFactoryWorkspaceService.Operation>());

var commitOperations = await action.GetOperationsAsync(CancellationToken.None);
Assert.Equal(2, commitOperations.Length);

var symbolRenamedOperation = (TestSymbolRenamedCodeActionOperationFactoryWorkspaceService.Operation)commitOperations[1];
Assert.Equal("arg", symbolRenamedOperation._symbol.Name);
Assert.Equal("TArg", symbolRenamedOperation._newName);
}

[Fact, Trait(Traits.Feature, Traits.Features.NamingStyle)]
[WorkItem(47508, "https://github.com/dotnet/roslyn/issues/47508")]
public async Task TestRecordParameter_NoDiagnosticWhenCorrect()
Expand Down Expand Up @@ -1421,5 +1340,114 @@ class C
static extern void [|some_p_invoke()|];
}", new TestParameters(options: s_options.MethodNamesArePascalCase));
}

[Fact]
public async Task TestFixAllInDocument()
{
await TestInRegularAndScript1Async(
@"
class Cls
{
public void {|FixAllInDocument:hello|}() { }
public int world() => 1;
}",
@"
class Cls
{
public void Hello() { }
public int World() => 1;
}", new TestParameters(options: s_options.MethodNamesArePascalCase));
}

[Fact]
public async Task TestFixAllInProject()
{
await TestInRegularAndScript1Async(
@"<Workspace>
<Project Language = ""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
<Document FilePath = ""z:\\file1.cs"">
class Cls
{
public void {|FixAllInProject:hello|}() { }
public int world() => 1;
}
</Document>
<Document FilePath = ""z:\\file2.cs"">
class Cls2
{
public void hello2() { }
public int world() => 1;
}
</Document>
</Project>
</Workspace>",
@"<Workspace>
<Project Language = ""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
<Document FilePath = ""z:\\file1.cs"">
class Cls
{
public void Hello() { }
public int World() => 1;
}
</Document>
<Document FilePath = ""z:\\file2.cs"">
class Cls2
{
public void Hello2() { }
public int World() => 1;
}
</Document>
</Project>
</Workspace>",
new TestParameters(options: s_options.MethodNamesArePascalCase));
}

[Fact]
public async Task TestFixAllInSolution()
{
await TestInRegularAndScript1Async(
@"<Workspace>
<Project Language = ""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
<Document FilePath = ""z:\\file1.cs"">
class Cls
{
public void {|FixAllInSolution:hello|}() { }
public int world() => 1;
}
</Document>
</Project>
<Project Language = ""C#"" AssemblyName=""Assembly2"" CommonReferences=""true"">
<Document FilePath = ""z:\\file2.cs"">
class Cls2
{
public void hello() { }
public int world() => 2;
}
</Document>
</Project>
</Workspace>",
@"<Workspace>
<Project Language = ""C#"" AssemblyName=""Assembly1"" CommonReferences=""true"">
<Document FilePath = ""z:\\file1.cs"">
class Cls
{
public void Hello() { }
public int World() => 1;
}
</Document>
</Project>
<Project Language = ""C#"" AssemblyName=""Assembly2"" CommonReferences=""true"">
<Document FilePath = ""z:\\file2.cs"">
class Cls2
{
public void Hello() { }
public int World() => 2;
}
</Document>
</Project>
</Workspace>",
new TestParameters(options: s_options.MethodNamesArePascalCase));

}
}
}
4 changes: 2 additions & 2 deletions src/Analyzers/Core/CodeFixes/CodeFixesResources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@
<data name="Add_file_header" xml:space="preserve">
<value>Add file header</value>
</data>
<data name="Fix_Name_Violation_colon_0" xml:space="preserve">
<value>Fix Name Violation: {0}</value>
<data name="Fix_Name_Violation" xml:space="preserve">
<value>Fix Name Violation</value>
Comment on lines +123 to +124
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the resource is being changed anyway, I think the casing should be fixed to be consistent with other codefix titles.

Suggested change
<data name="Fix_Name_Violation" xml:space="preserve">
<value>Fix Name Violation</value>
<data name="Fix_name_violation" xml:space="preserve">
<value>Fix name violation</value>

</data>
<data name="Add_both" xml:space="preserve">
<value>Add both</value>
Expand Down
Loading