Merge pull request #68432 from CyrusNajmabadi/extractMethodPerf

Lift variable for performance in extract method
dotnet · Jun 3, 2023 · a08e9e1 · a08e9e1
2 parents 43913e6 + 75d322a
commit a08e9e1
Showing 1 changed file with 20 additions and 31 deletions.
diff --git a/src/Features/Core/Portable/ExtractMethod/SelectionResult.cs b/src/Features/Core/Portable/ExtractMethod/SelectionResult.cs
@@ -118,6 +118,7 @@ public bool ShouldPutAsyncModifier()
         {
             var firstToken = GetFirstTokenInSelection();
             var lastToken = GetLastTokenInSelection();
+            var syntaxFacts = SemanticDocument.Project.Services.GetService<ISyntaxFactsService>();
 
             for (var currentToken = firstToken;
                 currentToken.Span.End < lastToken.SpanStart;
@@ -129,7 +130,7 @@ public bool ShouldPutAsyncModifier()
                 //
                 // for the case above, even if the selection contains "await", it doesn't belong to the enclosing block
                 // which extract method is applied to
-                if (SemanticDocument.Project.Services.GetService<ISyntaxFactsService>().IsAwaitKeyword(currentToken)
+                if (syntaxFacts.IsAwaitKeyword(currentToken)
                     && !UnderAnonymousOrLocalMethod(currentToken, firstToken, lastToken))
                 {
                     return true;
@@ -141,6 +142,8 @@ public bool ShouldPutAsyncModifier()
 
         public bool ShouldCallConfigureAwaitFalse()
         {
+            var syntaxFacts = SemanticDocument.Project.Services.GetService<ISyntaxFactsService>();
+
             var firstToken = GetFirstTokenInSelection();
             var lastToken = GetLastTokenInSelection();
 
@@ -149,49 +152,35 @@ public bool ShouldCallConfigureAwaitFalse()
             foreach (var node in SemanticDocument.Root.DescendantNodesAndSelf())
             {
                 if (!node.Span.OverlapsWith(span))
-                {
                     continue;
-                }
 
                 if (IsConfigureAwaitFalse(node) && !UnderAnonymousOrLocalMethod(node.GetFirstToken(), firstToken, lastToken))
-                {
                     return true;
-                }
             }
 
             return false;
-        }
 
-        private bool IsConfigureAwaitFalse(SyntaxNode node)
-        {
-            var syntaxFacts = SemanticDocument.Project.Services.GetService<ISyntaxFactsService>();
-            if (!syntaxFacts.IsInvocationExpression(node))
+            bool IsConfigureAwaitFalse(SyntaxNode node)
             {
-                return false;
-            }
+                if (!syntaxFacts.IsInvocationExpression(node))
+                    return false;
 
-            var invokedExpression = syntaxFacts.GetExpressionOfInvocationExpression(node);
-            if (!syntaxFacts.IsSimpleMemberAccessExpression(invokedExpression))
-            {
-                return false;
-            }
+                var invokedExpression = syntaxFacts.GetExpressionOfInvocationExpression(node);
+                if (!syntaxFacts.IsSimpleMemberAccessExpression(invokedExpression))
+                    return false;
 
-            var name = syntaxFacts.GetNameOfMemberAccessExpression(invokedExpression);
-            var identifier = syntaxFacts.GetIdentifierOfSimpleName(name);
-            if (!syntaxFacts.StringComparer.Equals(identifier.ValueText, nameof(Task.ConfigureAwait)))
-            {
-                return false;
-            }
+                var name = syntaxFacts.GetNameOfMemberAccessExpression(invokedExpression);
+                var identifier = syntaxFacts.GetIdentifierOfSimpleName(name);
+                if (!syntaxFacts.StringComparer.Equals(identifier.ValueText, nameof(Task.ConfigureAwait)))
+                    return false;
 
-            var arguments = syntaxFacts.GetArgumentsOfInvocationExpression(node);
-            if (arguments.Count != 1)
-            {
-                return false;
-            }
+                var arguments = syntaxFacts.GetArgumentsOfInvocationExpression(node);
+                if (arguments.Count != 1)
+                    return false;
 
-            var argument = arguments[0];
-            var expression = syntaxFacts.GetExpressionOfArgument(argument);
-            return syntaxFacts.IsFalseLiteralExpression(expression);
+                var expression = syntaxFacts.GetExpressionOfArgument(arguments[0]);
+                return syntaxFacts.IsFalseLiteralExpression(expression);
+            }
         }
     }
 }