Skip to content
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

Fix issue with improper formatting in introduce-variable #73392

Merged
merged 2 commits into from
May 8, 2024
Merged

Fix issue with improper formatting in introduce-variable #73392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1437df
Fix issue with improper formatting in introduce-variable
CyrusNajmabadi May 8, 2024
6973de7
Fix test
CyrusNajmabadi May 8, 2024
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
2 changes: 1 addition & 1 deletion src/Features/CSharpTest/IntroduceVariable/IntroduceVariableTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5977,7 +5977,7 @@ void M()
{
int x = 1;
int {|Rename:y1|} = C.y;
var t = new { y= y1, y= y1 }; // this is an error already
var t = new { y = y1, y = y1 }; // this is an error already
Copy link
Member Author

Choose a reason for hiding this comment

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

old formatting was wrong here.

Copy link
Member Author

Choose a reason for hiding this comment

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

includes changes from #73392. once that goes in, this won't be part of this pr.

}
}
""";
Expand Down
2 changes: 1 addition & 1 deletion ...IntroduceVariable/AbstractIntroduceVariableService.AbstractIntroduceVariableCodeAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace Microsoft.CodeAnalysis.IntroduceVariable;

internal partial class AbstractIntroduceVariableService<TService, TExpressionSyntax, TTypeSyntax, TTypeDeclarationSyntax, TQueryExpressionSyntax, TNameSyntax>
{
internal abstract class AbstractIntroduceVariableCodeAction : CodeAction
private abstract class AbstractIntroduceVariableCodeAction : CodeAction
{
private readonly bool _allOccurrences;
private readonly bool _isConstant;
Expand Down
25 changes: 10 additions & 15 deletions src/Features/Core/Portable/IntroduceVariable/AbstractIntroduceVariableService.CodeAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,22 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#nullable disable
Copy link
Member Author

Choose a reason for hiding this comment

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

view with whitespace off.


using Microsoft.CodeAnalysis.CodeCleanup;

namespace Microsoft.CodeAnalysis.IntroduceVariable;

internal partial class AbstractIntroduceVariableService<TService, TExpressionSyntax, TTypeSyntax, TTypeDeclarationSyntax, TQueryExpressionSyntax, TNameSyntax>
{
private class IntroduceVariableCodeAction : AbstractIntroduceVariableCodeAction
private sealed class IntroduceVariableCodeAction(
TService service,
SemanticDocument document,
CodeCleanupOptions options,
TExpressionSyntax expression,
bool allOccurrences,
bool isConstant,
bool isLocal,
bool isQueryLocal) : AbstractIntroduceVariableCodeAction(
service, document, options, expression, allOccurrences, isConstant, isLocal, isQueryLocal)
{
internal IntroduceVariableCodeAction(
TService service,
SemanticDocument document,
CodeCleanupOptions options,
TExpressionSyntax expression,
bool allOccurrences,
bool isConstant,
bool isLocal,
bool isQueryLocal)
: base(service, document, options, expression, allOccurrences, isConstant, isLocal, isQueryLocal)
{
}
}
}
38 changes: 10 additions & 28 deletions ...duceVariable/AbstractIntroduceVariableService.IntroduceVariableAllOccurrenceCodeAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,22 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#nullable disable

using System.Threading;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CaseCorrection;
using Microsoft.CodeAnalysis.CodeCleanup;
using Microsoft.CodeAnalysis.Formatting;
using Microsoft.CodeAnalysis.Simplification;

namespace Microsoft.CodeAnalysis.IntroduceVariable;

internal partial class AbstractIntroduceVariableService<TService, TExpressionSyntax, TTypeSyntax, TTypeDeclarationSyntax, TQueryExpressionSyntax, TNameSyntax>
{
private class IntroduceVariableAllOccurrenceCodeAction : AbstractIntroduceVariableCodeAction
private class IntroduceVariableAllOccurrenceCodeAction(
TService service,
SemanticDocument document,
CodeCleanupOptions options,
TExpressionSyntax expression,
bool allOccurrences,
bool isConstant,
bool isLocal,
bool isQueryLocal) : AbstractIntroduceVariableCodeAction(
service, document, options, expression, allOccurrences, isConstant, isLocal, isQueryLocal)
{
internal IntroduceVariableAllOccurrenceCodeAction(
TService service,
SemanticDocument document,
CodeCleanupOptions options,
TExpressionSyntax expression,
bool allOccurrences,
bool isConstant,
bool isLocal,
bool isQueryLocal)
: base(service, document, options, expression, allOccurrences, isConstant, isLocal, isQueryLocal)
{
}

protected override async Task<Document> PostProcessChangesAsync(Document document, CancellationToken cancellationToken)
{
document = await Simplifier.ReduceAsync(document, Simplifier.Annotation, Options.SimplifierOptions, cancellationToken).ConfigureAwait(false);
document = await Formatter.FormatAsync(document, Formatter.Annotation, Options.FormattingOptions, cancellationToken).ConfigureAwait(false);
document = await CaseCorrector.CaseCorrectAsync(document, CaseCorrector.Annotation, cancellationToken).ConfigureAwait(false);
return document;
}
Copy link
Member Author

Choose a reason for hiding this comment

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

removing this method is the fix. it was trying to override the formatitng pass. however, my prior pr fixes things so that formatting happens at the right phase.

}
}
13 changes: 4 additions & 9 deletions src/Features/Core/Portable/IntroduceVariable/IntroduceVariableCodeRefactoringProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,11 @@ namespace Microsoft.CodeAnalysis.IntroduceVariable;
[ExtensionOrder(After = PredefinedCodeRefactoringProviderNames.ConvertAnonymousTypeToClass)]
[ExtensionOrder(After = PredefinedCodeRefactoringProviderNames.InvertConditional)]
[ExtensionOrder(After = PredefinedCodeRefactoringProviderNames.InvertLogical)]
[ExportCodeRefactoringProvider(LanguageNames.CSharp, LanguageNames.VisualBasic,
Name = PredefinedCodeRefactoringProviderNames.IntroduceVariable), Shared]
internal class IntroduceVariableCodeRefactoringProvider : CodeRefactoringProvider
[ExportCodeRefactoringProvider(LanguageNames.CSharp, LanguageNames.VisualBasic, Name = PredefinedCodeRefactoringProviderNames.IntroduceVariable), Shared]
[method: ImportingConstructor]
[method: SuppressMessage("RoslynDiagnosticsReliability", "RS0033:Importing constructor should be [Obsolete]", Justification = "Used in test code: https://github.com/dotnet/roslyn/issues/42814")]
internal sealed class IntroduceVariableCodeRefactoringProvider() : CodeRefactoringProvider
{
[ImportingConstructor]
[SuppressMessage("RoslynDiagnosticsReliability", "RS0033:Importing constructor should be [Obsolete]", Justification = "Used in test code: https://github.com/dotnet/roslyn/issues/42814")]
public IntroduceVariableCodeRefactoringProvider()
{
}

public override async Task ComputeRefactoringsAsync(CodeRefactoringContext context)
{
var (document, textSpan, cancellationToken) = context;
Expand Down
Loading