Thanks to visit codestin.com
Credit goes to github.com

Skip to content

#903 (#CC0052): Fix for Duplication of Directives When Fixing Readonly #1038

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

#903 (#CC0052): Fix for Duplication of Directives When Fixing Readonly #1038

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
89eec16
#903 - Fixed the duplication of the readonly keyword when applying th…
cj-the-affable Oct 5, 2019
1d19e2c
#903 - Fixed the duplication of directives when applying 'readonly' fix.
cj-the-affable Oct 5, 2019
8a7765c
Merge branch '903-readonly-duplicates' of https://github.com/CygnusSW…
cj-the-affable Oct 5, 2019
7232690
Replaced the hard-coded '\n' with the user's platform eol-of-choice.
cj-the-affable Oct 5, 2019
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
14 changes: 9 additions & 5 deletions src/CSharp/CodeCracker/Usage/ReadonlyFieldCodeFixProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Formatting;
using System;
using System.Collections.Immutable;
using System.Composition;
using System.Linq;
Expand Down Expand Up @@ -44,10 +45,13 @@ private async static Task<Document> MakeFieldReadonlyAsync(Document document, Di

private static SyntaxNode MakeSingleFieldReadonly(SyntaxNode root, FieldDeclarationSyntax fieldDeclaration)
{
var newFieldDeclaration = fieldDeclaration.AddModifiers(SyntaxFactory.Token(SyntaxKind.ReadOnlyKeyword))
.WithTrailingTrivia(fieldDeclaration.GetTrailingTrivia())
.WithLeadingTrivia(fieldDeclaration.GetLeadingTrivia())
.WithAdditionalAnnotations(Formatter.Annotation);

var newFieldDeclaration = fieldDeclaration
.WithoutLeadingTrivia()
.AddModifiers(SyntaxFactory.Token(SyntaxKind.ReadOnlyKeyword))
.WithTrailingTrivia(fieldDeclaration.GetTrailingTrivia())
.WithLeadingTrivia(fieldDeclaration.GetLeadingTrivia())
.WithAdditionalAnnotations(Formatter.Annotation);
var newRoot = root.ReplaceNode(fieldDeclaration, newFieldDeclaration);
return newRoot;
}
Expand All @@ -57,8 +61,8 @@ private static SyntaxNode MakeMultipleFieldsReadonly(SyntaxNode root, FieldDecla
var newFieldDeclaration = fieldDeclaration.WithDeclaration(newDeclaration);
var newReadonlyFieldDeclaration = fieldDeclaration.WithDeclaration(SyntaxFactory.VariableDeclaration(fieldDeclaration.Declaration.Type, SyntaxFactory.SeparatedList(new[] { variableToMakeReadonly })))
.WithoutLeadingTrivia()
.WithTrailingTrivia(SyntaxFactory.ParseTrailingTrivia("\n"))
.AddModifiers(SyntaxFactory.Token(SyntaxKind.ReadOnlyKeyword))
.WithTrailingTrivia(SyntaxFactory.ParseTrailingTrivia(Environment.NewLine))
.WithAdditionalAnnotations(Formatter.Annotation);
var newRoot = root.ReplaceNode(fieldDeclaration, new[] { newFieldDeclaration, newReadonlyFieldDeclaration });
return newRoot;
Expand Down
71 changes: 71 additions & 0 deletions test/CSharp/CodeCracker.Test/Usage/ReadonlyFieldTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,77 @@ class TypeName
await VerifyCSharpFixAsync(source, fixtest);
}


[Fact]
public async Task DoesNotDuplicateLeadingDirectivesOnFixSingle()
{
const string source = @"
namespace ConsoleApplication1
{
public class Foo
{
#region standard
Foo foo1 = new Foo();
#endregion

#region withAccessModifier
private Foo foo2 = new Foo();
#endregion

#region withStatic
private static Foo foo3 = new Foo();
#endregion
}
}";
const string fixtest = @"
namespace ConsoleApplication1
{
public class Foo
{
#region standard
readonly Foo foo1 = new Foo();
#endregion

#region withAccessModifier
private readonly Foo foo2 = new Foo();
#endregion

#region withStatic
private static readonly Foo foo3 = new Foo();
#endregion
}
}";
await VerifyCSharpFixAsync(source, fixtest);
}


[Fact]
public async Task DoesNotDuplicateLeadingDirectivesOnFixAll()
{
const string source = @"
namespace ConsoleApplication1
{
public class Foo
{
#region standard
Foo foo1, foo2 = new Foo(), foo3;
#endregion
}
}";
const string fixtest = @"
namespace ConsoleApplication1
{
public class Foo
{
#region standard
Foo foo1, foo3;
readonly Foo foo2 = new Foo();
#endregion
}
}";
await VerifyCSharpFixAsync(source, fixtest);
}

[Fact]
public async Task FieldsWithAssignmentOnDeclarationWithSingleDeclarationCreatesDiagnostic()
{
Expand Down