From bed999ce5b3dfbce3815ec613e97e5d74614751c Mon Sep 17 00:00:00 2001 From: CyrusNajmabadi Date: Fri, 3 Jun 2016 19:10:18 -0700 Subject: [PATCH] Inline method. --- ...stractReplacePropertyWithMethodsService.cs | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Features/Core/Portable/ReplacePropertyWithMethods/AbstractReplacePropertyWithMethodsService.cs b/src/Features/Core/Portable/ReplacePropertyWithMethods/AbstractReplacePropertyWithMethodsService.cs index e7ddc328ba7..0c4c9bdba24 100644 --- a/src/Features/Core/Portable/ReplacePropertyWithMethods/AbstractReplacePropertyWithMethodsService.cs +++ b/src/Features/Core/Portable/ReplacePropertyWithMethods/AbstractReplacePropertyWithMethodsService.cs @@ -113,7 +113,8 @@ private struct ReferenceReplacer { // We're being read from and written to (i.e. Prop++), we need to replace with a // Get and a Set call. - var readExpression = replacer.GetReadExpression(keepTrivia: false, conflictMessage: null); + var readExpression = replacer.GetReadExpression( + keepTrivia: false, conflictMessage: null); var literalOne = replacer.Generator.LiteralExpression(1); var writeValue = replacer._syntaxFacts.IsOperandOfIncrementExpression(replacer._expression) @@ -126,10 +127,15 @@ private struct ReferenceReplacer private static GetWriteValue getWriteValueForCompoundAssignment = (replacer, parent) => { - var readExpression = replacer.GetReadExpression(keepTrivia: false, conflictMessage: null); + // We're being read from and written to from a compound assignment + // (i.e. Prop *= X), we need to replace with a Get and a Set call. + + var readExpression = replacer.GetReadExpression( + keepTrivia: false, conflictMessage: null); // Convert "Prop *= X" into "Prop * X". - return replacer._service.UnwrapCompoundAssignment(parent, readExpression); + return replacer._service.UnwrapCompoundAssignment( + parent, readExpression); }; private SyntaxGenerator Generator => _editor.Generator; @@ -164,7 +170,10 @@ public void Do() } else if (_syntaxFacts.IsLeftSideOfAnyAssignment(_expression)) { - HandleCompoundAssignExpression(); + ReplaceWrite( + getWriteValueForCompoundAssignment, + keepTrivia: true, + conflictMessage: null); } else if (_syntaxFacts.IsOperandOfIncrementOrDecrementExpression(_expression)) { @@ -195,8 +204,9 @@ public void Do() private void ReplaceRead(bool keepTrivia, string conflictMessage) { - var readExpression = GetReadExpression(keepTrivia, conflictMessage); - _editor.ReplaceNode(_expression, readExpression); + _editor.ReplaceNode( + _expression, + GetReadExpression(keepTrivia, conflictMessage)); } private void ReplaceWrite( @@ -321,16 +331,6 @@ private bool ShouldWriteToBackingField() return _propertyBackingField != null && _property.SetMethod == null; } - private void HandleCompoundAssignExpression() - { - // We're being read from and written to from a compound assignment - // (i.e. Prop *= X), we need to replace with a Get and a Set call. - ReplaceWrite( - getWriteValueForCompoundAssignment, - keepTrivia: true, - conflictMessage: null); - } - private static TIdentifierNameSyntax AddConflictAnnotation(TIdentifierNameSyntax name, string conflictMessage) { return name.ReplaceToken( -- GitLab