Merge pull request #41513 from CyrusNajmabadi/removeParam

mavasani · web-flow · commit 8021d1b6c760 · 2020-02-10T10:07:32.000-08:00
Remove unused parameters.
diff --git a/src/Features/VisualBasic/Portable/SimplifyThisOrMe/VisualBasicSimplifyThisOrMeCodeFixProvider.vb b/src/Features/VisualBasic/Portable/SimplifyThisOrMe/VisualBasicSimplifyThisOrMeCodeFixProvider.vb
@@ -23,24 +23,22 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.SimplifyThisOrMe
         End Function
 
         Protected Overrides Function Rewrite(semanticModel As SemanticModel, root As SyntaxNode, memberAccessNodes As ISet(Of MemberAccessExpressionSyntax)) As SyntaxNode
-            Dim rewriter = New Rewriter(semanticModel, memberAccessNodes)
+            Dim rewriter = New Rewriter(memberAccessNodes)
             Return rewriter.Visit(root)
         End Function
 
         Private Class Rewriter
             Inherits VisualBasicSyntaxRewriter
 
-            Private ReadOnly semanticModel As SemanticModel
             Private ReadOnly memberAccessNodes As ISet(Of MemberAccessExpressionSyntax)
 
-            Public Sub New(semanticModel As SemanticModel, memberAccessNodes As ISet(Of MemberAccessExpressionSyntax))
-                Me.semanticModel = semanticModel
+            Public Sub New(memberAccessNodes As ISet(Of MemberAccessExpressionSyntax))
                 Me.memberAccessNodes = memberAccessNodes
             End Sub
 
             Public Overrides Function VisitMemberAccessExpression(node As MemberAccessExpressionSyntax) As SyntaxNode
                 Return If(memberAccessNodes.Contains(node),
-                    node.GetNameWithTriviaMoved(semanticModel),
+                    node.GetNameWithTriviaMoved(),
                     MyBase.VisitMemberAccessExpression(node))
             End Function
         End Class
diff --git a/src/Workspaces/CSharp/Portable/Rename/CSharpRenameRewriterLanguageService.cs b/src/Workspaces/CSharp/Portable/Rename/CSharpRenameRewriterLanguageService.cs
@@ -629,8 +629,7 @@ private SyntaxToken RenameToken(SyntaxToken oldToken, SyntaxToken newToken, stri
                     }
                     else
                     {
-                        var semanticModel = GetSemanticModelForNode(parent, _speculativeModel ?? _semanticModel);
-                        newToken = Simplification.CSharpSimplificationService.TryEscapeIdentifierToken(newToken, parent, semanticModel);
+                        newToken = Simplification.CSharpSimplificationService.TryEscapeIdentifierToken(newToken, parent);
                     }
                 }
 
diff --git a/src/Workspaces/CSharp/Portable/Simplification/CSharpSimplificationService.Expander.cs b/src/Workspaces/CSharp/Portable/Simplification/CSharpSimplificationService.Expander.cs
@@ -268,7 +268,7 @@ public override SyntaxNode VisitArgument(ArgumentSyntax node)
                     if (CanMakeNameExplicitInTuple(tuple, inferredName))
                     {
                         var identifier = SyntaxFactory.Identifier(inferredName);
-                        identifier = TryEscapeIdentifierToken(identifier, node, _semanticModel);
+                        identifier = TryEscapeIdentifierToken(identifier, node);
 
                         newArgument = newArgument
                             .WithoutLeadingTrivia()
@@ -337,7 +337,7 @@ public override SyntaxNode VisitAnonymousObjectMemberDeclarator(AnonymousObjectM
                     {
                         // Creating identifier without elastic trivia to avoid unexpected line break
                         var identifier = SyntaxFactory.Identifier(SyntaxTriviaList.Empty, inferredName, SyntaxTriviaList.Empty);
-                        identifier = TryEscapeIdentifierToken(identifier, node, _semanticModel);
+                        identifier = TryEscapeIdentifierToken(identifier, node);
 
                         newDeclarator = newDeclarator
                             .WithoutLeadingTrivia()
@@ -616,7 +616,7 @@ SyntaxToken GetNewIdentifier(SyntaxToken _identifier)
                 ////
                 //// 3. Always try to escape keyword identifiers
                 ////
-                identifier = TryEscapeIdentifierToken(identifier, originalSimpleName, _semanticModel).WithAdditionalAnnotations(Simplifier.Annotation);
+                identifier = TryEscapeIdentifierToken(identifier, originalSimpleName).WithAdditionalAnnotations(Simplifier.Annotation);
                 if (identifier != rewrittenSimpleName.Identifier)
                 {
                     switch (newNode.Kind())
diff --git a/src/Workspaces/CSharp/Portable/Simplification/CSharpSimplificationService.cs b/src/Workspaces/CSharp/Portable/Simplification/CSharpSimplificationService.cs
@@ -72,7 +72,7 @@ public override SyntaxToken Expand(SyntaxToken token, SemanticModel semanticMode
             {
                 var rewriter = new Expander(semanticModel, expandInsideNode, false, cancellationToken);
 
-                var rewrittenToken = TryEscapeIdentifierToken(rewriter.VisitToken(token), token.Parent, semanticModel).WithAdditionalAnnotations(Simplifier.Annotation);
+                var rewrittenToken = TryEscapeIdentifierToken(rewriter.VisitToken(token), token.Parent).WithAdditionalAnnotations(Simplifier.Annotation);
                 if (TryAddLeadingElasticTriviaIfNecessary(rewrittenToken, token, out var rewrittenTokenWithElasticTrivia))
                 {
                     return rewrittenTokenWithElasticTrivia;
@@ -82,7 +82,7 @@ public override SyntaxToken Expand(SyntaxToken token, SemanticModel semanticMode
             }
         }
 
-        public static SyntaxToken TryEscapeIdentifierToken(SyntaxToken syntaxToken, SyntaxNode parentOfToken, SemanticModel semanticModel)
+        public static SyntaxToken TryEscapeIdentifierToken(SyntaxToken syntaxToken, SyntaxNode parentOfToken)
         {
             // do not escape an already escaped identifier
             if (syntaxToken.IsVerbatimIdentifier())
diff --git a/src/Workspaces/CSharp/Portable/Simplification/Simplifiers/NameSimplifier.cs b/src/Workspaces/CSharp/Portable/Simplification/Simplifiers/NameSimplifier.cs
@@ -131,7 +131,7 @@ public override bool TrySimplify(
                                 aliasReplacement.Name,
                                 name.GetTrailingTrivia());
 
-                        identifierToken = CSharpSimplificationService.TryEscapeIdentifierToken(identifierToken, name, semanticModel);
+                        identifierToken = CSharpSimplificationService.TryEscapeIdentifierToken(identifierToken, name);
                         replacementNode = SyntaxFactory.IdentifierName(identifierToken);
 
                         // Merge annotation to new syntax node
diff --git a/src/Workspaces/VisualBasic/Portable/Extensions/MemberAccessExpressionSyntaxExtensions.vb b/src/Workspaces/VisualBasic/Portable/Extensions/MemberAccessExpressionSyntaxExtensions.vb
@@ -128,13 +128,11 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Extensions
         End Function
 
         <Extension>
-        Public Function GetNameWithTriviaMoved(memberAccess As MemberAccessExpressionSyntax,
-                                               semanticModel As SemanticModel) As SimpleNameSyntax
+        Public Function GetNameWithTriviaMoved(memberAccess As MemberAccessExpressionSyntax) As SimpleNameSyntax
             Dim replacementNode = memberAccess.Name
             replacementNode = DirectCast(replacementNode, SimpleNameSyntax) _
                 .WithIdentifier(VisualBasicSimplificationService.TryEscapeIdentifierToken(
-                    memberAccess.Name.Identifier,
-                    semanticModel)) _
+                    memberAccess.Name.Identifier)) _
                 .WithLeadingTrivia(GetLeadingTriviaForSimplifiedMemberAccess(memberAccess)) _
                 .WithTrailingTrivia(memberAccess.GetTrailingTrivia())
 
diff --git a/src/Workspaces/VisualBasic/Portable/Rename/VisualBasicRenameRewriterLanguageService.vb b/src/Workspaces/VisualBasic/Portable/Rename/VisualBasicRenameRewriterLanguageService.vb
@@ -565,8 +565,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Rename
                         ' or the replacement itself is escaped.
                         newToken = newToken.WithAdditionalAnnotations(Simplifier.Annotation)
                     Else
-                        Dim semanticModel = GetSemanticModelForNode(parent, If(Me._speculativeModel, Me._semanticModel))
-                        newToken = Simplification.VisualBasicSimplificationService.TryEscapeIdentifierToken(newToken, semanticModel, oldToken)
+                        newToken = Simplification.VisualBasicSimplificationService.TryEscapeIdentifierToken(newToken)
                     End If
                 End If
 
diff --git a/src/Workspaces/VisualBasic/Portable/Simplification/Simplifiers/ExpressionSimplifier.vb b/src/Workspaces/VisualBasic/Portable/Simplification/Simplifiers/ExpressionSimplifier.vb
@@ -107,9 +107,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification.Simplifiers
                                 aliasReplacement.Name,
                                 memberAccess.GetTrailingTrivia())
 
-                    identifierToken = VisualBasicSimplificationService.TryEscapeIdentifierToken(
-                                            identifierToken,
-                                            semanticModel)
+                    identifierToken = VisualBasicSimplificationService.TryEscapeIdentifierToken(identifierToken)
                     replacementNode = SyntaxFactory.IdentifierName(identifierToken)
 
                     issueSpan = memberAccess.Span
@@ -150,7 +148,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification.Simplifiers
                 End If
             End If
 
-            replacementNode = memberAccess.GetNameWithTriviaMoved(semanticModel)
+            replacementNode = memberAccess.GetNameWithTriviaMoved()
             issueSpan = memberAccess.Expression.Span
 
             If CanReplaceWithReducedName(memberAccess, replacementNode, semanticModel, symbol, cancellationToken) Then
diff --git a/src/Workspaces/VisualBasic/Portable/Simplification/Simplifiers/NameSimplifier.vb b/src/Workspaces/VisualBasic/Portable/Simplification/Simplifiers/NameSimplifier.vb
@@ -77,9 +77,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification.Simplifiers
                                 aliasReplacement.Name,
                                 name.GetTrailingTrivia())
 
-                        identifierToken = VisualBasicSimplificationService.TryEscapeIdentifierToken(
-                                            identifierToken,
-                                            semanticModel)
+                        identifierToken = VisualBasicSimplificationService.TryEscapeIdentifierToken(identifierToken)
 
                         replacementNode = SyntaxFactory.IdentifierName(identifierToken)
 
@@ -227,11 +225,9 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification.Simplifiers
                         replacementNode = qualifiedName.Right.WithLeadingTrivia(name.GetLeadingTrivia())
                         replacementNode = DirectCast(replacementNode, SimpleNameSyntax) _
                             .WithIdentifier(VisualBasicSimplificationService.TryEscapeIdentifierToken(
-                                            DirectCast(replacementNode, SimpleNameSyntax).Identifier,
-                                            semanticModel))
+                                            DirectCast(replacementNode, SimpleNameSyntax).Identifier))
                         issueSpan = qualifiedName.Left.Span
 
-
                         If CanReplaceWithReducedName(name, replacementNode, semanticModel, cancellationToken) Then
                             Return True
                         End If
@@ -385,7 +381,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification.Simplifiers
                                                  identifierToken.LeadingTrivia,
                                                  newIdentifierText,
                                                  identifierToken.TrailingTrivia))
-                    newIdentifierToken = VisualBasicSimplificationService.TryEscapeIdentifierToken(newIdentifierToken, semanticModel)
+                    newIdentifierToken = VisualBasicSimplificationService.TryEscapeIdentifierToken(newIdentifierToken)
                     replacementNode = SyntaxFactory.IdentifierName(newIdentifierToken).WithLeadingTrivia(name.GetLeadingTrivia())
                     Return True
                 End If
diff --git a/src/Workspaces/VisualBasic/Portable/Simplification/VisualBasicSimplificationService.Expander.vb b/src/Workspaces/VisualBasic/Portable/Simplification/VisualBasicSimplificationService.Expander.vb
@@ -303,7 +303,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification
                         Dim inferredName = node.Expression.TryGetInferredMemberName()
                         If CanMakeNameExplicitInTuple(tuple, inferredName) Then
                             Dim identifier = SyntaxFactory.Identifier(inferredName)
-                            identifier = TryEscapeIdentifierToken(identifier, _semanticModel)
+                            identifier = TryEscapeIdentifierToken(identifier)
 
                             newSimpleArgument = newSimpleArgument.
                                 WithLeadingTrivia().
@@ -378,7 +378,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification
                     Dim inferredName = node.Expression.TryGetInferredMemberName()
                     If inferredName IsNot Nothing Then
                         Dim identifier = SyntaxFactory.Identifier(inferredName)
-                        identifier = TryEscapeIdentifierToken(identifier, _semanticModel)
+                        identifier = TryEscapeIdentifierToken(identifier)
 
                         Return SyntaxFactory.NamedFieldInitializer(SyntaxFactory.IdentifierName(identifier), newInitializer.Expression.WithoutLeadingTrivia()).
                             WithLeadingTrivia(node.GetLeadingTrivia()).
@@ -425,7 +425,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification
 
                         ' <rewritten_left>.<module_name>.<rewritten_right>
                         Dim moduleIdentifierToken = SyntaxFactory.Identifier(symbolForQualifiedName.ContainingType.Name)
-                        moduleIdentifierToken = TryEscapeIdentifierToken(moduleIdentifierToken, _semanticModel)
+                        moduleIdentifierToken = TryEscapeIdentifierToken(moduleIdentifierToken)
 
                         Dim qualifiedNameWithModuleName = rewrittenQualifiedName.CopyAnnotationsTo(SyntaxFactory.QualifiedName(
                             SyntaxFactory.QualifiedName(DirectCast(rewrittenQualifiedName, QualifiedNameSyntax).Left, SyntaxFactory.IdentifierName(moduleIdentifierToken)) _
@@ -455,7 +455,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification
 
                         ' <rewritten_left>.<module_name>.<rewritten_right>
                         Dim moduleIdentifierToken = SyntaxFactory.Identifier(symbolForMemberAccess.ContainingType.Name)
-                        moduleIdentifierToken = TryEscapeIdentifierToken(moduleIdentifierToken, _semanticModel)
+                        moduleIdentifierToken = TryEscapeIdentifierToken(moduleIdentifierToken)
 
                         Dim memberAccessWithModuleName = rewrittenMemberAccess.CopyAnnotationsTo(
                             SyntaxFactory.SimpleMemberAccessExpression(
@@ -596,7 +596,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification
                 '
                 ' 3. Always try to escape keyword identifiers
                 '
-                identifier = TryEscapeIdentifierToken(identifier, Me._semanticModel)
+                identifier = TryEscapeIdentifierToken(identifier)
                 If identifier <> rewrittenSimpleName.Identifier Then
                     Select Case newNode.Kind
                         Case SyntaxKind.IdentifierName,
@@ -814,7 +814,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification
 
                 Dim newLabelStatement = DirectCast(MyBase.VisitLabelStatement(node), LabelStatementSyntax)
 
-                Dim escapedLabelToken = TryEscapeIdentifierToken(newLabelStatement.LabelToken, Me._semanticModel)
+                Dim escapedLabelToken = TryEscapeIdentifierToken(newLabelStatement.LabelToken)
                 If newLabelStatement.LabelToken <> escapedLabelToken Then
                     newLabelStatement = newLabelStatement.WithLabelToken(escapedLabelToken)
                 End If
diff --git a/src/Workspaces/VisualBasic/Portable/Simplification/VisualBasicSimplificationService.vb b/src/Workspaces/VisualBasic/Portable/Simplification/VisualBasicSimplificationService.vb
@@ -57,11 +57,11 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification
         Public Overrides Function Expand(token As SyntaxToken, semanticModel As SemanticModel, expandInsideNode As Func(Of SyntaxNode, Boolean), cancellationToken As CancellationToken) As SyntaxToken
             Using Logger.LogBlock(FunctionId.Simplifier_ExpandToken, cancellationToken)
                 Dim rewriter = New Expander(semanticModel, expandInsideNode, cancellationToken)
-                Return TryEscapeIdentifierToken(rewriter.VisitToken(token), semanticModel)
+                Return TryEscapeIdentifierToken(rewriter.VisitToken(token))
             End Using
         End Function
 
-        Public Shared Function TryEscapeIdentifierToken(identifierToken As SyntaxToken, semanticModel As SemanticModel, Optional oldIdentifierToken As SyntaxToken? = Nothing) As SyntaxToken
+        Public Shared Function TryEscapeIdentifierToken(identifierToken As SyntaxToken) As SyntaxToken
             If identifierToken.Kind <> SyntaxKind.IdentifierToken OrElse identifierToken.ValueText.Length = 0 Then
                 Return identifierToken
             End If

Original file line number	Diff line number	Diff line change
`@@ -629,8 +629,7 @@ private SyntaxToken RenameToken(SyntaxToken oldToken, SyntaxToken newToken, stri`
`629`	`629`	`}`
`630`	`630`	`else`
`631`	`631`	`{`
`632`		`- var semanticModel = GetSemanticModelForNode(parent, _speculativeModel ?? _semanticModel);`
`633`		`- newToken = Simplification.CSharpSimplificationService.TryEscapeIdentifierToken(newToken, parent, semanticModel);`
	`632`	`+ newToken = Simplification.CSharpSimplificationService.TryEscapeIdentifierToken(newToken, parent);`
`634`	`633`	`}`
`635`	`634`	`}`
`636`	`635`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public override SyntaxToken Expand(SyntaxToken token, SemanticModel semanticMode`
`72`	`72`	`{`
`73`	`73`	`var rewriter = new Expander(semanticModel, expandInsideNode, false, cancellationToken);`
`74`	`74`
`75`		`- var rewrittenToken = TryEscapeIdentifierToken(rewriter.VisitToken(token), token.Parent, semanticModel).WithAdditionalAnnotations(Simplifier.Annotation);`
	`75`	`+ var rewrittenToken = TryEscapeIdentifierToken(rewriter.VisitToken(token), token.Parent).WithAdditionalAnnotations(Simplifier.Annotation);`
`76`	`76`	`if (TryAddLeadingElasticTriviaIfNecessary(rewrittenToken, token, out var rewrittenTokenWithElasticTrivia))`
`77`	`77`	`{`
`78`	`78`	`return rewrittenTokenWithElasticTrivia;`
`@@ -82,7 +82,7 @@ public override SyntaxToken Expand(SyntaxToken token, SemanticModel semanticMode`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
`85`		`- public static SyntaxToken TryEscapeIdentifierToken(SyntaxToken syntaxToken, SyntaxNode parentOfToken, SemanticModel semanticModel)`
	`85`	`+ public static SyntaxToken TryEscapeIdentifierToken(SyntaxToken syntaxToken, SyntaxNode parentOfToken)`
`86`	`86`	`{`
`87`	`87`	`// do not escape an already escaped identifier`
`88`	`88`	`if (syntaxToken.IsVerbatimIdentifier())`