Remove unnecessary code from extract method (#76689)

Author: CyrusNajmabadi

src/Features/CSharp/Portable/ExtractMethod/CSharpMethodExtractor.cs

@@ -173,15 +173,12 @@ await semanticDocument.WithSyntaxRootAsync(result.Root, cancellationToken).Confi
         protected override AbstractFormattingRule GetCustomFormattingRule(Document document)
             => FormattingRule.Instance;
 
-        protected override SyntaxToken? GetInvocationNameToken(IEnumerable<SyntaxToken> methodNames)
-            => methodNames.FirstOrNull(t => !t.Parent.IsKind(SyntaxKind.MethodDeclaration));
-
         protected override SyntaxNode ParseTypeName(string name)
             => SyntaxFactory.ParseTypeName(name);
 
-        protected override async Task<(Document document, SyntaxToken? invocationNameToken)> InsertNewLineBeforeLocalFunctionIfNecessaryAsync(
+        protected override async Task<(Document document, SyntaxToken invocationNameToken)> InsertNewLineBeforeLocalFunctionIfNecessaryAsync(
             Document document,
-            SyntaxToken? invocationNameToken,
+            SyntaxToken invocationNameToken,
             SyntaxNode methodDefinition,
             CancellationToken cancellationToken)
         {
@@ -206,8 +203,7 @@ protected override SyntaxNode ParseTypeName(string name)
 
                 var newRoot = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
 
-                if (invocationNameToken != null)
-                    invocationNameToken = newRoot.FindToken(invocationNameToken.Value.SpanStart);
+                invocationNameToken = newRoot.FindToken(invocationNameToken.SpanStart);
             }
 
             return (document, invocationNameToken);

src/Features/Core/Portable/ExtractMethod/MethodExtractor.cs

@@ -42,11 +42,10 @@ internal abstract partial class MethodExtractor(
 
         protected abstract CodeGenerator CreateCodeGenerator(SelectionResult selectionResult, AnalyzerResult analyzerResult);
 
-        protected abstract SyntaxToken? GetInvocationNameToken(IEnumerable<SyntaxToken> tokens);
         protected abstract AbstractFormattingRule GetCustomFormattingRule(Document document);
 
-        protected abstract Task<(Document document, SyntaxToken? invocationNameToken)> InsertNewLineBeforeLocalFunctionIfNecessaryAsync(
-            Document document, SyntaxToken? invocationNameToken, SyntaxNode methodDefinition, CancellationToken cancellationToken);
+        protected abstract Task<(Document document, SyntaxToken invocationNameToken)> InsertNewLineBeforeLocalFunctionIfNecessaryAsync(
+            Document document, SyntaxToken invocationNameToken, SyntaxNode methodDefinition, CancellationToken cancellationToken);
 
         public ExtractMethodResult ExtractMethod(OperationStatus initialStatus, CancellationToken cancellationToken)
         {
@@ -92,7 +91,8 @@ public ExtractMethodResult ExtractMethod(OperationStatus initialStatus, Cancella
                     cancellationToken.ThrowIfCancellationRequested();
 
                     var newRoot = afterTriviaRestored.Root;
-                    var invocationNameToken = GetInvocationNameToken(newRoot.GetAnnotatedTokens(MethodNameAnnotation));
+
+                    var invocationNameToken = newRoot.GetAnnotatedTokens(MethodNameAnnotation).Single();
 
                     // Do some final patchups of whitespace when inserting a local function.
                     if (LocalFunction)

src/Features/VisualBasic/Portable/ExtractMethod/VisualBasicMethodExtractor.vb

@@ -61,10 +61,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.ExtractMethod
                 Return FormattingRule.Instance
             End Function
 
-            Protected Overrides Function GetInvocationNameToken(methodNames As IEnumerable(Of SyntaxToken)) As SyntaxToken?
-                Return methodNames.FirstOrNull(Function(t) t.Parent.Kind <> SyntaxKind.SubStatement AndAlso t.Parent.Kind <> SyntaxKind.FunctionStatement)
-            End Function
-
             Protected Overrides Function ParseTypeName(name As String) As SyntaxNode
                 Return SyntaxFactory.ParseTypeName(name)
             End Function
@@ -115,9 +111,9 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.ExtractMethod
 
             Protected Overrides Function InsertNewLineBeforeLocalFunctionIfNecessaryAsync(
                     document As Document,
-                    invocationNameToken? As SyntaxToken,
+                    invocationNameToken As SyntaxToken,
                     methodDefinition As SyntaxNode,
-                    cancellationToken As CancellationToken) As Task(Of (document As Document, invocationNameToken As SyntaxToken?))
+                    cancellationToken As CancellationToken) As Task(Of (document As Document, invocationNameToken As SyntaxToken))
                 ' VB doesn't need to do any correction, so we just return the values untouched
                 Return Task.FromResult((document, invocationNameToken))
             End Function