@@ -71,13 +71,12 @@ protected override SyntaxNode AddAsyncTokenAndFixReturnType(
7171 bool keepVoid ,
7272 IMethodSymbol methodSymbol ,
7373 SyntaxNode node ,
74- KnownTaskTypes knownTypes ,
75- CancellationToken cancellationToken )
74+ KnownTaskTypes knownTypes )
7675 {
7776 return node switch
7877 {
79- MethodDeclarationSyntax method => FixMethod ( keepVoid , methodSymbol , method , knownTypes , cancellationToken ) ,
80- LocalFunctionStatementSyntax localFunction => FixLocalFunction ( keepVoid , methodSymbol , localFunction , knownTypes , cancellationToken ) ,
78+ MethodDeclarationSyntax method => FixMethod ( keepVoid , methodSymbol , method , knownTypes ) ,
79+ LocalFunctionStatementSyntax localFunction => FixLocalFunction ( keepVoid , methodSymbol , localFunction , knownTypes ) ,
8180 AnonymousFunctionExpressionSyntax anonymous => FixAnonymousFunction ( anonymous ) ,
8281 _ => node ,
8382 } ;
@@ -87,34 +86,31 @@ private static MethodDeclarationSyntax FixMethod(
8786 bool keepVoid ,
8887 IMethodSymbol methodSymbol ,
8988 MethodDeclarationSyntax method ,
90- KnownTaskTypes knownTypes ,
91- CancellationToken cancellationToken )
89+ KnownTaskTypes knownTypes )
9290 {
9391 var ( newModifiers , newReturnType ) = AddAsyncModifierWithCorrectedTrivia (
9492 method . Modifiers ,
95- FixMethodReturnType ( keepVoid , methodSymbol , method . ReturnType , knownTypes , cancellationToken ) ) ;
93+ FixMethodReturnType ( keepVoid , methodSymbol , method . ReturnType , knownTypes ) ) ;
9694 return method . WithReturnType ( newReturnType ) . WithModifiers ( newModifiers ) ;
9795 }
9896
9997 private static LocalFunctionStatementSyntax FixLocalFunction (
10098 bool keepVoid ,
10199 IMethodSymbol methodSymbol ,
102100 LocalFunctionStatementSyntax localFunction ,
103- KnownTaskTypes knownTypes ,
104- CancellationToken cancellationToken )
101+ KnownTaskTypes knownTypes )
105102 {
106103 var ( newModifiers , newReturnType ) = AddAsyncModifierWithCorrectedTrivia (
107104 localFunction . Modifiers ,
108- FixMethodReturnType ( keepVoid , methodSymbol , localFunction . ReturnType , knownTypes , cancellationToken ) ) ;
105+ FixMethodReturnType ( keepVoid , methodSymbol , localFunction . ReturnType , knownTypes ) ) ;
109106 return localFunction . WithReturnType ( newReturnType ) . WithModifiers ( newModifiers ) ;
110107 }
111108
112109 private static TypeSyntax FixMethodReturnType (
113110 bool keepVoid ,
114111 IMethodSymbol methodSymbol ,
115112 TypeSyntax returnTypeSyntax ,
116- KnownTaskTypes knownTypes ,
117- CancellationToken cancellationToken )
113+ KnownTaskTypes knownTypes )
118114 {
119115 var newReturnType = returnTypeSyntax . WithAdditionalAnnotations ( Formatter . Annotation ) ;
120116
@@ -128,13 +124,13 @@ private static TypeSyntax FixMethodReturnType(
128124 else
129125 {
130126 var returnType = methodSymbol . ReturnType ;
131- if ( IsIEnumerable ( returnType , knownTypes ) && IsIterator ( methodSymbol , cancellationToken ) )
127+ if ( IsIEnumerable ( returnType , knownTypes ) && methodSymbol . IsIterator )
132128 {
133129 newReturnType = knownTypes . IAsyncEnumerableOfTType is null
134130 ? MakeGenericType ( nameof ( IAsyncEnumerable < > ) , methodSymbol . ReturnType )
135131 : knownTypes . IAsyncEnumerableOfTType . Construct ( methodSymbol . ReturnType . GetTypeArguments ( ) [ 0 ] ) . GenerateTypeSyntax ( ) ;
136132 }
137- else if ( IsIEnumerator ( returnType , knownTypes ) && IsIterator ( methodSymbol , cancellationToken ) )
133+ else if ( IsIEnumerator ( returnType , knownTypes ) && methodSymbol . IsIterator )
138134 {
139135 newReturnType = knownTypes . IAsyncEnumeratorOfTType is null
140136 ? MakeGenericType ( nameof ( IAsyncEnumerator < > ) , methodSymbol . ReturnType )
@@ -164,9 +160,6 @@ static TypeSyntax MakeGenericType(string type, ITypeSymbol typeArgumentFrom)
164160 }
165161 }
166162
167- private static bool IsIterator ( IMethodSymbol method , CancellationToken cancellationToken )
168- => method . Locations . Any ( static ( loc , cancellationToken ) => loc . FindNode ( cancellationToken ) . ContainsYield ( ) , cancellationToken ) ;
169-
170163 private static bool IsIAsyncEnumerableOrEnumerator ( ITypeSymbol returnType , KnownTaskTypes knownTypes )
171164 => returnType . OriginalDefinition . Equals ( knownTypes . IAsyncEnumerableOfTType ) ||
172165 returnType . OriginalDefinition . Equals ( knownTypes . IAsyncEnumeratorOfTType ) ;
0 commit comments