Swap var for simplified new and collection expressions

Author: menees

src/Menees.Analyzers.CodeFixes/Men001TabsShouldBeUsedFixer.cs

@@ -64,8 +64,8 @@ private static async Task<Document> GetTransformedDocumentAsync(
 				char ch = originalIndent[i];
 				if (ch == '\t')
 				{
-					var offsetWithinTabColumn = originalIndentColumn % tabSize;
-					var spaceCount = tabSize - offsetWithinTabColumn;
+					int offsetWithinTabColumn = originalIndentColumn % tabSize;
+					int spaceCount = tabSize - offsetWithinTabColumn;
 					originalIndentColumn += spaceCount;
 				}
 				else if (char.IsWhiteSpace(ch))
@@ -90,7 +90,7 @@ private static async Task<Document> GetTransformedDocumentAsync(
 			SyntaxTrivia newTrivia = violatingTrivia.IsKind(SyntaxKind.DocumentationCommentExteriorTrivia)
 				? SyntaxFactory.DocumentationCommentExterior(tabIndent)
 				: SyntaxFactory.Whitespace(tabIndent);
-			var newSyntaxRoot = syntaxRoot.ReplaceTrivia(violatingTrivia, newTrivia);
+			SyntaxNode newSyntaxRoot = syntaxRoot.ReplaceTrivia(violatingTrivia, newTrivia);
 			result = document.WithSyntaxRoot(newSyntaxRoot);
 		}
 

src/Menees.Analyzers.CodeFixes/Men009UsePreferredExceptionsFixer.cs

@@ -59,7 +59,7 @@ private static async Task<Document> GetTransformedDocumentAsync(
 					SyntaxToken newToken = SyntaxFactory.Identifier(violatingToken.LeadingTrivia, newName, violatingToken.TrailingTrivia);
 					IdentifierNameSyntax newIdentifier = SyntaxFactory.IdentifierName(newToken);
 
-					var newSyntaxRoot = syntaxRoot.ReplaceNode(violatingIdentifier, newIdentifier);
+					SyntaxNode newSyntaxRoot = syntaxRoot.ReplaceNode(violatingIdentifier, newIdentifier);
 					result = document.WithSyntaxRoot(newSyntaxRoot);
 				}
 			}

src/Menees.Analyzers.CodeFixes/Men011AlignUsingDirectivesFixer.cs

@@ -96,7 +96,7 @@ private static Document ApplyFix(IndentInfo indent, SyntaxNode syntaxRoot, Docum
 		{
 			// Insert leading indent trivia.
 			SyntaxToken keyword = indent.Using.UsingKeyword;
-			var newLeadingTrivia = keyword.LeadingTrivia.Concat([SyntaxFactory.Whitespace(newIndentText)]);
+			IEnumerable<SyntaxTrivia> newLeadingTrivia = keyword.LeadingTrivia.Concat([SyntaxFactory.Whitespace(newIndentText)]);
 			SyntaxToken newKeyword = keyword.WithLeadingTrivia(newLeadingTrivia);
 			newSyntaxRoot = syntaxRoot.ReplaceToken(keyword, newKeyword);
 		}

src/Menees.Analyzers.CodeFixes/Men013UseUtcTimeFixer.cs

@@ -99,7 +99,7 @@ private static async Task<Document> GetTransformedDocumentAsync(
 						newNode = CreateIdentifier(violatingToken, newName);
 					}
 
-					var newSyntaxRoot = syntaxRoot.ReplaceNode(oldNode, newNode);
+					SyntaxNode newSyntaxRoot = syntaxRoot.ReplaceNode(oldNode, newNode);
 					result = document.WithSyntaxRoot(newSyntaxRoot);
 				}
 			}

src/Menees.Analyzers.CodeFixes/Men018UseDigitSeparatorsFixer.cs

@@ -93,7 +93,7 @@ private static async Task<Document> GetTransformedDocumentAsync(
 						SyntaxKind.NumericLiteralExpression,
 						newToken.Value);
 
-					var newSyntaxRoot = syntaxRoot.ReplaceNode(literalExpression, newNode);
+					SyntaxNode newSyntaxRoot = syntaxRoot.ReplaceNode(literalExpression, newNode);
 					result = document.WithSyntaxRoot(newSyntaxRoot);
 				}
 			}

src/Menees.Analyzers/GeneratedCodeAnalysisExtensions.cs

@@ -122,14 +122,14 @@ private static bool HasAutoGeneratedComment(SyntaxTree tree, CancellationToken c
 	{
 		bool result = false;
 
-		var root = tree.GetRoot(cancellationToken);
+		SyntaxNode root = tree.GetRoot(cancellationToken);
 		if (root != null)
 		{
-			var firstToken = root.GetFirstToken();
+			SyntaxToken firstToken = root.GetFirstToken();
 			SyntaxTriviaList? trivia = null;
 			if (firstToken == default)
 			{
-				var token = ((CompilationUnitSyntax)root).EndOfFileToken;
+				SyntaxToken token = ((CompilationUnitSyntax)root).EndOfFileToken;
 				if (token.HasLeadingTrivia)
 				{
 					trivia = token.LeadingTrivia;
@@ -142,7 +142,7 @@ private static bool HasAutoGeneratedComment(SyntaxTree tree, CancellationToken c
 
 			if (trivia != null)
 			{
-				var comments = trivia.Value.Where(t => t.IsKind(SyntaxKind.SingleLineCommentTrivia) || t.IsKind(SyntaxKind.MultiLineCommentTrivia));
+				IEnumerable<SyntaxTrivia> comments = trivia.Value.Where(t => t.IsKind(SyntaxKind.SingleLineCommentTrivia) || t.IsKind(SyntaxKind.MultiLineCommentTrivia));
 				result = comments.Any(t =>
 				{
 					string s = t.ToString();
@@ -166,10 +166,10 @@ private static bool IsEmpty(SyntaxTree tree, CancellationToken cancellationToken
 	{
 		bool result = false;
 
-		var root = tree.GetRoot(cancellationToken);
+		SyntaxNode root = tree.GetRoot(cancellationToken);
 		if (root != null)
 		{
-			var firstToken = root.GetFirstToken(includeZeroWidth: true);
+			SyntaxToken firstToken = root.GetFirstToken(includeZeroWidth: true);
 
 			result = firstToken.IsKind(SyntaxKind.EndOfFileToken)
 				&& IndexOfFirstNonWhitespaceTrivia(firstToken.LeadingTrivia) == NonIndex;
@@ -187,9 +187,9 @@ private static int IndexOfFirstNonWhitespaceTrivia(IReadOnlyList<SyntaxTrivia> t
 	{
 		int result = NonIndex;
 
-		for (var index = 0; index < triviaList.Count && result == NonIndex; index++)
+		for (int index = 0; index < triviaList.Count && result == NonIndex; index++)
 		{
-			var currentTrivia = triviaList[index];
+			SyntaxTrivia currentTrivia = triviaList[index];
 			switch (currentTrivia.Kind())
 			{
 				case SyntaxKind.EndOfLineTrivia:

src/Menees.Analyzers/Men001TabsShouldBeUsed.cs

@@ -64,7 +64,7 @@ private static void HandleWhitespaceTrivia(SyntaxTreeAnalysisContext context, Sy
 	private static void HandleSyntaxTree(SyntaxTreeAnalysisContext context)
 	{
 		SyntaxNode root = context.Tree.GetCompilationUnitRoot(context.CancellationToken);
-		foreach (var trivia in root.DescendantTrivia(descendIntoTrivia: true))
+		foreach (SyntaxTrivia trivia in root.DescendantTrivia(descendIntoTrivia: true))
 		{
 			switch (trivia.Kind())
 			{

src/Menees.Analyzers/Men005FileTooLong.cs

@@ -53,7 +53,7 @@ private void HandleSyntaxTree(SyntaxTreeAnalysisContext context)
 			if (fileLength > maxLength)
 			{
 				// Only mark the first line past the limit.  Marking every line from maxLength to fileLength-1 was ugly.
-				var fileLocation = Rules.GetFileLocation(tree, text, maxLength, maxLength);
+				Tuple<string, Location> fileLocation = Rules.GetFileLocation(tree, text, maxLength, maxLength);
 				context.ReportDiagnostic(Diagnostic.Create(Rule, fileLocation.Item2, fileLocation.Item1, maxLength, fileLength));
 			}
 		}

src/Menees.Analyzers/Men006RegionsShouldBeUsed.cs

@@ -117,7 +117,7 @@ private static IEnumerable<TextSpan> GetExistingRegionSpans(SyntaxNode root)
 
 		// In a perfect world, the #region and #endregion directives will be balanced (even if they're nested).
 		// But we have to gracefully handle if they're mismatched or out of order.
-		var regionBounds = new List<Tuple<RegionDirectiveTriviaSyntax, EndRegionDirectiveTriviaSyntax>>();
+		List<Tuple<RegionDirectiveTriviaSyntax, EndRegionDirectiveTriviaSyntax>> regionBounds = [];
 		Stack<RegionDirectiveTriviaSyntax> regionStack = new();
 		foreach (SyntaxNode node in regionNodes)
 		{
@@ -148,13 +148,13 @@ private void HandleSyntaxTree(SyntaxTreeAnalysisContext context)
 			int fileLength = text.Lines.Count;
 			if (fileLength > maxLength)
 			{
-				var fileLocation = Rules.GetFileLocation(tree, text);
+				Tuple<string, Location> fileLocation = Rules.GetFileLocation(tree, text);
 				string message = $" because {fileLocation.Item1} is longer than {maxLength} lines (now {fileLength})";
 				context.ReportDiagnostic(Diagnostic.Create(Rule, fileLocation.Item2, message));
 			}
 			else if (ContainsMultipleTypeDeclarations(root))
 			{
-				var fileLocation = Rules.GetFileLocation(tree, text);
+				Tuple<string, Location> fileLocation = Rules.GetFileLocation(tree, text);
 				string message = $" because {fileLocation.Item1} contains multiple type declarations";
 				context.ReportDiagnostic(Diagnostic.Create(Rule, fileLocation.Item2, message));
 			}

src/Menees.Analyzers/Men007UseSingleReturn.cs

@@ -157,9 +157,9 @@ private static void HandleCodeBlock(CodeBlockAnalysisContext context)
 			.ToList();
 
 		// Group the return statements by the member function/accessor, local function, lambda, or anonymous function that most directly contains them.
-		var localBlockGroups = allReturnStatements
+		IEnumerable<IGrouping<SyntaxNode, ReturnStatementSyntax>> localBlockGroups = allReturnStatements
 			.GroupBy(ret => ret.Ancestors().First(ancestor => ancestor == codeBlock || IsReturnContainer(ancestor)));
-		foreach (var localBlockGroup in localBlockGroups)
+		foreach (IGrouping<SyntaxNode, ReturnStatementSyntax>? localBlockGroup in localBlockGroups)
 		{
 			SyntaxNode localBlockNode = localBlockGroup.Key;
 			IEnumerable<ReturnStatementSyntax> localBlockReturns = localBlockGroup;
@@ -173,7 +173,7 @@ private static void HandleCodeBlock(CodeBlockAnalysisContext context)
 			}
 			else
 			{
-				var tuple = GetReturnContainerInfo(localBlockNode, localBlockReturns);
+				Tuple<string?, bool> tuple = GetReturnContainerInfo(localBlockNode, localBlockReturns);
 				name = tuple.Item1;
 				returnsVoid = tuple.Item2;
 			}