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

use 'var'

上级 bacafc56
......@@ -172,7 +172,7 @@ protected override bool IsParentAnAttribute(SyntaxNode node)
if ((name.IsUnmanaged || name.IsNotNull) && name.Parent.IsKind(SyntaxKind.TypeConstraint))
{
string nameToCheck = name.IsUnmanaged ? "unmanaged" : "notnull";
var nameToCheck = name.IsUnmanaged ? "unmanaged" : "notnull";
var alias = semanticModel.GetAliasInfo(name, cancellationToken);
if (alias == null || alias.Name != nameToCheck)
{
......
......@@ -290,9 +290,9 @@ protected override TDeclarationNode AddNamespace<TDeclarationNode>(TDeclarationN
return destinationMember;
}
int currentParamsCount = currentParameterList.Parameters.Count;
bool seenOptional = currentParamsCount > 0 && currentParameterList.Parameters[currentParamsCount - 1].Default != null;
bool isFirstParam = currentParamsCount == 0;
var currentParamsCount = currentParameterList.Parameters.Count;
var seenOptional = currentParamsCount > 0 && currentParameterList.Parameters[currentParamsCount - 1].Default != null;
var isFirstParam = currentParamsCount == 0;
var parameterNodesAndTokens = currentParameterList.Parameters.GetWithSeparators().ToList();
foreach (var parameter in parameters)
......
......@@ -179,7 +179,7 @@ internal static SyntaxToken GetArgumentModifiers(RefKind refKind)
DeclarationModifiers modifiers,
IEnumerable<SyntaxNode> statements)
{
bool hasBody = !modifiers.IsAbstract && (!modifiers.IsPartial || statements != null);
var hasBody = !modifiers.IsAbstract && (!modifiers.IsPartial || statements != null);
return SyntaxFactory.MethodDeclaration(
attributeLists: default,
......@@ -1187,7 +1187,7 @@ public override SyntaxNode InsertNamespaceImports(SyntaxNode declaration, int in
private SyntaxNode InsertNamespaceImportsInternal(SyntaxNode declaration, int index, IEnumerable<SyntaxNode> imports)
{
SyntaxList<UsingDirectiveSyntax> usingsToInsert = this.AsUsingDirectives(imports);
var usingsToInsert = this.AsUsingDirectives(imports);
switch (declaration.Kind())
{
......@@ -1604,7 +1604,7 @@ private static SyntaxTokenList AsModifierList(Accessibility accessibility, Decla
private static SyntaxTokenList AsModifierList(Accessibility accessibility, DeclarationModifiers modifiers)
{
SyntaxTokenList list = SyntaxFactory.TokenList();
var list = SyntaxFactory.TokenList();
switch (accessibility)
{
......@@ -3286,7 +3286,7 @@ private SyntaxNode InsertNodesAfterInternal(SyntaxNode root, SyntaxNode declarat
private IEnumerable<SyntaxNode> SplitAndInsert(SyntaxNode multiPartDeclaration, int index, IEnumerable<SyntaxNode> newDeclarations)
{
int count = GetDeclarationCount(multiPartDeclaration);
var count = GetDeclarationCount(multiPartDeclaration);
var newNodes = new List<SyntaxNode>();
newNodes.Add(this.WithSubDeclarationsRemoved(multiPartDeclaration, index, count - index).WithTrailingTrivia(SyntaxFactory.ElasticSpace));
newNodes.AddRange(newDeclarations);
......@@ -4143,8 +4143,8 @@ internal override SyntaxTriviaList RemoveCommentLines(SyntaxTriviaList syntaxTri
{
IEnumerable<IEnumerable<SyntaxTrivia>> splitIntoLines(SyntaxTriviaList triviaList)
{
int index = 0;
for (int i = 0; i < triviaList.Count; i++)
var index = 0;
for (var i = 0; i < triviaList.Count; i++)
{
if (triviaList[i].IsEndOfLine())
{
......
......@@ -44,7 +44,7 @@ private static MemberDeclarationSyntax LastConstructorOrField(SyntaxList<MemberD
return reusableSyntax;
}
bool hasNoBody = !options.GenerateMethodBodies;
var hasNoBody = !options.GenerateMethodBodies;
var declaration = SyntaxFactory.DestructorDeclaration(
attributeLists: AttributeGenerator.GenerateAttributeLists(destructor.GetAttributes(), options),
......
......@@ -301,7 +301,7 @@ private static ExpressionSyntax GenerateFieldReference<T>(ITypeSymbol type, T va
private static ExpressionSyntax GenerateMemberAccess(params string[] names)
{
ExpressionSyntax result = SyntaxFactory.IdentifierName(SyntaxFactory.Token(SyntaxKind.GlobalKeyword));
for (int i = 0; i < names.Length; i++)
for (var i = 0; i < names.Length; i++)
{
var name = SyntaxFactory.IdentifierName(names[i]);
if (i == 0)
......
......@@ -92,7 +92,7 @@ internal static ParameterSyntax GetParameter(IParameterSymbol p, CodeGenerationO
private static SyntaxTokenList GenerateModifiers(
IParameterSymbol parameter, bool isFirstParam)
{
SyntaxTokenList list = CSharpSyntaxGenerator.GetParameterModifiers(parameter.RefKind);
var list = CSharpSyntaxGenerator.GetParameterModifiers(parameter.RefKind);
if (isFirstParam &&
parameter.ContainingSymbol is IMethodSymbol methodSymbol &&
......
......@@ -311,7 +311,7 @@ public static bool IsAttributeNameContext(this SyntaxTree syntaxTree, int positi
var validModifiers = SyntaxKindSet.LocalFunctionModifiers;
var modifierTokens = syntaxTree.GetPrecedingModifiers(
position, token, out int beforeModifiersPosition);
position, token, out var beforeModifiersPosition);
if (modifierTokens.IsSubsetOf(validModifiers))
{
......
......@@ -2089,7 +2089,7 @@ private static bool HidingTypeParameterSymbolExists(ISymbol candidateSymbol, Lis
{
foreach (var enclosingTypeParameter in enclosingTypeParametersInsideOut)
{
ISymbol newCandidateSymbol = candidateSymbol;
var newCandidateSymbol = candidateSymbol;
if (candidateSymbol.IsKind(SymbolKind.ArrayType))
{
newCandidateSymbol = ((IArrayTypeSymbol)candidateSymbol).ElementType;
......
......@@ -109,7 +109,7 @@ public static async Task<ISymbol> FindApplicableAlias(this ITypeSymbol type, int
var root = await semanticModel.SyntaxTree.GetRootAsync(cancellationToken).ConfigureAwait(false);
IEnumerable<UsingDirectiveSyntax> applicableUsings = GetApplicableUsings(position, root as CompilationUnitSyntax);
var applicableUsings = GetApplicableUsings(position, root as CompilationUnitSyntax);
foreach (var applicableUsing in applicableUsings)
{
var alias = semanticModel.GetOriginalSemanticModel().GetDeclaredSymbol(applicableUsing, cancellationToken);
......
......@@ -22,7 +22,7 @@ internal static class SeparatedSyntaxListExtensions
var nodes = new List<T>(separatedList.Count);
var separators = new List<SyntaxToken>(separatedList.SeparatorCount);
for (int i = 0; i < separatedList.Count; i++)
for (var i = 0; i < separatedList.Count; i++)
{
nodes.Add(separatedList[i]);
......
......@@ -490,13 +490,13 @@ internal static SyntaxNodeOrToken ChildThatContainsPosition(this SyntaxNode self
{
var childList = self.ChildNodesAndTokens();
int left = 0;
int right = childList.Count - 1;
var left = 0;
var right = childList.Count - 1;
while (left <= right)
{
int middle = left + ((right - left) / 2);
SyntaxNodeOrToken node = childList[middle];
var middle = left + ((right - left) / 2);
var node = childList[middle];
var span = node.FullSpan;
if (position < span.Start)
......
......@@ -124,7 +124,7 @@ public static SyntaxToken FindLastTokenOfPartialGenericName(this SyntaxToken gen
var token = genericIdentifier.GetNextToken(includeSkipped: true);
Contract.ThrowIfFalse(token.Kind() == SyntaxKind.LessThanToken);
int stack = 0;
var stack = 0;
do
{
......
......@@ -377,7 +377,7 @@ private static bool AtEndOfIncompleteStringOrCharLiteral(SyntaxToken token, int
throw new ArgumentException(CSharpWorkspaceResources.Expected_string_or_char_literal, nameof(token));
}
int startLength = 1;
var startLength = 1;
if (token.IsVerbatimStringLiteral())
{
startLength = 2;
......@@ -622,7 +622,7 @@ static bool IsSelectedFieldOrProperty(TextSpan textSpan, MemberDeclarationSyntax
{
genericIdentifier = default;
lessThanToken = default;
int index = 0;
var index = 0;
var token = syntaxTree.FindTokenOnLeftOfPosition(position, cancellationToken);
if (token.Kind() == SyntaxKind.None)
......@@ -636,7 +636,7 @@ static bool IsSelectedFieldOrProperty(TextSpan textSpan, MemberDeclarationSyntax
return false;
}
int stack = 0;
var stack = 0;
while (true)
{
switch (token.Kind())
......
......@@ -59,7 +59,7 @@ private static ImmutableArray<ImmutableArray<SyntaxTrivia>> GetLeadingBlankLines
currentLine.Add(trivia);
if (trivia.Kind() == SyntaxKind.EndOfLineTrivia)
{
bool currentLineIsBlank = currentLine.All(t =>
var currentLineIsBlank = currentLine.All(t =>
t.Kind() == SyntaxKind.EndOfLineTrivia ||
t.Kind() == SyntaxKind.WhitespaceTrivia);
if (!currentLineIsBlank)
......
......@@ -33,7 +33,7 @@ public static IList<bool> GetInsertionIndices(this TypeDeclarationSyntax destina
var end = destination.Members.First().SpanStart;
indices.Add(!destination.OverlapsHiddenPosition(TextSpan.FromBounds(start, end), cancellationToken));
for (int i = 0; i < members.Count - 1; i++)
for (var i = 0; i < members.Count - 1; i++)
{
var member1 = members[i];
var member2 = members[i + 1];
......@@ -69,7 +69,7 @@ public static IEnumerable<BaseTypeSyntax> GetAllBaseListTypes(this TypeDeclarati
{
Contract.ThrowIfNull(typeNode);
IEnumerable<BaseTypeSyntax> baseListTypes = SpecializedCollections.EmptyEnumerable<BaseTypeSyntax>();
var baseListTypes = SpecializedCollections.EmptyEnumerable<BaseTypeSyntax>();
var isPartialType = typeNode.Modifiers.Any(m => m.Kind() == SyntaxKind.PartialKeyword);
if (isPartialType)
......@@ -119,9 +119,9 @@ private static SyntaxToken EnsureToken(SyntaxToken token, bool prependNewLineIfM
{
// Bug 539673: If there are no members, take any trivia that
// belongs to the end brace and attach it to the opening brace.
int index = -1;
var index = -1;
var leadingTrivia = closeBrace.LeadingTrivia;
for (int i = leadingTrivia.Count - 1; i >= 0; i--)
for (var i = leadingTrivia.Count - 1; i >= 0; i--)
{
if (!leadingTrivia[i].IsWhitespaceOrEndOfLine())
{
......
......@@ -50,13 +50,13 @@ internal static BinaryOperatorSpacingOptions ParseEditorConfigSpacingAroundBinar
=> s_binaryOperatorSpacingOptionsEditorConfigMap.TryGetValue(binaryOperatorSpacingValue.Trim(), out var value) ? value : BinaryOperatorSpacingOptions.Single;
private static string GetSpacingAroundBinaryOperatorEditorConfigString(BinaryOperatorSpacingOptions value)
=> s_binaryOperatorSpacingOptionsEditorConfigMap.TryGetKey(value, out string key) ? key : null;
=> s_binaryOperatorSpacingOptionsEditorConfigMap.TryGetKey(value, out var key) ? key : null;
internal static LabelPositionOptions ParseEditorConfigLabelPositioning(string labelIndentationValue)
=> s_labelPositionOptionsEditorConfigMap.TryGetValue(labelIndentationValue.Trim(), out var value) ? value : LabelPositionOptions.NoIndent;
private static string GetLabelPositionOptionEditorConfigString(LabelPositionOptions value)
=> s_labelPositionOptionsEditorConfigMap.TryGetKey(value, out string key) ? key : null;
=> s_labelPositionOptionsEditorConfigMap.TryGetKey(value, out var key) ? key : null;
internal static bool DetermineIfNewLineOptionIsSet(string value, NewLineOption optionName)
{
......
......@@ -45,7 +45,7 @@ public override AdjustNewLinesOperation GetAdjustNewLinesOperation(SyntaxToken p
// return 1 space for every token pairs as a default operation
public override AdjustSpacesOperation GetAdjustSpacesOperation(SyntaxToken previousToken, SyntaxToken currentToken, OptionSet optionSet, in NextGetAdjustSpacesOperation nextOperation)
{
int space = currentToken.Kind() == SyntaxKind.EndOfFileToken ? 0 : 1;
var space = currentToken.Kind() == SyntaxKind.EndOfFileToken ? 0 : 1;
return FormattingOperations.CreateAdjustSpacesOperation(space, AdjustSpacesOption.DefaultSpacesIfOnSingleLine);
}
}
......
......@@ -160,12 +160,12 @@ private static void AnalyzeWhitespacesInTrivia(SyntaxTrivia trivia, ref Analysis
Debug.Assert(trivia.Kind() == SyntaxKind.WhitespaceTrivia);
Debug.Assert(trivia.Width() == trivia.FullWidth());
int space = 0;
int tab = 0;
int unknownWhitespace = 0;
var space = 0;
var tab = 0;
var unknownWhitespace = 0;
var text = trivia.ToString();
for (int i = 0; i < trivia.Width(); i++)
for (var i = 0; i < trivia.Width(); i++)
{
if (text[i] == ' ')
{
......
......@@ -110,7 +110,7 @@ private TriviaData GetWhitespaceOnlyTriviaInfo(SyntaxToken token1, SyntaxToken t
}
// only whitespace in between
int space = GetSpaceOnSingleLine(result);
var space = GetSpaceOnSingleLine(result);
Contract.ThrowIfFalse(space >= -1);
if (space >= 0)
......
......@@ -97,7 +97,7 @@ public SyntaxNode Transform()
var text = pair.Value.GetTextChanges(GetTextSpan(pair.Key)).Single().NewText;
var trailingTrivia = SyntaxFactory.ParseTrailingTrivia(text);
int width = trailingTrivia.GetFullWidth();
var width = trailingTrivia.GetFullWidth();
var leadingTrivia = SyntaxFactory.ParseLeadingTrivia(text.Substring(width));
return ValueTuple.Create(trailingTrivia, leadingTrivia);
......@@ -125,7 +125,7 @@ private IEnumerable<SyntaxTrivia> CreateTriviaListFromTo(List<SyntaxTrivia> triv
yield break;
}
for (int i = startIndex; i <= endIndex; i++)
for (var i = startIndex; i <= endIndex; i++)
{
yield return triviaList[i];
}
......@@ -133,7 +133,7 @@ private IEnumerable<SyntaxTrivia> CreateTriviaListFromTo(List<SyntaxTrivia> triv
private int GetFirstEndOfLineIndexOrRightBeforeComment(List<SyntaxTrivia> triviaList)
{
for (int i = 0; i < triviaList.Count; i++)
for (var i = 0; i < triviaList.Count; i++)
{
var trivia = triviaList[i];
......
......@@ -21,10 +21,10 @@ public static string GetIndent(this SyntaxToken token)
// indent is the spaces/tabs between last new line (if there is one) and end of trivia
var indent = precedingTrivia.AsString();
int lastNewLinePos = indent.LastIndexOf(NewLine, StringComparison.Ordinal);
var lastNewLinePos = indent.LastIndexOf(NewLine, StringComparison.Ordinal);
if (lastNewLinePos != -1)
{
int start = lastNewLinePos + NewLine.Length;
var start = lastNewLinePos + NewLine.Length;
indent = indent.Substring(start, indent.Length - start);
}
......@@ -34,7 +34,7 @@ public static string GetIndent(this SyntaxToken token)
public static string ContentBeforeLastNewLine(this IEnumerable<SyntaxTrivia> trivia)
{
var leading = trivia.AsString();
int lastNewLinePos = leading.LastIndexOf(NewLine, StringComparison.Ordinal);
var lastNewLinePos = leading.LastIndexOf(NewLine, StringComparison.Ordinal);
if (lastNewLinePos == -1)
{
return string.Empty;
......
......@@ -203,7 +203,7 @@ private void AddSpecificNodesSuppressOperations(List<SuppressOperation> list, Sy
else
{
// Add Separate suppression for each Label and for the last label, add the <>
for (int i = 0; i < switchSection.Labels.Count - 1; ++i)
for (var i = 0; i < switchSection.Labels.Count - 1; ++i)
{
if (switchSection.Labels[i] != null)
{
......
......@@ -400,7 +400,7 @@ public override AdjustSpacesOperation GetAdjustSpacesOperation(SyntaxToken previ
case SyntaxKind.CloseParenToken:
case SyntaxKind.CloseBracketToken:
int space = (previousToken.Kind() == currentToken.Kind()) ? 0 : 1;
var space = (previousToken.Kind() == currentToken.Kind()) ? 0 : 1;
return CreateAdjustSpacesOperation(space, AdjustSpacesOption.ForceSpacesIfOnSingleLine);
}
......
......@@ -164,7 +164,7 @@ private void RemoveSuppressOperationForBlock(List<SuppressOperation> list, Synta
var span = TextSpan.FromBounds(startToken.SpanStart, endToken.Span.End);
for (int i = 0; i < list.Count; i++)
for (var i = 0; i < list.Count; i++)
{
if (list[i] != null && list[i].TextSpan.Start >= span.Start && list[i].TextSpan.End <= span.End && list[i].Option.HasFlag(SuppressOption.NoWrappingIfOnSingleLine))
{
......
......@@ -296,7 +296,7 @@ private IndentationResult GetIndentationFromCommaSeparatedList(SyntaxToken token
// find node that starts at the beginning of a line
var sourceText = LineToBeIndented.Text;
for (int i = (index - 1) / 2; i >= 0; i--)
for (var i = (index - 1) / 2; i >= 0; i--)
{
var node = list[i];
var firstToken = node.GetFirstToken(includeZeroWidth: true);
......@@ -361,7 +361,7 @@ private IndentationResult GetIndentationForQueryExpression(SyntaxToken token)
// find preceding clause that starts on its own.
var clauses = queryBody.Clauses;
for (int i = clauses.Count - 1; i >= 0; i--)
for (var i = clauses.Count - 1; i >= 0; i--)
{
var clause = clauses[i];
if (firstToken.SpanStart <= clause.SpanStart)
......
......@@ -172,7 +172,7 @@ private void ReplaceCaseIndentationRules(List<IndentBlockOperation> list, Syntax
var startToken = section.Statements.First().GetFirstToken(includeZeroWidth: true);
var endToken = section.Statements.Last().GetLastToken(includeZeroWidth: true);
for (int i = 0; i < list.Count; i++)
for (var i = 0; i < list.Count; i++)
{
var operation = list[i];
if (operation.StartToken == startToken && operation.EndToken == endToken)
......
......@@ -84,7 +84,7 @@ private bool CloseBraceOfTryOrDoBlock(SyntaxToken endToken)
// Formatter uses FindToken on the position, which returns token to left, if there is nothing to the right and returns token to the right
// if there exists one. If the shape is "{|}", we're including '}' in the formatting range. Avoid doing that to improve verbatim typing
// in the following special scenarios.
int adjustedEndPosition = token.Span.End;
var adjustedEndPosition = token.Span.End;
if (token.IsKind(SyntaxKind.OpenBraceToken) &&
(token.Parent.IsInitializerForArrayOrCollectionCreationExpression() ||
token.Parent is AnonymousObjectCreationExpressionSyntax))
......
......@@ -1028,7 +1028,7 @@ private static void AppendTypeParameterList(StringBuilder builder, TypeParameter
{
builder.Append('<');
builder.Append(typeParameterList.Parameters[0].Identifier.ValueText);
for (int i = 1; i < typeParameterList.Parameters.Count; i++)
for (var i = 1; i < typeParameterList.Parameters.Count; i++)
{
builder.Append(", ");
builder.Append(typeParameterList.Parameters[i].Identifier.ValueText);
......@@ -1123,7 +1123,7 @@ public int GetMethodLevelMemberId(SyntaxNode root, SyntaxNode node)
{
Debug.Assert(root.SyntaxTree == node.SyntaxTree);
int currentId = 0;
var currentId = 0;
Contract.ThrowIfFalse(TryGetMethodLevelMember(root, (n, i) => n == node, ref currentId, out var currentNode));
Contract.ThrowIfFalse(currentId >= 0);
......@@ -1133,7 +1133,7 @@ public int GetMethodLevelMemberId(SyntaxNode root, SyntaxNode node)
public SyntaxNode GetMethodLevelMember(SyntaxNode root, int memberId)
{
int currentId = 0;
var currentId = 0;
if (!TryGetMethodLevelMember(root, (n, i) => i == memberId, ref currentId, out var currentNode))
{
return null;
......
......@@ -86,7 +86,7 @@ private ImmutableArray<int> ComputePathFromRoot(SyntaxNode node)
private int GetChildIndex(SyntaxNodeOrToken child)
{
var parent = child.Parent;
int index = 0;
var index = 0;
foreach (var nodeOrToken in parent.ChildNodesAndTokens())
{
......@@ -104,7 +104,7 @@ private int GetChildIndex(SyntaxNodeOrToken child)
private int GetTriviaIndex(SyntaxTrivia trivia)
{
var token = trivia.Token;
int index = 0;
var index = 0;
foreach (var tr in token.LeadingTrivia)
{
......
......@@ -65,7 +65,7 @@ public async override Task<SyntaxNode> GetSyntaxAsync(CancellationToken cancella
private SyntaxNode GetNode(SyntaxNode root)
{
var current = root;
int spanStart = _textSpan.Start;
var spanStart = _textSpan.Start;
while (current.FullSpan.Contains(spanStart))
{
......
......@@ -117,7 +117,7 @@ private CompilationUnitSyntax CacheRootNode(CompilationUnitSyntax node)
public override bool TryGetRoot(out CSharpSyntaxNode root)
{
bool status = _recoverableRoot.TryGetValue(out var node);
var status = _recoverableRoot.TryGetValue(out var node);
root = node;
CacheRootNode(node);
return status;
......
......@@ -1345,7 +1345,7 @@ private IEnumerable<TypeInferenceInfo> InferTypeInImplicitArrayCreation(Implicit
{
// = { Goo() }
var equalsValueClause = (EqualsValueClauseSyntax)initializerExpression.Parent;
IEnumerable<ITypeSymbol> types = InferTypeInEqualsValueClause(equalsValueClause).Select(t => t.InferredType);
var types = InferTypeInEqualsValueClause(equalsValueClause).Select(t => t.InferredType);
if (types.Any(t => t is IArrayTypeSymbol))
{
......@@ -1356,7 +1356,7 @@ private IEnumerable<TypeInferenceInfo> InferTypeInImplicitArrayCreation(Implicit
{
// new int[] { Goo() }
var arrayCreation = (ArrayCreationExpressionSyntax)initializerExpression.Parent;
IEnumerable<ITypeSymbol> types = GetTypes(arrayCreation).Select(t => t.InferredType);
var types = GetTypes(arrayCreation).Select(t => t.InferredType);
if (types.Any(t => t is IArrayTypeSymbol))
{
......@@ -1369,7 +1369,7 @@ private IEnumerable<TypeInferenceInfo> InferTypeInImplicitArrayCreation(Implicit
var objectCreation = (ObjectCreationExpressionSyntax)initializerExpression.Parent;
IEnumerable<ITypeSymbol> types = GetTypes(objectCreation).Select(t => t.InferredType);
var types = GetTypes(objectCreation).Select(t => t.InferredType);
if (types.Any(t => t is INamedTypeSymbol))
{
return types.OfType<INamedTypeSymbol>().SelectMany(t =>
......@@ -1391,7 +1391,7 @@ private IEnumerable<TypeInferenceInfo> InferTypeInImplicitArrayCreation(Implicit
}
var assignExpression = (AssignmentExpressionSyntax)initializerExpression.Parent;
IEnumerable<ITypeSymbol> types = GetTypes(assignExpression.Left).Select(t => t.InferredType);
var types = GetTypes(assignExpression.Left).Select(t => t.InferredType);
if (types.Any(t => t is INamedTypeSymbol))
{
......
......@@ -211,7 +211,7 @@ public override SyntaxToken VisitToken(SyntaxToken token)
return newToken;
}
bool isRenameLocation = IsRenameLocation(token);
var isRenameLocation = IsRenameLocation(token);
// if this is a reference location, or the identifier token's name could possibly
// be a conflict, we need to process this token
......@@ -352,7 +352,7 @@ private async Task<SyntaxToken> RenameAndAnnotateAsync(SyntaxToken token, Syntax
var symbols = RenameUtilities.GetSymbolsTouchingPosition(token.Span.Start, _semanticModel, _solution.Workspace, _cancellationToken);
string suffix = null;
string prefix = isRenameLocation && _renameLocations[token.Span].IsRenamableAccessor
var prefix = isRenameLocation && _renameLocations[token.Span].IsRenamableAccessor
? newToken.ValueText.Substring(0, newToken.ValueText.IndexOf('_') + 1)
: null;
......@@ -481,7 +481,7 @@ private RenameActionAnnotation GetAnnotationForInvocationExpression(InvocationEx
symbols = SpecializedCollections.SingletonEnumerable(symbolInfo.Symbol);
}
RenameDeclarationLocationReference[] renameDeclarationLocations =
var renameDeclarationLocations =
ConflictResolver.CreateDeclarationLocationAnnotationsAsync(
_solution,
symbols,
......@@ -566,7 +566,7 @@ private SyntaxToken UpdateAliasAnnotation(SyntaxToken newToken)
private SyntaxToken RenameToken(SyntaxToken oldToken, SyntaxToken newToken, string prefix, string suffix)
{
var parent = oldToken.Parent;
string currentNewIdentifier = _isVerbatim ? _replacementText.Substring(1) : _replacementText;
var currentNewIdentifier = _isVerbatim ? _replacementText.Substring(1) : _replacementText;
var oldIdentifier = newToken.ValueText;
var isAttributeName = SyntaxFacts.IsAttributeName(parent);
......@@ -594,7 +594,7 @@ private SyntaxToken RenameToken(SyntaxToken oldToken, SyntaxToken newToken, stri
}
// determine the canonical identifier name (unescaped, no unicode escaping, ...)
string valueText = currentNewIdentifier;
var valueText = currentNewIdentifier;
var kind = SyntaxFacts.GetKeywordKind(currentNewIdentifier);
if (kind != SyntaxKind.None)
{
......@@ -638,7 +638,7 @@ private SyntaxToken RenameToken(SyntaxToken oldToken, SyntaxToken newToken, stri
private SyntaxToken RenameInStringLiteral(SyntaxToken oldToken, SyntaxToken newToken, Func<SyntaxTriviaList, string, string, SyntaxTriviaList, SyntaxToken> createNewStringLiteral)
{
var originalString = newToken.ToString();
string replacedString = RenameLocations.ReferenceProcessing.ReplaceMatchingSubStrings(originalString, _originalText, _replacementText);
var replacedString = RenameLocations.ReferenceProcessing.ReplaceMatchingSubStrings(originalString, _originalText, _replacementText);
if (replacedString != originalString)
{
var oldSpan = oldToken.Span;
......@@ -666,7 +666,7 @@ private SyntaxToken RenameInTrivia(SyntaxToken token, IEnumerable<SyntaxTrivia>
private SyntaxTrivia RenameInCommentTrivia(SyntaxTrivia trivia)
{
var originalString = trivia.ToString();
string replacedString = RenameLocations.ReferenceProcessing.ReplaceMatchingSubStrings(originalString, _originalText, _replacementText);
var replacedString = RenameLocations.ReferenceProcessing.ReplaceMatchingSubStrings(originalString, _originalText, _replacementText);
if (replacedString != originalString)
{
var oldSpan = trivia.Span;
......@@ -992,7 +992,7 @@ private static async Task<ISymbol> GetVBPropertyFromAccessorOrAnOverrideAsync(IS
ISymbol renameSymbol, ISymbol renamedSymbol, IEnumerable<ReferenceLocation> implicitReferenceLocations, CancellationToken cancellationToken)
{
// Handle renaming of symbols used for foreach
bool implicitReferencesMightConflict = renameSymbol.Kind == SymbolKind.Property &&
var implicitReferencesMightConflict = renameSymbol.Kind == SymbolKind.Property &&
string.Compare(renameSymbol.Name, "Current", StringComparison.OrdinalIgnoreCase) == 0;
implicitReferencesMightConflict =
......@@ -1127,8 +1127,8 @@ public void TryAddPossibleNameConflicts(ISymbol symbol, string replacementText,
// in C# we also need to add the valueText because it can be different from the text in source
// e.g. it can contain escaped unicode characters. Otherwise conflicts would be detected for
// v\u0061r and var or similar.
string valueText = replacementText;
SyntaxKind kind = SyntaxFacts.GetKeywordKind(replacementText);
var valueText = replacementText;
var kind = SyntaxFacts.GetKeywordKind(replacementText);
if (kind != SyntaxKind.None)
{
valueText = SyntaxFacts.GetText(kind);
......@@ -1167,7 +1167,7 @@ private static SyntaxNode GetExpansionTarget(SyntaxToken token)
var enclosingStatement = token.GetAncestors(n => n is StatementSyntax).FirstOrDefault();
// System.Func<int, int> myFunc = arg => X;
SyntaxNode possibleLambdaExpression = enclosingStatement == null
var possibleLambdaExpression = enclosingStatement == null
? token.GetAncestors(n => n is SimpleLambdaExpressionSyntax || n is ParenthesizedLambdaExpressionSyntax).FirstOrDefault()
: null;
if (possibleLambdaExpression != null)
......@@ -1283,7 +1283,7 @@ public static SemanticModel GetSemanticModelForNode(SyntaxNode node, SemanticMod
}
}
bool isInNamespaceOrTypeContext = SyntaxFacts.IsInNamespaceOrTypeContext(node as ExpressionSyntax);
var isInNamespaceOrTypeContext = SyntaxFacts.IsInNamespaceOrTypeContext(node as ExpressionSyntax);
var position = nodeToSpeculate.SpanStart;
return SpeculationAnalyzer.CreateSpeculativeSemanticModelForNode(nodeToSpeculate, originalSemanticModel, position, isInNamespaceOrTypeContext);
}
......
......@@ -189,7 +189,7 @@ public override SyntaxNode VisitParenthesizedLambdaExpression(ParenthesizedLambd
{
var newParameters = parameterList.Parameters;
for (int i = 0; i < parameterSymbols.Length; i++)
for (var i = 0; i < parameterSymbols.Length; i++)
{
var typeSyntax = parameterSymbols[i].Type.GenerateTypeSyntax().WithTrailingTrivia(s_oneWhitespaceSeparator);
var newParameter = parameters[i].WithType(typeSyntax).WithAdditionalAnnotations(Simplifier.Annotation);
......@@ -297,7 +297,7 @@ private static bool CanMakeNameExplicitInTuple(TupleExpressionSyntax tuple, stri
return false;
}
bool found = false;
var found = false;
foreach (var argument in tuple.Arguments)
{
string elementName = null;
......@@ -730,7 +730,7 @@ private ExpressionSyntax TryReplaceAngleBracesWithCurlyBraces(ExpressionSyntax e
if (isInsideCref)
{
var leftTokens = expression.DescendantTokens();
List<SyntaxToken> candidateTokens = new List<SyntaxToken>();
var candidateTokens = new List<SyntaxToken>();
foreach (var candidateToken in leftTokens)
{
......@@ -776,7 +776,7 @@ private ExpressionSyntax TryAddTypeArgumentToIdentifierName(ExpressionSyntax new
private IList<ISymbol> TypeArgumentSymbolsPresentInName(SimpleNameSyntax simpleName)
{
List<ISymbol> typeArgumentSymbols = new List<ISymbol>();
var typeArgumentSymbols = new List<ISymbol>();
var typeArgumentListSyntax = simpleName.DescendantNodesAndSelf().Where(n => n is TypeArgumentListSyntax);
foreach (var typeArgumentList in typeArgumentListSyntax)
{
......
......@@ -101,7 +101,7 @@ public override SyntaxToken VisitToken(SyntaxToken token)
}
}
bool savedSimplifyAllDescendants = _simplifyAllDescendants;
var savedSimplifyAllDescendants = _simplifyAllDescendants;
_simplifyAllDescendants = _simplifyAllDescendants || token.HasAnnotation(Simplifier.Annotation);
if (_simplifyAllDescendants && !_insideSpeculatedNode && !token.IsKind(SyntaxKind.None))
......
......@@ -71,7 +71,7 @@ internal static bool CanSimplifyAnonymousTypeMemberName(AnonymousObjectMemberDec
// An explicit name cannot be removed if some other position would produce it as inferred name
private static bool RemovalCausesAmbiguity(SeparatedSyntaxList<ArgumentSyntax> arguments, ArgumentSyntax toRemove)
{
string name = toRemove.NameColon.Name.Identifier.ValueText;
var name = toRemove.NameColon.Name.Identifier.ValueText;
foreach (var argument in arguments)
{
if (argument == toRemove)
......@@ -91,7 +91,7 @@ private static bool RemovalCausesAmbiguity(SeparatedSyntaxList<ArgumentSyntax> a
// An explicit name cannot be removed if some other position would produce it as inferred name
private static bool RemovalCausesAmbiguity(SeparatedSyntaxList<AnonymousObjectMemberDeclaratorSyntax> initializers, AnonymousObjectMemberDeclaratorSyntax toRemove)
{
string name = toRemove.NameEquals.Name.Identifier.ValueText;
var name = toRemove.NameEquals.Name.Identifier.ValueText;
foreach (var initializer in initializers)
{
if (initializer == toRemove)
......
......@@ -20,7 +20,7 @@ public Rewriter(ObjectPool<IReductionRewriter> pool)
public override SyntaxNode VisitPredefinedType(PredefinedTypeSyntax node)
{
bool oldAlwaysSimplify = this.alwaysSimplify;
var oldAlwaysSimplify = this.alwaysSimplify;
if (!this.alwaysSimplify)
{
this.alwaysSimplify = node.HasAnnotation(Simplifier.Annotation);
......@@ -38,7 +38,7 @@ public override SyntaxNode VisitPredefinedType(PredefinedTypeSyntax node)
public override SyntaxNode VisitAliasQualifiedName(AliasQualifiedNameSyntax node)
{
bool oldAlwaysSimplify = this.alwaysSimplify;
var oldAlwaysSimplify = this.alwaysSimplify;
if (!this.alwaysSimplify)
{
this.alwaysSimplify = node.HasAnnotation(Simplifier.Annotation);
......@@ -56,7 +56,7 @@ public override SyntaxNode VisitAliasQualifiedName(AliasQualifiedNameSyntax node
public override SyntaxNode VisitQualifiedName(QualifiedNameSyntax node)
{
bool oldAlwaysSimplify = this.alwaysSimplify;
var oldAlwaysSimplify = this.alwaysSimplify;
if (!this.alwaysSimplify)
{
this.alwaysSimplify = node.HasAnnotation(Simplifier.Annotation);
......@@ -74,7 +74,7 @@ public override SyntaxNode VisitQualifiedName(QualifiedNameSyntax node)
public override SyntaxNode VisitMemberAccessExpression(MemberAccessExpressionSyntax node)
{
bool oldAlwaysSimplify = this.alwaysSimplify;
var oldAlwaysSimplify = this.alwaysSimplify;
if (!this.alwaysSimplify)
{
this.alwaysSimplify = node.HasAnnotation(Simplifier.Annotation);
......@@ -92,7 +92,7 @@ public override SyntaxNode VisitMemberAccessExpression(MemberAccessExpressionSyn
public override SyntaxNode VisitIdentifierName(IdentifierNameSyntax node)
{
bool oldAlwaysSimplify = this.alwaysSimplify;
var oldAlwaysSimplify = this.alwaysSimplify;
if (!this.alwaysSimplify)
{
this.alwaysSimplify = node.HasAnnotation(Simplifier.Annotation);
......@@ -110,7 +110,7 @@ public override SyntaxNode VisitIdentifierName(IdentifierNameSyntax node)
public override SyntaxNode VisitGenericName(GenericNameSyntax node)
{
bool oldAlwaysSimplify = this.alwaysSimplify;
var oldAlwaysSimplify = this.alwaysSimplify;
if (!this.alwaysSimplify)
{
this.alwaysSimplify = node.HasAnnotation(Simplifier.Annotation);
......@@ -128,7 +128,7 @@ public override SyntaxNode VisitGenericName(GenericNameSyntax node)
public override SyntaxNode VisitQualifiedCref(QualifiedCrefSyntax node)
{
bool oldAlwaysSimplify = this.alwaysSimplify;
var oldAlwaysSimplify = this.alwaysSimplify;
if (!this.alwaysSimplify)
{
this.alwaysSimplify = node.HasAnnotation(Simplifier.Annotation);
......@@ -146,7 +146,7 @@ public override SyntaxNode VisitQualifiedCref(QualifiedCrefSyntax node)
public override SyntaxNode VisitArrayType(ArrayTypeSyntax node)
{
bool oldAlwaysSimplify = this.alwaysSimplify;
var oldAlwaysSimplify = this.alwaysSimplify;
if (!this.alwaysSimplify)
{
this.alwaysSimplify = node.HasAnnotation(Simplifier.Annotation);
......@@ -164,7 +164,7 @@ public override SyntaxNode VisitArrayType(ArrayTypeSyntax node)
public override SyntaxNode VisitNullableType(NullableTypeSyntax node)
{
bool oldAlwaysSimplify = this.alwaysSimplify;
var oldAlwaysSimplify = this.alwaysSimplify;
if (!this.alwaysSimplify)
{
this.alwaysSimplify = node.HasAnnotation(Simplifier.Annotation);
......@@ -182,7 +182,7 @@ public override SyntaxNode VisitNullableType(NullableTypeSyntax node)
public override SyntaxNode VisitTupleType(TupleTypeSyntax node)
{
bool oldAlwaysSimplify = this.alwaysSimplify;
var oldAlwaysSimplify = this.alwaysSimplify;
if (!this.alwaysSimplify)
{
this.alwaysSimplify = node.HasAnnotation(Simplifier.Annotation);
......@@ -200,7 +200,7 @@ public override SyntaxNode VisitTupleType(TupleTypeSyntax node)
public override SyntaxNode VisitBinaryExpression(BinaryExpressionSyntax node)
{
bool isOrAsNode = node.Kind() == SyntaxKind.AsExpression || node.Kind() == SyntaxKind.IsExpression;
var isOrAsNode = node.Kind() == SyntaxKind.AsExpression || node.Kind() == SyntaxKind.IsExpression;
var result = (ExpressionSyntax)base.VisitBinaryExpression(node);
......
......@@ -67,7 +67,7 @@ public int Compare(NameSyntax x, NameSyntax y)
}
else if (x is IdentifierNameSyntax && y is GenericNameSyntax)
{
int compare = _tokenComparer.Compare(x.GetFirstToken(includeSkipped: true), y.GetFirstToken());
var compare = _tokenComparer.Compare(x.GetFirstToken(includeSkipped: true), y.GetFirstToken());
if (compare != 0)
{
return compare;
......@@ -78,7 +78,7 @@ public int Compare(NameSyntax x, NameSyntax y)
}
else if (x is GenericNameSyntax && y is IdentifierNameSyntax)
{
int compare = _tokenComparer.Compare(x.GetFirstToken(includeSkipped: true), y.GetFirstToken());
var compare = _tokenComparer.Compare(x.GetFirstToken(includeSkipped: true), y.GetFirstToken());
if (compare != 0)
{
return compare;
......@@ -95,9 +95,9 @@ public int Compare(NameSyntax x, NameSyntax y)
var xNameParts = DecomposeNameParts(x);
var yNameParts = DecomposeNameParts(y);
for (int i = 0; i < xNameParts.Count && i < yNameParts.Count; i++)
for (var i = 0; i < xNameParts.Count && i < yNameParts.Count; i++)
{
int compare = Compare(xNameParts[i], yNameParts[i]);
var compare = Compare(xNameParts[i], yNameParts[i]);
if (compare != 0)
{
return compare;
......@@ -141,7 +141,7 @@ private void DecomposeNameParts(NameSyntax name, List<SimpleNameSyntax> result)
private int Compare(GenericNameSyntax x, GenericNameSyntax y)
{
int compare = _tokenComparer.Compare(x.Identifier, y.Identifier);
var compare = _tokenComparer.Compare(x.Identifier, y.Identifier);
if (compare != 0)
{
return compare;
......@@ -155,7 +155,7 @@ private int Compare(GenericNameSyntax x, GenericNameSyntax y)
}
// Same name, same parameter count. Compare each parameter.
for (int i = 0; i < x.Arity; i++)
for (var i = 0; i < x.Arity; i++)
{
var xArg = x.TypeArgumentList.Arguments[i];
var yArg = y.TypeArgumentList.Arguments[i];
......
......@@ -98,8 +98,8 @@ protected override SemanticModel CreateSpeculativeSemanticModel(SyntaxNode origi
public static SemanticModel CreateSpeculativeSemanticModelForNode(SyntaxNode originalNode, SyntaxNode nodeToSpeculate, SemanticModel semanticModel)
{
int position = originalNode.SpanStart;
bool isInNamespaceOrTypeContext = SyntaxFacts.IsInNamespaceOrTypeContext(originalNode as ExpressionSyntax);
var position = originalNode.SpanStart;
var isInNamespaceOrTypeContext = SyntaxFacts.IsInNamespaceOrTypeContext(originalNode as ExpressionSyntax);
return CreateSpeculativeSemanticModelForNode(nodeToSpeculate, semanticModel, position, isInNamespaceOrTypeContext);
}
......@@ -192,7 +192,7 @@ public bool ReplacementChangesSemanticsOfUnchangedLambda(ExpressionSyntax origin
Debug.Assert(originalParams.Count == replacedParams.Count);
paramNames = new List<string>();
for (int i = 0; i < originalParams.Count; i++)
for (var i = 0; i < originalParams.Count; i++)
{
var originalParam = originalParams[i];
var replacedParam = replacedParams[i];
......@@ -438,7 +438,7 @@ protected override bool ReplacementChangesSemanticsForNodeLanguageSpecific(Synta
var originalSwitchLabels = originalSwitchStatement.Sections.SelectMany(section => section.Labels).ToArray();
var newSwitchLabels = newSwitchStatement.Sections.SelectMany(section => section.Labels).ToArray();
for (int i = 0; i < originalSwitchLabels.Length; i++)
for (var i = 0; i < originalSwitchLabels.Length; i++)
{
if (originalSwitchLabels[i] is CaseSwitchLabelSyntax originalSwitchLabel)
{
......@@ -715,8 +715,8 @@ private bool ReplacementBreaksAssignmentExpression(AssignmentExpressionSyntax as
private bool ReplacementBreaksQueryClause(QueryClauseSyntax originalClause, QueryClauseSyntax newClause)
{
// Ensure QueryClauseInfos are compatible.
QueryClauseInfo originalClauseInfo = this.OriginalSemanticModel.GetQueryClauseInfo(originalClause, this.CancellationToken);
QueryClauseInfo newClauseInfo = this.SpeculativeSemanticModel.GetQueryClauseInfo(newClause, this.CancellationToken);
var originalClauseInfo = this.OriginalSemanticModel.GetQueryClauseInfo(originalClause, this.CancellationToken);
var newClauseInfo = this.SpeculativeSemanticModel.GetQueryClauseInfo(newClause, this.CancellationToken);
return !SymbolInfosAreCompatible(originalClauseInfo.CastInfo, newClauseInfo.CastInfo) ||
!SymbolInfosAreCompatible(originalClauseInfo.OperationInfo, newClauseInfo.OperationInfo);
......
......@@ -76,7 +76,7 @@ public int Compare(SyntaxNode directive1, SyntaxNode directive2)
// * using statics
// * aliases
int directiveKindDifference = directive1Kind - directive2Kind;
var directiveKindDifference = directive1Kind - directive2Kind;
if (directiveKindDifference != 0)
{
return directiveKindDifference;
......
......@@ -146,7 +146,7 @@ private static void EnsureNewLines(IList<SyntaxNode> list)
{
// First, make sure that every node (except the last one) ends with
// a newline.
for (int i = 0; i < list.Count - 1; i++)
for (var i = 0; i < list.Count - 1; i++)
{
var node = list[i];
var trailingTrivia = node.GetTrailingTrivia();
......@@ -159,7 +159,7 @@ private static void EnsureNewLines(IList<SyntaxNode> list)
// Now, make sure that every node (except the first one) does *not*
// start with newlines.
for (int i = 1; i < list.Count; i++)
for (var i = 1; i < list.Count; i++)
{
var node = list[i];
list[i] = TrimLeadingNewLines(node);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册