提交 a66e2c61 编写于 作者: C Cyrus Najmabadi

Make local functions static.

上级 e81e7e48
...@@ -131,9 +131,9 @@ private static class PragmaBatchFixHelpers ...@@ -131,9 +131,9 @@ private static class PragmaBatchFixHelpers
private static void UpdateDiagnosticSpans(ImmutableArray<Diagnostic> diagnostics, Dictionary<Diagnostic, TextSpan> currentDiagnosticSpans, IEnumerable<TextChange> textChanges) private static void UpdateDiagnosticSpans(ImmutableArray<Diagnostic> diagnostics, Dictionary<Diagnostic, TextSpan> currentDiagnosticSpans, IEnumerable<TextChange> textChanges)
{ {
bool isPriorSpan(TextSpan span, TextChange textChange) => span.End <= textChange.Span.Start; static bool isPriorSpan(TextSpan span, TextChange textChange) => span.End <= textChange.Span.Start;
bool isFollowingSpan(TextSpan span, TextChange textChange) => span.Start >= textChange.Span.End; static bool isFollowingSpan(TextSpan span, TextChange textChange) => span.Start >= textChange.Span.End;
bool isEnclosingSpan(TextSpan span, TextChange textChange) => span.Contains(textChange.Span); static bool isEnclosingSpan(TextSpan span, TextChange textChange) => span.Contains(textChange.Span);
foreach (var diagnostic in diagnostics) foreach (var diagnostic in diagnostics)
{ {
......
...@@ -250,7 +250,7 @@ private static async Task<TextSpan> GetTextChangeSpanAsync(Document document, Te ...@@ -250,7 +250,7 @@ private static async Task<TextSpan> GetTextChangeSpanAsync(Document document, Te
var text = root.GetText(); var text = root.GetText();
// Expand selection in both directions until a double quote or any line break character is reached // Expand selection in both directions until a double quote or any line break character is reached
bool IsWordCharacter(char ch) => !(ch == '"' || TextUtilities.IsAnyLineBreakCharacter(ch)); static bool IsWordCharacter(char ch) => !(ch == '"' || TextUtilities.IsAnyLineBreakCharacter(ch));
result = CommonCompletionUtilities.GetWordSpan( result = CommonCompletionUtilities.GetWordSpan(
text, startSpan.Start, IsWordCharacter, IsWordCharacter, alwaysExtendEndSpan: true); text, startSpan.Start, IsWordCharacter, IsWordCharacter, alwaysExtendEndSpan: true);
......
...@@ -67,7 +67,7 @@ private static bool IsBrokenLambda(SyntaxNodeAnalysisContext context) ...@@ -67,7 +67,7 @@ private static bool IsBrokenLambda(SyntaxNodeAnalysisContext context)
private void ReportUnboundIdentifierNames(SyntaxNodeAnalysisContext context, SyntaxNode member) private void ReportUnboundIdentifierNames(SyntaxNodeAnalysisContext context, SyntaxNode member)
{ {
bool isQualifiedOrSimpleName(SyntaxNode n) => n is TQualifiedNameSyntax || n is TSimpleNameSyntax; static bool isQualifiedOrSimpleName(SyntaxNode n) => n is TQualifiedNameSyntax || n is TSimpleNameSyntax;
var typeNames = member.DescendantNodes().Where(n => isQualifiedOrSimpleName(n) && !n.Span.IsEmpty); var typeNames = member.DescendantNodes().Where(n => isQualifiedOrSimpleName(n) && !n.Span.IsEmpty);
foreach (var typeName in typeNames) foreach (var typeName in typeNames)
{ {
......
...@@ -95,12 +95,14 @@ public ITriviaSavedResult SaveTriviaAroundSelection(SyntaxNode root, TextSpan te ...@@ -95,12 +95,14 @@ public ITriviaSavedResult SaveTriviaAroundSelection(SyntaxNode root, TextSpan te
var triviaAtBeginning = SplitTrivia(tokens[TriviaLocation.BeforeBeginningOfSpan], tokens[TriviaLocation.AfterBeginningOfSpan], t => t.FullSpan.End <= textSpan.Start); var triviaAtBeginning = SplitTrivia(tokens[TriviaLocation.BeforeBeginningOfSpan], tokens[TriviaLocation.AfterBeginningOfSpan], t => t.FullSpan.End <= textSpan.Start);
var triviaAtEnd = SplitTrivia(tokens[TriviaLocation.BeforeEndOfSpan], tokens[TriviaLocation.AfterEndOfSpan], t => t.FullSpan.Start < textSpan.End); var triviaAtEnd = SplitTrivia(tokens[TriviaLocation.BeforeEndOfSpan], tokens[TriviaLocation.AfterEndOfSpan], t => t.FullSpan.Start < textSpan.End);
var triviaList = new Dictionary<TriviaLocation, IEnumerable<SyntaxTrivia>>(); var triviaList = new Dictionary<TriviaLocation, IEnumerable<SyntaxTrivia>>
triviaList[TriviaLocation.BeforeBeginningOfSpan] = triviaAtBeginning.Item1; {
triviaList[TriviaLocation.AfterBeginningOfSpan] = triviaAtBeginning.Item2; [TriviaLocation.BeforeBeginningOfSpan] = triviaAtBeginning.Item1,
[TriviaLocation.AfterBeginningOfSpan] = triviaAtBeginning.Item2,
triviaList[TriviaLocation.BeforeEndOfSpan] = triviaAtEnd.Item1; [TriviaLocation.BeforeEndOfSpan] = triviaAtEnd.Item1,
triviaList[TriviaLocation.AfterEndOfSpan] = triviaAtEnd.Item2; [TriviaLocation.AfterEndOfSpan] = triviaAtEnd.Item2
};
return triviaList; return triviaList;
} }
......
...@@ -340,8 +340,7 @@ where NodeMatchesExpression(originalSemanticModel, currentSemanticModel, express ...@@ -340,8 +340,7 @@ where NodeMatchesExpression(originalSemanticModel, currentSemanticModel, express
} }
return false; return false;
static bool IsInstanceMemberReference(IOperation operation)
bool IsInstanceMemberReference(IOperation operation)
=> operation is IMemberReferenceOperation memberReferenceOperation && => operation is IMemberReferenceOperation memberReferenceOperation &&
memberReferenceOperation.Instance?.Kind == OperationKind.InstanceReference; memberReferenceOperation.Instance?.Kind == OperationKind.InstanceReference;
} }
......
...@@ -101,7 +101,7 @@ void OnSymbolEnd(SymbolAnalysisContext symbolEndContext) ...@@ -101,7 +101,7 @@ void OnSymbolEnd(SymbolAnalysisContext symbolEndContext)
} }
} }
bool IsCandidateField(IFieldSymbol symbol) => static bool IsCandidateField(IFieldSymbol symbol) =>
symbol.DeclaredAccessibility == Accessibility.Private && symbol.DeclaredAccessibility == Accessibility.Private &&
!symbol.IsReadOnly && !symbol.IsReadOnly &&
!symbol.IsConst && !symbol.IsConst &&
...@@ -137,7 +137,7 @@ void UpdateFieldStateOnWrite(IFieldSymbol field) ...@@ -137,7 +137,7 @@ void UpdateFieldStateOnWrite(IFieldSymbol field)
} }
// Method to compute the initial field state. // Method to compute the initial field state.
(bool isCandidate, bool written) ComputeInitialFieldState(IFieldSymbol field, AnalyzerOptions options, CancellationToken cancellationToken) static (bool isCandidate, bool written) ComputeInitialFieldState(IFieldSymbol field, AnalyzerOptions options, CancellationToken cancellationToken)
{ {
Debug.Assert(IsCandidateField(field)); Debug.Assert(IsCandidateField(field));
......
...@@ -590,7 +590,7 @@ bool IsRemovableAssignmentWithoutSideEffects(IOperation unusedSymbolWriteOperati ...@@ -590,7 +590,7 @@ bool IsRemovableAssignmentWithoutSideEffects(IOperation unusedSymbolWriteOperati
return false; return false;
} }
bool IsRemovableAssignmentValueWithoutSideEffects(IOperation assignmentValue) static bool IsRemovableAssignmentValueWithoutSideEffects(IOperation assignmentValue)
{ {
if (assignmentValue.ConstantValue.HasValue) if (assignmentValue.ConstantValue.HasValue)
{ {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册