Skip to content

#2 fix #3

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 2 commits into
base: master
Choose a base branch
from
Open

#2 fix #3

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
e30e5be
#2 fixed
dogfuntom Jan 6, 2015
14cd554
added VS14 Ultimate support
dogfuntom Jan 6, 2015
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
1 change: 1 addition & 0 deletions ...itionalOperatorAnalyzer/UseConditionalOperatorAnalyzer.Vsix/source.extension.vsixmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<InstallationTarget Version="[14.0,]" Id="Microsoft.VisualStudio.VSWinDesktopExpress" />
<InstallationTarget Version="[14.0,]" Id="Microsoft.VisualStudio.VWDExpress" />
<InstallationTarget Version="[14.0,]" Id="Microsoft.VisualStudio.VSWinExpress" />
<InstallationTarget Version="[14.0,15.0)" Id="Microsoft.VisualStudio.Ultimate" />
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="4.5" />
Expand Down
33 changes: 31 additions & 2 deletions UseConditionalOperatorAnalyzer/UseConditionalOperatorAnalyzer/CodeFixProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,35 @@ private static TNode CreateNodeWithSourceFormatting<TNode>(SyntaxNode sourceNode
.WithTrailingTrivia(sourceNode.GetTrailingTrivia());
}

private static ExpressionSyntax ExtractSimpleAssignmentRight(AssignmentExpressionSyntax assignment)
{
switch (assignment.CSharpKind())
{
case SyntaxKind.AddAssignmentExpression:
return SyntaxFactory.BinaryExpression(SyntaxKind.AddExpression, assignment.Left, assignment.Right);
case SyntaxKind.SubtractAssignmentExpression:
return SyntaxFactory.BinaryExpression(SyntaxKind.SubtractExpression, assignment.Left, assignment.Right);
case SyntaxKind.MultiplyAssignmentExpression:
return SyntaxFactory.BinaryExpression(SyntaxKind.MultiplyExpression, assignment.Left, assignment.Right);
case SyntaxKind.DivideAssignmentExpression:
return SyntaxFactory.BinaryExpression(SyntaxKind.DivideExpression, assignment.Left, assignment.Right);
case SyntaxKind.ModuloAssignmentExpression:
return SyntaxFactory.BinaryExpression(SyntaxKind.ModuloExpression, assignment.Left, assignment.Right);
case SyntaxKind.AndAssignmentExpression:
return SyntaxFactory.BinaryExpression(SyntaxKind.AndAssignmentExpression, assignment.Left, assignment.Right);
case SyntaxKind.OrAssignmentExpression:
return SyntaxFactory.BinaryExpression(SyntaxKind.OrAssignmentExpression, assignment.Left, assignment.Right);
case SyntaxKind.ExclusiveOrAssignmentExpression:
return SyntaxFactory.BinaryExpression(SyntaxKind.ExclusiveOrExpression, assignment.Left, assignment.Right);
case SyntaxKind.LeftShiftAssignmentExpression:
return SyntaxFactory.BinaryExpression(SyntaxKind.LeftShiftExpression, assignment.Left, assignment.Right);
case SyntaxKind.RightShiftAssignmentExpression:
return SyntaxFactory.BinaryExpression(SyntaxKind.RightShiftExpression, assignment.Left, assignment.Right);
default:
return assignment.Right;
}
}

private static LocalDeclarationStatementSyntax CreateVarDeclaration(string symbolName, ExpressionSyntax expression)
{
return
Expand All @@ -78,8 +107,8 @@ private async static Task<SyntaxNode> ApplyAssignmentCodeFix(Document sourceDocu
SyntaxFactory
.ConditionalExpression(
ApplyFormatting(SyntaxFactory.ParenthesizedExpression(ifStatement.Condition)),
ApplyFormatting(truePartExpr.Right),
ApplyFormatting(falsePartExpr.Right));
ApplyFormatting(ExtractSimpleAssignmentRight(truePartExpr)),
ApplyFormatting(ExtractSimpleAssignmentRight(falsePartExpr)));

var assignmentExpr =
SyntaxFactory
Expand Down