Skip to content

Fix - local function - refactorings not available when selection is used #36592

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

Merged
petrroll merged 20 commits into from
Jun 25, 2019
Merged

Fix - local function - refactorings not available when selection is used #36592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
964d180
Fix ConvertLocalFuncToMethod not available when selection is used.
petrroll Jun 19, 2019
7f391d5
Address feedback.
petrroll Jun 20, 2019
4496519
Refactor fix.
petrroll Jun 20, 2019
d26882c
Refactored helper method out.
petrroll Jun 20, 2019
3ceb723
Refactor fix, add helper method for TryGetSelectedNode.
petrroll Jun 20, 2019
b086c6f
Add suport for TextSpan stripping & wire it within refactoring.
petrroll Jun 20, 2019
4ab1736
Bugfix + docs.
petrroll Jun 21, 2019
c9c5cd2
Fix run refactoring on block selection.
petrroll Jun 21, 2019
ae26e21
Docs cleaup.
petrroll Jun 21, 2019
a1d28fb
Async suffix fix.
petrroll Jun 21, 2019
19b30c3
Fix strip when only whitespace is selected, cleanup.
petrroll Jun 21, 2019
cb09fed
Update src/Features/CSharp/Portable/CodeRefactorings/ConvertLocalFunc…
petrroll Jun 21, 2019
0d8d5df
Apply suggestions from code review
petrroll Jun 21, 2019
04abe1a
cleaup + fix github suggestions commit.
petrroll Jun 21, 2019
483de3c
Selected block doesn't mean selected function.
petrroll Jun 21, 2019
0e564b1
Add test.
petrroll Jun 21, 2019
4f49a0b
Tree climbing when carrot is touching a node's edge.
petrroll Jun 21, 2019
593034e
cleanup.
petrroll Jun 21, 2019
a7d0691
docs
petrroll Jun 21, 2019
51aef1c
Fix potential issue with same-sized nodes.
petrroll Jun 21, 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
256 changes: 254 additions & 2 deletions .../CSharpTest/CodeActions/ConvertLocalFunctionToMethod/ConvertLocalFunctionToMethodTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,10 +505,11 @@ public async Task TestCaretPositon()
await TestAsync("C Local[||]Function(C c)");
await TestAsync("C [|LocalFunction|](C c)");
await TestAsync("C LocalFunction[||](C c)");
await TestMissingAsync("C Local[|Function|](C c)");
await TestMissingAsync("[||]C LocalFunction(C c)");
await TestAsync("C Local[|Function|](C c)");
await TestAsync("[||]C LocalFunction(C c)");
await TestMissingAsync("[|C|] LocalFunction(C c)");
await TestMissingAsync("C[||] LocalFunction(C c)");
await TestMissingAsync("C[| |]LocalFunction(C c)");
await TestMissingAsync("C LocalFunction([||]C c)");
await TestMissingAsync("C LocalFunction(C [||]c)");

Expand Down Expand Up @@ -553,5 +554,256 @@ void M()
}}");
}
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsConvertLocalFunctionToMethod)]
public async Task TestMethodBlockSelection1()
{
await TestInRegularAndScriptAsync(
@"class C
{
void M()
{
[|C LocalFunction(C c)
{
return null;
}|]
}
}",
@"class C
{
void M()
{
}

private static C LocalFunction(C c)
{
return null;
}
}");
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsConvertLocalFunctionToMethod)]
public async Task TestMethodBlockSelection2()
{

await TestMissingAsync(
@"class C
{
void M()
{
C LocalFunction(C c)[|
{
return null;
}|]
}
}");
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsConvertLocalFunctionToMethod)]
public async Task TestMethodBlockSelection3()
{
await TestInRegularAndScriptAsync(

@"class C
{
void M()
{
[|
C LocalFunction(C c)
{
return null;
}
|]
}
}",
@"class C
{
void M()
{

}

private static C LocalFunction(C c)
{
return null;
}
}");
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsConvertLocalFunctionToMethod)]
public async Task TestMethodBlockSelection4()
{

await this.TestMissingAsync(
@"class C
{
void M()
{

object a = null[|;
C LocalFunction(C c)
{
return null;

}|]
}
}");
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsConvertLocalFunctionToMethod)]
public async Task TestMethodBlockSelection5()
{

await this.TestMissingAsync(
@"class C
{
void M()
{

[|
C LocalFunction(C c)
{
return null;

}
object|] a = null
}
}");
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsConvertLocalFunctionToMethod)]
public async Task TestMethodBlockSelection6()
{

await this.TestMissingAsync(
@"class C
{
void M()
{
C LocalFunction(C c)
{
object b = null;
[|
object a = null;
return null;
|]

}
}
}");
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsConvertLocalFunctionToMethod)]
public async Task TestMethodBlockSelection7()
{
await TestMissingAsync(
@"class C
{
void M()
{
C LocalFunction(C c)
{
[|return null;|]
}
}
}");
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsConvertLocalFunctionToMethod)]
public async Task TestMethodBlockSelection8()
{
await TestInRegularAndScriptAsync(
@"class C
{
void M()
{
[|C LocalFunction(C c)|]
{
return null;
}
}
}",
@"class C
{
void M()
{
}

private static C LocalFunction(C c)
{
return null;
}
}");
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsConvertLocalFunctionToMethod)]
public async Task TestMethodBlockSelection9()
{
await TestInRegularAndScriptAsync(
@"class C
{
void M()
{
C LocalFunction(C c)
{
return null;
}[||]
}
}",
@"class C
{
void M()
{
}

private static C LocalFunction(C c)
{
return null;
}
}");
}

[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsConvertLocalFunctionToMethod)]
public async Task TestMethodBlockSelection10()
{
await TestInRegularAndScriptAsync(
@"class C
{
void M()
{
[||]C LocalFunction(C c)
{
return null;
}
}
}",
@"class C
{
void M()
{
}

private static C LocalFunction(C c)
{
return null;
}
}");
}
[Fact, Trait(Traits.Feature, Traits.Features.CodeActionsConvertLocalFunctionToMethod)]
public async Task TestMethodBlockSelection11()
{
await TestMissingAsync(
@"class C
{
void M()
{
object a = null;[||]
C LocalFunction(C c)
{
return null;
}
}
}");
}
}
}
21 changes: 5 additions & 16 deletions ...ConvertLocalFunctionToMethod/CSharpConvertLocalFunctionToMethodCodeRefactoringProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
using Microsoft.CodeAnalysis.Shared.Extensions;
using Microsoft.CodeAnalysis.Shared.Utilities;
using Microsoft.CodeAnalysis.Simplification;
using Microsoft.CodeAnalysis.Text;
using Roslyn.Utilities;

namespace Microsoft.CodeAnalysis.CSharp.CodeRefactorings.ConvertLocalFunctionToMethod
Expand All @@ -40,23 +41,9 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
}

var cancellationToken = context.CancellationToken;
var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);

var identifier = await root.SyntaxTree.GetTouchingTokenAsync(context.Span.Start,
token => token.Parent.IsKind(SyntaxKind.LocalFunctionStatement), cancellationToken).ConfigureAwait(false);
if (identifier == default)
{
return;
}

if (context.Span.Length > 0 &&
context.Span != identifier.Span)
{
return;
}

var localFunction = (LocalFunctionStatementSyntax)identifier.Parent;
if (localFunction.Identifier != identifier)
var localFunction = await CodeRefactoringHelpers.TryGetSelectedNodeAsync<LocalFunctionStatementSyntax>(document, context.Span, cancellationToken).ConfigureAwait(false);
if (localFunction == default)
{
return;
}
Expand All @@ -66,6 +53,8 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
return;
}

var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);

context.RegisterRefactoring(new MyCodeAction(CSharpFeaturesResources.Convert_to_method,
c => UpdateDocumentAsync(root, document, parentBlock, localFunction, c)));
}
Expand Down
Loading