Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

体验新版 GitCode，发现更多精彩内容 >>

提交 6534b368 编写于 作者: C CyrusNajmabadi
浏览文件
操作

less allocations by passing along the desired name

上级 fe2a4dbb
隐藏空白更改
内联 并排
Showing with 93 addition and 89 deletion
src/Features/CSharp/Portable/ReplacePropertyWithMethods/CSharpReplacePropertyWithMethodsService.cs
浏览文件 @ 6534b368
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Composition;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CodeActions;
using Microsoft.CodeAnalysis.CSharp.Extensions;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Editing;
using Microsoft.CodeAnalysis.Host.Mef;
using Microsoft.CodeAnalysis.ReplacePropertyWithMethods;
using Microsoft.CodeAnalysis.Shared.Utilities;
namespace Microsoft.CodeAnalysis.CSharp.ReplacePropertyWithMethods
{
......@@ -45,7 +40,9 @@ public SyntaxNode GetPropertyDeclaration(SyntaxToken token)
SemanticModel semanticModel,
IPropertySymbol property,
SyntaxNode declaration,
IFieldSymbol propertyBackingField)
IFieldSymbol propertyBackingField,
string desiredGetMethodName,
string desiredSetMethodName)
{
var propertyDeclaration = declaration as PropertyDeclarationSyntax;
if (propertyDeclaration == null)
......@@ -54,7 +51,9 @@ public SyntaxNode GetPropertyDeclaration(SyntaxToken token)
}
var members = ConvertPropertyToMembers(
semanticModel, editor.Generator, property, propertyDeclaration, propertyBackingField);
semanticModel, editor.Generator, property,
propertyDeclaration, propertyBackingField,
desiredGetMethodName, desiredSetMethodName);
if (property.ContainingType.TypeKind == TypeKind.Interface)
{
......@@ -69,7 +68,9 @@ public SyntaxNode GetPropertyDeclaration(SyntaxToken token)
private List<SyntaxNode> ConvertPropertyToMembers(
SemanticModel semanticModel, SyntaxGenerator generator,
IPropertySymbol property, PropertyDeclarationSyntax propertyDeclaration,
IFieldSymbol propertyBackingField)
IFieldSymbol propertyBackingField,
string desiredGetMethodName,
string desiredSetMethodName)
{
var result = new List<SyntaxNode>();
......@@ -82,25 +83,30 @@ public SyntaxNode GetPropertyDeclaration(SyntaxToken token)
var getMethod = property.GetMethod;
if (getMethod != null)
{
result.Add(GetGetMethod(generator, propertyDeclaration, propertyBackingField, getMethod));
result.Add(GetGetMethod(
generator, propertyDeclaration, propertyBackingField, getMethod, desiredGetMethodName));
}
var setMethod = property.SetMethod;
if (setMethod != null)
{
result.Add(GetSetMethod(generator, propertyDeclaration, setMethod));
result.Add(GetSetMethod(generator, propertyDeclaration, setMethod, desiredSetMethodName));
}
return result;
}
private static SyntaxNode GetSetMethod(SyntaxGenerator generator, PropertyDeclarationSyntax propertyDeclaration, IMethodSymbol setMethod)
private static SyntaxNode GetSetMethod(
SyntaxGenerator generator,
PropertyDeclarationSyntax propertyDeclaration,
IMethodSymbol setMethod,
string desiredSetMethodName)
{
var setAccessorDeclaration = propertyDeclaration.AccessorList.Accessors.FirstOrDefault(
a => a.Kind() == SyntaxKind.SetAccessorDeclaration);
var method = generator.MethodDeclaration(
setMethod, "Set" + setMethod.AssociatedSymbol.Name, setAccessorDeclaration?.Body?.Statements);
setMethod, desiredSetMethodName, setAccessorDeclaration?.Body?.Statements);
return method;
}
......@@ -108,7 +114,8 @@ private static SyntaxNode GetSetMethod(SyntaxGenerator generator, PropertyDeclar
SyntaxGenerator generator,
PropertyDeclarationSyntax propertyDeclaration,
IFieldSymbol propertyBackingField,
IMethodSymbol getMethod)
IMethodSymbol getMethod,
string desiredGetMethodName)
{
var statements = new List<SyntaxNode>();
......@@ -132,16 +139,16 @@ private static SyntaxNode GetSetMethod(SyntaxGenerator generator, PropertyDeclar
}
}
var methodDeclaration = generator.MethodDeclaration(
getMethod, "Get" + getMethod.AssociatedSymbol.Name, statements);
return methodDeclaration;
return generator.MethodDeclaration(getMethod, desiredGetMethodName, statements);
}
public void ReplaceReference(
SyntaxEditor editor, SyntaxToken nameToken,
IPropertySymbol property, IFieldSymbol propertyBackingField)
IPropertySymbol property, IFieldSymbol propertyBackingField,
string desiredGetMethodName, string desiredSetMethodName)
{
var referenceReplacer = new ReferenceReplacer(editor, nameToken, property, propertyBackingField);
var referenceReplacer = new ReferenceReplacer(
editor, nameToken, property, propertyBackingField, desiredGetMethodName, desiredSetMethodName);
referenceReplacer.Do();
}
......@@ -166,16 +173,24 @@ private struct ReferenceReplacer
private readonly SyntaxToken _nameToken;
private readonly IPropertySymbol _property;
private readonly IFieldSymbol _propertyBackingField;
private readonly string _desiredGetMethodName;
private readonly string _desiredSetMethodName;
private readonly IdentifierNameSyntax _identifierName;
private readonly ExpressionSyntax _expression;
public ReferenceReplacer(SyntaxEditor editor, SyntaxToken nameToken, IPropertySymbol property, IFieldSymbol propertyBackingField)
public ReferenceReplacer(
SyntaxEditor editor, SyntaxToken nameToken,
IPropertySymbol property, IFieldSymbol propertyBackingField,
string desiredGetMethodName,
string desiredSetMethodName)
{
_editor = editor;
_nameToken = nameToken;
_property = property;
_propertyBackingField = propertyBackingField;
_desiredGetMethodName = desiredGetMethodName;
_desiredSetMethodName = desiredSetMethodName;
_identifierName = (IdentifierNameSyntax)nameToken.Parent;
_expression = _identifierName;
......@@ -191,7 +206,8 @@ public void Do()
{
// Code wasn't legal (you can't reference a property in an out/ref position in C#).
// Just replace this with a simple GetCall, but mark it so it's clear there's an error.
ReplaceRead(CSharpFeaturesResources.Property_cannot_safely_be_replaced_with_a_method_call);
ReplaceRead(
CSharpFeaturesResources.Property_cannot_safely_be_replaced_with_a_method_call);
}
else if (_expression.IsAttributeNamedArgumentIdentifier())
{
......@@ -222,14 +238,15 @@ public void Do()
ReplaceReadAndWrite(operatorKind,
writeValue: SyntaxFactory.LiteralExpression(
SyntaxKind.NumericLiteralExpression, SyntaxFactory.Literal(1)));
SyntaxKind.NumericLiteralExpression, SyntaxFactory.Literal(1)),
conflictMessage: null);
}
else if (_expression.IsParentKind(SyntaxKind.AnonymousObjectMemberDeclarator))
{
// If we have: new { this.Prop }. We need ot convert it to:
// new { Prop = this.GetProp() }
var declarator = (AnonymousObjectMemberDeclaratorSyntax)_expression.Parent;
var readExpression = GetReadExpression();
var readExpression = GetReadExpression(conflictMessage: null);
if (declarator.NameEquals != null)
{
......@@ -248,11 +265,11 @@ public void Do()
else
{
// No writes. Replace this with an appropriate read.
ReplaceRead();
ReplaceRead(conflictMessage: null);
}
}
private void ReplaceRead(string conflictMessage = null)
private void ReplaceRead(string conflictMessage)
{
var readExpression = GetReadExpression(conflictMessage);
_editor.ReplaceNode(_expression, readExpression);
......@@ -264,7 +281,8 @@ private void ReplaceWrite(ExpressionSyntax writeValue)
_editor.ReplaceNode(_expression.Parent, writeExpression);
}
private ExpressionSyntax GetReadExpression(string conflictMessage = null)
private ExpressionSyntax GetReadExpression(
string conflictMessage)
{
if (ShouldReadFromBackingField())
{
......@@ -283,10 +301,13 @@ private ExpressionSyntax GetWriteExpression(ExpressionSyntax writeValue)
{
if (ShouldWriteToBackingField())
{
var newIdentifierToken = SyntaxFactory.Identifier(_propertyBackingField.Name);
var newIdentifierName = _identifierName.WithIdentifier(newIdentifierToken);
var newIdentifierName = _identifierName.WithIdentifier(
SyntaxFactory.Identifier(_propertyBackingField.Name));
return _expression.ReplaceNode(_identifierName, newIdentifierName);
return SyntaxFactory.AssignmentExpression(
SyntaxKind.SimpleAssignmentExpression,
_expression.ReplaceNode(_identifierName, newIdentifierName),
writeValue);
}
else
{
......@@ -294,17 +315,17 @@ private ExpressionSyntax GetWriteExpression(ExpressionSyntax writeValue)
}
}
private ExpressionSyntax GetGetInvocationExpression(string conflictMessage = null)
private ExpressionSyntax GetGetInvocationExpression(
string conflictMessage)
{
return GetInvocationExpression("Get" + _nameToken.ValueText,
argument: null, conflictMessage: conflictMessage);
return GetInvocationExpression(_desiredGetMethodName, argument: null, conflictMessage: conflictMessage);
}
private ExpressionSyntax GetInvocationExpression(
string name, ArgumentSyntax argument, string conflictMessage = null)
string desiredName, ArgumentSyntax argument, string conflictMessage)
{
var newIdentifier = AddConflictAnnotation(
SyntaxFactory.Identifier(name), conflictMessage);
SyntaxFactory.Identifier(desiredName), conflictMessage);
var updatedExpression = _expression.ReplaceNode(
_identifierName,
......@@ -322,24 +343,15 @@ private ExpressionSyntax GetGetInvocationExpression(string conflictMessage = nul
return invocation;
}
private bool ShouldReadFromBackingField()
{
return _propertyBackingField != null && _property.GetMethod == null;
}
private void ReplaceWithBackingFieldReference()
{
var newIdentifier = SyntaxFactory.IdentifierName(
SyntaxFactory.Identifier(_propertyBackingField.Name)).WithTriviaFrom(_identifierName);
_editor.ReplaceNode(_identifierName, newIdentifier);
}
private ExpressionSyntax GetSetInvocationExpression(
ExpressionSyntax writeValue, string conflictMessage = null)
{
return GetInvocationExpression("Set" + _nameToken.ValueText,
argument: SyntaxFactory.Argument(writeValue), conflictMessage: conflictMessage);
return GetInvocationExpression(_desiredSetMethodName, argument: SyntaxFactory.Argument(writeValue), conflictMessage: conflictMessage);
}
private bool ShouldWriteToBackingField()
......@@ -365,39 +377,19 @@ private void HandleAssignExpression()
parent.IsKind(SyntaxKind.DivideAssignmentExpression) ? SyntaxKind.DivideExpression :
parent.IsKind(SyntaxKind.ModuloAssignmentExpression) ? SyntaxKind.ModuloExpression : SyntaxKind.None;
ReplaceReadAndWrite(operatorKind, writeValue: parent.Right.Parenthesize());
ReplaceReadAndWrite(
operatorKind, writeValue: parent.Right.Parenthesize(), conflictMessage: null);
}
private void ReplaceReadAndWrite(
SyntaxKind operatorKind,
ExpressionSyntax writeValue,
string conflictMessage = null)
string conflictMessage)
{
var readExpression = GetReadExpression(conflictMessage);
var binaryExpression = SyntaxFactory.BinaryExpression(
operatorKind, readExpression, writeValue);
if (ShouldWriteToBackingField())
{
// this.Prop++;
// this._prop = this.GetProp() + 1;
// this.Prop *= x;
// this._prop = this.GetProp() * x;
var newExpression = _expression.ReplaceNode(
_identifierName,
SyntaxFactory.IdentifierName(_propertyBackingField.Name).WithTriviaFrom(_identifierName));
var assignment = SyntaxFactory.AssignmentExpression(
SyntaxKind.SimpleAssignmentExpression,
newExpression, binaryExpression);
_editor.ReplaceNode(_expression.Parent, assignment);
}
else
{
var setInvocation = GetSetInvocationExpression(binaryExpression);
_editor.ReplaceNode(_expression.Parent, setInvocation);
}
ReplaceWrite(writeValue: SyntaxFactory.BinaryExpression(
kind: operatorKind,
left: GetReadExpression(conflictMessage),
right: writeValue));
}
}
}
......
src/Features/Core/Portable/ReplacePropertyWithMethods/IReplacePropertyWithMethodsService.cs
浏览文件 @ 6534b368
......@@ -14,11 +14,14 @@ internal interface IReplacePropertyWithMethodsService : ILanguageService
void ReplaceReference(
SyntaxEditor editor, SyntaxToken nameToken,
IPropertySymbol property, IFieldSymbol propertyBackingField);
IPropertySymbol property, IFieldSymbol propertyBackingField,
string desiredGetMethodName, string desiredSetMethodName);
void ReplacePropertyWithMethod(
SyntaxEditor editor, SemanticModel semanticModel,
IPropertySymbol property, SyntaxNode declaration,
IFieldSymbol propertyBackingField);
IFieldSymbol propertyBackingField,
string desiredGetMethodName,
string desiredSetMethodName);
}
}
\ No newline at end of file
src/Features/Core/Portable/ReplacePropertyWithMethods/ReplacePropertyWithMethodsCodeRefactoringProvider.cs
浏览文件 @ 6534b368
......@@ -79,8 +79,8 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
var desiredMethodSuffix = NameGenerator.GenerateUniqueName(propertySymbol.Name,
n => !HasAnyMatchingGetOrSetMethods(propertySymbol, n));
var getMethodName = GetPrefix + desiredMethodSuffix;
var setMethodName = SetPrefix + desiredMethodSuffix;
var desiredGetMethodName = GetPrefix + desiredMethodSuffix;
var desiredSetMethodName = SetPrefix + desiredMethodSuffix;
var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
......@@ -110,10 +110,12 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
var updatedSolution = originalSolution;
updatedSolution = await UpdateReferencesAsync(
updatedSolution, referencesByDocument, definitionToBackingField, cancellationToken).ConfigureAwait(false);
updatedSolution, referencesByDocument, definitionToBackingField,
desiredGetMethodName, desiredSetMethodName, cancellationToken).ConfigureAwait(false);
updatedSolution = await ReplaceDefinitionsWithMethodsAsync(
originalSolution, updatedSolution, propertyReferences, definitionToBackingField, cancellationToken).ConfigureAwait(false);
originalSolution, updatedSolution, propertyReferences, definitionToBackingField,
desiredGetMethodName, desiredSetMethodName, cancellationToken).ConfigureAwait(false);
return updatedSolution;
}
......@@ -164,6 +166,7 @@ private string GetDefinitionIssues(IEnumerable<ReferencedSymbol> getMethodRefere
Solution updatedSolution,
ILookup<Document, ValueTuple<IPropertySymbol, ReferenceLocation>> referencesByDocument,
Dictionary<IPropertySymbol, IFieldSymbol> propertyToBackingField,
string desiredGetMethodName, string desiredSetMethodName,
CancellationToken cancellationToken)
{
foreach (var group in referencesByDocument)
......@@ -171,8 +174,8 @@ private string GetDefinitionIssues(IEnumerable<ReferencedSymbol> getMethodRefere
cancellationToken.ThrowIfCancellationRequested();
updatedSolution = await UpdateReferencesInDocumentAsync(
updatedSolution, group.Key, group,
propertyToBackingField, cancellationToken).ConfigureAwait(false);
updatedSolution, group.Key, group, propertyToBackingField,
desiredGetMethodName, desiredSetMethodName, cancellationToken).ConfigureAwait(false);
}
return updatedSolution;
......@@ -182,6 +185,7 @@ private string GetDefinitionIssues(IEnumerable<ReferencedSymbol> getMethodRefere
Document originalDocument,
IEnumerable<ValueTuple<IPropertySymbol, ReferenceLocation>> references,
Dictionary<IPropertySymbol, IFieldSymbol> propertyToBackingField,
string desiredGetMethodName, string desiredSetMethodName,
CancellationToken cancellationToken)
{
var root = await originalDocument.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
......@@ -189,7 +193,8 @@ private string GetDefinitionIssues(IEnumerable<ReferencedSymbol> getMethodRefere
var editor = new SyntaxEditor(root, originalDocument.Project.Solution.Workspace);
var service = originalDocument.GetLanguageService<IReplacePropertyWithMethodsService>();
ReplaceReferences(references, propertyToBackingField, root, editor, service, cancellationToken);
ReplaceReferences(references, propertyToBackingField, root, editor, service,
desiredGetMethodName, desiredSetMethodName, cancellationToken);
updatedSolution = updatedSolution.WithDocumentSyntaxRoot(originalDocument.Id, editor.GetChangedRoot());
......@@ -201,6 +206,7 @@ private string GetDefinitionIssues(IEnumerable<ReferencedSymbol> getMethodRefere
IDictionary<IPropertySymbol, IFieldSymbol> propertyToBackingField,
SyntaxNode root, SyntaxEditor editor,
IReplacePropertyWithMethodsService service,
string desiredGetMethodName, string desiredSetMethodName,
CancellationToken cancellationToken)
{
if (references != null)
......@@ -223,17 +229,18 @@ private string GetDefinitionIssues(IEnumerable<ReferencedSymbol> getMethodRefere
else
{
var fieldSymbol = propertyToBackingField.GetValueOrDefault(tuple.Item1);
service.ReplaceReference(editor, nameToken, property, fieldSymbol);
service.ReplaceReference(editor, nameToken, property, fieldSymbol, desiredGetMethodName, desiredSetMethodName);
}
}
}
}
private async Task<Solution> ReplaceDefinitionsWithMethodsAsync(
Solution originalSolution,
Solution updatedSolution,
IEnumerable<ReferencedSymbol> references,
IDictionary<IPropertySymbol, IFieldSymbol> definitionToBackingField,
CancellationToken cancellationToken)
Solution originalSolution,
Solution updatedSolution,
IEnumerable<ReferencedSymbol> references,
IDictionary<IPropertySymbol, IFieldSymbol> definitionToBackingField,
string desiredGetMethodName, string desiredSetMethodName,
CancellationToken cancellationToken)
{
var definitionsByDocumentId = await GetDefinitionsByDocumentIdAsync(originalSolution, references, cancellationToken).ConfigureAwait(false);
......@@ -245,8 +252,8 @@ private string GetDefinitionIssues(IEnumerable<ReferencedSymbol> getMethodRefere
var definitions = kvp.Value;
updatedSolution = await ReplaceDefinitionsWithMethodsAsync(
updatedSolution, documentId, definitions,
definitionToBackingField, cancellationToken).ConfigureAwait(false);
updatedSolution, documentId, definitions, definitionToBackingField,
desiredGetMethodName, desiredSetMethodName, cancellationToken).ConfigureAwait(false);
}
return updatedSolution;
......@@ -285,6 +292,7 @@ private string GetDefinitionIssues(IEnumerable<ReferencedSymbol> getMethodRefere
DocumentId documentId,
MultiDictionary<DocumentId, IPropertySymbol>.ValueSet originalDefinitions,
IDictionary<IPropertySymbol, IFieldSymbol> definitionToBackingField,
string desiredGetMethodName, string desiredSetMethodName,
CancellationToken cancellationToken)
{
var updatedDocument = updatedSolution.GetDocument(documentId);
......@@ -310,7 +318,8 @@ private string GetDefinitionIssues(IEnumerable<ReferencedSymbol> getMethodRefere
var propertyDefinition = definition.Item1;
service.ReplacePropertyWithMethod(
editor, semanticModel, definition.Item1, definition.Item2,
definitionToBackingField.GetValueOrDefault(propertyDefinition));
definitionToBackingField.GetValueOrDefault(propertyDefinition),
desiredGetMethodName, desiredSetMethodName);
}
return updatedSolution.WithDocumentSyntaxRoot(documentId, editor.GetChangedRoot());
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或