Go back to statements

Author: CyrusNajmabadi

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

@@ -242,6 +242,8 @@ private OperationStatus GetOperationStatus(
                     ? OperationStatus.UnsafeAddressTaken
                     : OperationStatus.SucceededStatus;
 
+                var asyncRefOutParameterStatus = CheckAsyncMethodRefOutParameters(variables);
+
                 var variableMapStatus = failedVariables.Count == 0
                     ? OperationStatus.SucceededStatus
                     : new OperationStatus(succeeded: true,
@@ -256,10 +258,26 @@ private OperationStatus GetOperationStatus(
                 return readonlyFieldStatus
                     .With(anonymousTypeStatus)
                     .With(unsafeAddressStatus)
+                    .With(asyncRefOutParameterStatus)
                     .With(variableMapStatus)
                     .With(localFunctionStatus);
             }
 
+            private OperationStatus CheckAsyncMethodRefOutParameters(IList<VariableInfo> parameters)
+            {
+                if (SelectionResult.ContainsAwaitExpression())
+                {
+                    var names = parameters
+                        .Where(v => v is { UseAsReturnValue: false, ParameterModifier: ParameterBehavior.Out or ParameterBehavior.Ref })
+                        .Select(p => p.Name ?? string.Empty);
+
+                    if (names.Any())
+                        return new OperationStatus(succeeded: true, string.Format(FeaturesResources.Asynchronous_method_cannot_have_ref_out_parameters_colon_bracket_0_bracket, string.Join(", ", names)));
+                }
+
+                return OperationStatus.SucceededStatus;
+            }
+
             private MultiDictionary<ISymbol, SyntaxToken> GetSymbolMap()
             {
                 var symbolMap = new MultiDictionary<ISymbol, SyntaxToken>();

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

@@ -86,15 +86,15 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.ExtractMethod
                         End If
                     End Function
 
-                    Protected Overrides Function GetFirstStatementOrInitializerSelectedAtCallSite() As ExecutableStatementSyntax
-                        Return Me.SelectionResult.GetContainingScopeOf(Of ExecutableStatementSyntax)()
+                    Protected Overrides Function GetFirstStatementOrInitializerSelectedAtCallSite() As StatementSyntax
+                        Return Me.SelectionResult.GetContainingScopeOf(Of StatementSyntax)()
                     End Function
 
-                    Protected Overrides Function GetLastStatementOrInitializerSelectedAtCallSite() As ExecutableStatementSyntax
+                    Protected Overrides Function GetLastStatementOrInitializerSelectedAtCallSite() As StatementSyntax
                         Return GetFirstStatementOrInitializerSelectedAtCallSite()
                     End Function
 
-                    Protected Overrides Async Function GetStatementOrInitializerContainingInvocationToExtractedMethodAsync(cancellationToken As CancellationToken) As Task(Of ExecutableStatementSyntax)
+                    Protected Overrides Async Function GetStatementOrInitializerContainingInvocationToExtractedMethodAsync(cancellationToken As CancellationToken) As Task(Of StatementSyntax)
                         Dim enclosingStatement = GetFirstStatementOrInitializerSelectedAtCallSite()
                         Dim callSignature = CreateCallSignature().WithAdditionalAnnotations(CallSiteAnnotation)
 
@@ -117,7 +117,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.ExtractMethod
                         Dim updatedDocument = Await Me.SemanticDocument.Document.ReplaceNodeAsync(enclosingStatement, newEnclosingStatement, cancellationToken).ConfigureAwait(False)
                         Dim updatedRoot = Await updatedDocument.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(False)
 
-                        newEnclosingStatement = DirectCast(updatedRoot.GetAnnotatedNodesAndTokens(enclosingStatementAnnotation).Single().AsNode(), ExecutableStatementSyntax)
+                        newEnclosingStatement = DirectCast(updatedRoot.GetAnnotatedNodesAndTokens(enclosingStatementAnnotation).Single().AsNode(), StatementSyntax)
 
                         ' because of the complexification we cannot guarantee that there is only one annotation.
                         ' however complexification of names is prepended, so the last annotation should be the original one.

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

@@ -49,16 +49,17 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.ExtractMethod
                         Return nodes.ToImmutableArray()
                     End Function
 
-                    Protected Overrides Function GetFirstStatementOrInitializerSelectedAtCallSite() As ExecutableStatementSyntax
+                    Protected Overrides Function GetFirstStatementOrInitializerSelectedAtCallSite() As StatementSyntax
                         Return Me.SelectionResult.GetFirstStatementUnderContainer()
                     End Function
 
-                    Protected Overrides Function GetLastStatementOrInitializerSelectedAtCallSite() As ExecutableStatementSyntax
+                    Protected Overrides Function GetLastStatementOrInitializerSelectedAtCallSite() As StatementSyntax
                         Return Me.SelectionResult.GetLastStatementUnderContainer()
                     End Function
 
-                    Protected Overrides Function GetStatementOrInitializerContainingInvocationToExtractedMethodAsync(cancellationToken As CancellationToken) As Task(Of ExecutableStatementSyntax)
-                        Return Task.FromResult(GetStatementContainingInvocationToExtractedMethodWorker().WithAdditionalAnnotations(CallSiteAnnotation))
+                    Protected Overrides Function GetStatementOrInitializerContainingInvocationToExtractedMethodAsync(cancellationToken As CancellationToken) As Task(Of StatementSyntax)
+                        Return Task.FromResult(Of StatementSyntax)(
+                            GetStatementContainingInvocationToExtractedMethodWorker().WithAdditionalAnnotations(CallSiteAnnotation))
                     End Function
                 End Class
             End Class

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

@@ -37,18 +37,19 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.ExtractMethod
                         Return ImmutableArray.Create(Of StatementSyntax)(Me.SelectionResult.GetFirstStatement())
                     End Function
 
-                    Protected Overrides Function GetFirstStatementOrInitializerSelectedAtCallSite() As ExecutableStatementSyntax
+                    Protected Overrides Function GetFirstStatementOrInitializerSelectedAtCallSite() As StatementSyntax
                         Return Me.SelectionResult.GetFirstStatement()
                     End Function
 
-                    Protected Overrides Function GetLastStatementOrInitializerSelectedAtCallSite() As ExecutableStatementSyntax
+                    Protected Overrides Function GetLastStatementOrInitializerSelectedAtCallSite() As StatementSyntax
                         ' it is a single statement case. either first statement is same as last statement or
                         ' last statement belongs (embedded statement) to the first statement.
                         Return Me.SelectionResult.GetFirstStatement()
                     End Function
 
-                    Protected Overrides Function GetStatementOrInitializerContainingInvocationToExtractedMethodAsync(cancellationToken As CancellationToken) As Task(Of ExecutableStatementSyntax)
-                        Return Task.FromResult(GetStatementContainingInvocationToExtractedMethodWorker().WithAdditionalAnnotations(CallSiteAnnotation))
+                    Protected Overrides Function GetStatementOrInitializerContainingInvocationToExtractedMethodAsync(cancellationToken As CancellationToken) As Task(Of StatementSyntax)
+                        Return Task.FromResult(Of StatementSyntax)(
+                            GetStatementContainingInvocationToExtractedMethodWorker().WithAdditionalAnnotations(CallSiteAnnotation))
                     End Function
                 End Class
             End Class

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

@@ -19,7 +19,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.ExtractMethod
     Partial Friend NotInheritable Class VisualBasicExtractMethodService
         Partial Friend Class VisualBasicMethodExtractor
             Partial Private MustInherit Class VisualBasicCodeGenerator
-                Inherits CodeGenerator(Of ExecutableStatementSyntax, VisualBasicCodeGenerationOptions)
+                Inherits CodeGenerator(Of StatementSyntax, VisualBasicCodeGenerationOptions)
 
                 Private ReadOnly _methodName As SyntaxToken