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

Remove unnecessary conditional return

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