提交 2491a58c 编写于 作者: C Cyrus Najmabadi 提交者: Sam Harwell

Remove unnecessary conditional return

上级 77facfa7
...@@ -891,15 +891,12 @@ private static bool CanReplace(ISymbol symbol) ...@@ -891,15 +891,12 @@ private static bool CanReplace(ISymbol symbol)
if (!memberAccess.Expression.IsKind(SyntaxKind.ThisExpression, SyntaxKind.BaseExpression)) if (!memberAccess.Expression.IsKind(SyntaxKind.ThisExpression, SyntaxKind.BaseExpression))
{ {
var actualSymbol = semanticModel.GetSymbolInfo(memberAccess.Name, cancellationToken); var actualSymbol = semanticModel.GetSymbolInfo(memberAccess.Name, cancellationToken);
if (!TryGetReplacementCandidates( GetReplacementCandidates(
semanticModel, semanticModel,
memberAccess, memberAccess,
actualSymbol, actualSymbol,
out var speculativeSymbols, out var speculativeSymbols,
out var speculativeNamespacesAndTypes)) out var speculativeNamespacesAndTypes);
{
return false;
}
if (!IsReplacementCandidate(actualSymbol, speculativeSymbols, speculativeNamespacesAndTypes)) if (!IsReplacementCandidate(actualSymbol, speculativeSymbols, speculativeNamespacesAndTypes))
{ {
...@@ -923,7 +920,7 @@ public static SimpleNameSyntax GetNameWithTriviaMoved(this MemberAccessExpressio ...@@ -923,7 +920,7 @@ public static SimpleNameSyntax GetNameWithTriviaMoved(this MemberAccessExpressio
.WithLeadingTrivia(GetLeadingTriviaForSimplifiedMemberAccess(memberAccess)) .WithLeadingTrivia(GetLeadingTriviaForSimplifiedMemberAccess(memberAccess))
.WithTrailingTrivia(memberAccess.GetTrailingTrivia()); .WithTrailingTrivia(memberAccess.GetTrailingTrivia());
private static bool TryGetReplacementCandidates( private static void GetReplacementCandidates(
SemanticModel semanticModel, SemanticModel semanticModel,
MemberAccessExpressionSyntax memberAccess, MemberAccessExpressionSyntax memberAccess,
SymbolInfo actualSymbol, SymbolInfo actualSymbol,
...@@ -946,7 +943,7 @@ public static SimpleNameSyntax GetNameWithTriviaMoved(this MemberAccessExpressio ...@@ -946,7 +943,7 @@ public static SimpleNameSyntax GetNameWithTriviaMoved(this MemberAccessExpressio
{ {
speculativeSymbols = ImmutableArray<ISymbol>.Empty; speculativeSymbols = ImmutableArray<ISymbol>.Empty;
speculativeNamespacesAndTypes = ImmutableArray<ISymbol>.Empty; speculativeNamespacesAndTypes = ImmutableArray<ISymbol>.Empty;
return false; return;
} }
speculativeSymbols = containsOtherSymbol speculativeSymbols = containsOtherSymbol
...@@ -955,7 +952,6 @@ public static SimpleNameSyntax GetNameWithTriviaMoved(this MemberAccessExpressio ...@@ -955,7 +952,6 @@ public static SimpleNameSyntax GetNameWithTriviaMoved(this MemberAccessExpressio
speculativeNamespacesAndTypes = containsNamespaceOrTypeSymbol speculativeNamespacesAndTypes = containsNamespaceOrTypeSymbol
? semanticModel.LookupNamespacesAndTypes(memberAccess.SpanStart, name: memberAccess.Name.Identifier.ValueText) ? semanticModel.LookupNamespacesAndTypes(memberAccess.SpanStart, name: memberAccess.Name.Identifier.ValueText)
: ImmutableArray<ISymbol>.Empty; : ImmutableArray<ISymbol>.Empty;
return true;
} }
/// <summary> /// <summary>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册