Remove sync over async calls from within rename (#76508)

Author: CyrusNajmabadi

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Extensions/SemanticModelExtensions.vb

@@ -11,7 +11,7 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
 
 Namespace Microsoft.CodeAnalysis.VisualBasic.Extensions
     Partial Friend Module SemanticModelExtensions
-        <Extension()>
+        <Extension>
         Public Function LookupTypeRegardlessOfArity(semanticModel As SemanticModel,
                                                     name As SyntaxToken,
                                                     cancellationToken As CancellationToken) As IList(Of ITypeSymbol)
@@ -26,7 +26,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Extensions
             Return SpecializedCollections.EmptyList(Of ITypeSymbol)()
         End Function
 
-        <Extension()>
+        <Extension>
         Public Function LookupName(semanticModel As SemanticModel, name As SyntaxToken,
                                    namespacesAndTypesOnly As Boolean,
                                    cancellationToken As CancellationToken) As IList(Of ISymbol)
@@ -38,7 +38,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Extensions
             Return SpecializedCollections.EmptyList(Of ISymbol)()
         End Function
 
-        <Extension()>
+        <Extension>
         Public Function LookupName(semanticModel As SemanticModel,
                                    expression As ExpressionSyntax,
                                    namespacesAndTypesOnly As Boolean,
@@ -68,17 +68,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Extensions
                 semanticModel.LookupSymbols(expr.SpanStart, container:=symbol, name:=name))
         End Function
 
-        <Extension()>
-        Public Function GetSymbolInfo(semanticModel As SemanticModel, token As SyntaxToken) As SymbolInfo
-            Dim expression = TryCast(token.Parent, ExpressionSyntax)
-            If expression Is Nothing Then
-                Return Nothing
-            End If
-
-            Return semanticModel.GetSymbolInfo(expression)
-        End Function
-
-        <Extension()>
+        <Extension>
         Public Function GetImportNamespacesInScope(semanticModel As SemanticModel, location As SyntaxNode) As ISet(Of INamespaceSymbol)
             Dim q =
                 From u In location.GetAncestorOrThis(Of CompilationUnitSyntax).Imports
@@ -92,7 +82,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Extensions
             Return q.ToSet()
         End Function
 
-        <Extension()>
+        <Extension>
         Public Function GetAliasInfo(semanticModel As SemanticModel, expression As ExpressionSyntax, cancellationToken As CancellationToken) As IAliasSymbol
             Dim nameSyntax = TryCast(expression, IdentifierNameSyntax)
             If nameSyntax Is Nothing Then
@@ -102,7 +92,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Extensions
             End If
         End Function
 
-        <Extension()>
+        <Extension>
         Public Function DetermineAccessibilityConstraint(semanticModel As SemanticModel,
                                                          type As TypeSyntax,
                                                          cancellationToken As CancellationToken) As Accessibility

src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/LanguageServices/VisualBasicTypeInferenceService.TypeInferrer.vb

@@ -10,9 +10,8 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Symbols
 Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
 
 Namespace Microsoft.CodeAnalysis.VisualBasic
-
-    Partial Friend Class VisualBasicTypeInferenceService
-        Private Class TypeInferrer
+    Partial Friend NotInheritable Class VisualBasicTypeInferenceService
+        Private NotInheritable Class TypeInferrer
             Inherits AbstractTypeInferrer
 
             Public Sub New(semanticModel As SemanticModel, cancellationToken As CancellationToken)
@@ -26,7 +25,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
 
             Protected Overrides Function GetTypes_DoNotCallDirectly(node As SyntaxNode, objectAsDefault As Boolean) As IEnumerable(Of TypeInferenceInfo)
                 If node IsNot Nothing Then
-                    Dim info = SemanticModel.GetTypeInfo(node)
+                    Dim info = SemanticModel.GetTypeInfo(node, CancellationToken)
                     If info.Type IsNot Nothing AndAlso info.Type.TypeKind <> TypeKind.Error Then
                         Return CreateResult(info.Type)
                     End If
@@ -106,7 +105,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
                     Return SpecializedCollections.EmptyEnumerable(Of TypeInferenceInfo)()
                 End If
 
-                Dim typeSymbol = SemanticModel.GetTypeInfo(expressionType).Type
+                Dim typeSymbol = SemanticModel.GetTypeInfo(expressionType, CancellationToken).Type
                 If TypeOf typeSymbol IsNot INamedTypeSymbol Then
                     Return SpecializedCollections.EmptyEnumerable(Of TypeInferenceInfo)()
                 End If
@@ -247,7 +246,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
                             Return SpecializedCollections.EmptyEnumerable(Of TypeInferenceInfo)()
                         End If
 
-                        Dim info = SemanticModel.GetSymbolInfo(invocation)
+                        Dim info = SemanticModel.GetSymbolInfo(invocation, CancellationToken)
                         ' Check all the methods that have at least enough arguments to support being
                         ' called with argument at this position.  Note: if they're calling an extension
                         ' method then it will need one more argument in order for us to call it.
@@ -277,7 +276,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
                             End If
 
                             If targetExpression IsNot Nothing Then
-                                Dim expressionType = SemanticModel.GetTypeInfo(targetExpression)
+                                Dim expressionType = SemanticModel.GetTypeInfo(targetExpression, CancellationToken)
                                 If TypeOf expressionType.Type Is IArrayTypeSymbol Then
                                     Return CreateResult(Compilation.GetSpecialType(SpecialType.System_Int32))
                                 End If
@@ -290,7 +289,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
                         '
                         ' etc.
                         Dim creation = TryCast(argumentList.Parent, ObjectCreationExpressionSyntax)
-                        Dim info = SemanticModel.GetSymbolInfo(creation.Type)
+                        Dim info = SemanticModel.GetSymbolInfo(creation.Type, CancellationToken)
                         Dim namedType = TryCast(info.Symbol, INamedTypeSymbol)
                         If namedType IsNot Nothing Then
                             If namedType.TypeKind = TypeKind.Delegate Then
@@ -331,7 +330,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
                             Return SpecializedCollections.EmptyEnumerable(Of TypeInferenceInfo)()
                         End If
 
-                        Dim info = SemanticModel.GetSymbolInfo(attribute)
+                        Dim info = SemanticModel.GetSymbolInfo(attribute, CancellationToken)
                         Dim symbols = info.GetBestOrAllSymbols()
                         If symbols.Any() Then
                             Dim methods = symbols.OfType(Of IMethodSymbol)()
@@ -983,7 +982,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
                 If node.IsKind(SyntaxKind.IdentifierName) Then
                     Dim identifier = DirectCast(node, IdentifierNameSyntax)
                     If CaseInsensitiveComparison.Equals(parameterName, identifier.Identifier.ValueText) AndAlso
-                       SemanticModel.GetSymbolInfo(identifier.Identifier).Symbol?.Kind = SymbolKind.Parameter Then
+                       SemanticModel.GetSymbolInfo(identifier.Identifier, CancellationToken).Symbol?.Kind = SymbolKind.Parameter Then
                         Return InferTypes(identifier).FirstOrDefault().InferredType
                     End If
                 Else
@@ -1001,12 +1000,12 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
             End Function
 
             Private Function InferTypeInNamedFieldInitializer(initializer As NamedFieldInitializerSyntax) As IEnumerable(Of TypeInferenceInfo)
-                Dim right = SemanticModel.GetTypeInfo(initializer.Name).Type
+                Dim right = SemanticModel.GetTypeInfo(initializer.Name, CancellationToken).Type
                 If right IsNot Nothing AndAlso TypeOf right IsNot IErrorTypeSymbol Then
                     Return CreateResult(right)
                 End If
 
-                Return CreateResult(SemanticModel.GetTypeInfo(initializer.Expression).Type)
+                Return CreateResult(SemanticModel.GetTypeInfo(initializer.Expression, CancellationToken).Type)
             End Function
 
             Public Function InferTypeInCaseStatement(caseStatement As CaseStatementSyntax) As IEnumerable(Of TypeInferenceInfo)

src/Workspaces/VisualBasic/Portable/Classification/SyntaxClassification/IdentifierNameSyntaxClassifier.vb

@@ -18,11 +18,17 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Classification.Classifiers
 
         Public Overrides ReadOnly Property SyntaxNodeTypes As ImmutableArray(Of Type) = ImmutableArray.Create(GetType(IdentifierNameSyntax))
 
-        Public Overrides Sub AddClassifications(syntax As SyntaxNode, textSpan As TextSpan, semanticModel As SemanticModel, options As ClassificationOptions, result As SegmentedList(Of ClassifiedSpan), cancellationToken As CancellationToken)
+        Public Overrides Sub AddClassifications(
+                syntax As SyntaxNode,
+                textSpan As TextSpan,
+                semanticModel As SemanticModel,
+                options As ClassificationOptions,
+                result As SegmentedList(Of ClassifiedSpan),
+                cancellationToken As CancellationToken)
             Dim identifierName = DirectCast(syntax, IdentifierNameSyntax)
             Dim identifier = identifierName.Identifier
             If CaseInsensitiveComparison.Equals(identifier.ValueText, s_awaitText) Then
-                Dim symbolInfo = semanticModel.GetSymbolInfo(identifier)
+                Dim symbolInfo = semanticModel.GetSymbolInfo(identifier, cancellationToken)
                 If symbolInfo.GetAnySymbol() Is Nothing Then
                     result.Add(New ClassifiedSpan(ClassificationTypeNames.Keyword, identifier.Span))
                     Return

src/Workspaces/VisualBasic/Portable/Rename/LocalConflictVisitor.vb

@@ -11,12 +11,12 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Rename
         Inherits VisualBasicSyntaxVisitor
 
         Private ReadOnly _tracker As ConflictingIdentifierTracker
-        Private ReadOnly _newSolution As Solution
+        Private ReadOnly _semanticModel As SemanticModel
         Private ReadOnly _cancellationToken As CancellationToken
 
-        Public Sub New(tokenBeingRenamed As SyntaxToken, newSolution As Solution, cancellationToken As CancellationToken)
+        Public Sub New(tokenBeingRenamed As SyntaxToken, semanticModel As SemanticModel, cancellationToken As CancellationToken)
             _tracker = New ConflictingIdentifierTracker(tokenBeingRenamed, CaseInsensitiveComparison.Comparer)
-            _newSolution = newSolution
+            _semanticModel = semanticModel
             _cancellationToken = cancellationToken
         End Sub
 
@@ -147,8 +147,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Rename
                 ' it's only legal to have one name in the variable declarator for for and foreach loops.
                 tokens.Add(DirectCast(controlVariable, VariableDeclaratorSyntax).Names.First().Identifier)
             Else
-                Dim semanticModel = _newSolution.GetDocument(controlVariable.SyntaxTree).GetSemanticModelAsync(_cancellationToken).WaitAndGetResult_CanCallOnBackground(_cancellationToken)
-                Dim symbol = semanticModel.GetSymbolInfo(controlVariable).Symbol
+                Dim symbol = _semanticModel.GetSymbolInfo(controlVariable, _cancellationToken).Symbol
 
                 ' if it is a field we don't care
                 If symbol IsNot Nothing AndAlso symbol.IsKind(SymbolKind.Local) Then
@@ -189,11 +188,10 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Rename
         Public Overrides Sub VisitCatchBlock(node As CatchBlockSyntax)
             Dim tokens As New List(Of SyntaxToken)
 
-            Dim semanticModel = _newSolution.GetDocument(node.SyntaxTree).GetSemanticModelAsync(_cancellationToken).WaitAndGetResult_CanCallOnBackground(_cancellationToken)
             Dim identifierToken = node.CatchStatement.IdentifierName?.Identifier
 
             If identifierToken.HasValue Then
-                Dim symbol = semanticModel.GetSymbolInfo(identifierToken.Value).Symbol
+                Dim symbol = _semanticModel.GetSymbolInfo(identifierToken.Value, _cancellationToken).Symbol
 
                 ' if it is a field we don't care
                 If symbol IsNot Nothing AndAlso symbol.IsKind(SymbolKind.Local) Then

src/Workspaces/VisualBasic/Portable/Rename/VisualBasicRenameRewriterLanguageService.vb

@@ -18,8 +18,7 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
 Imports Microsoft.CodeAnalysis.VisualBasic.Utilities
 
 Namespace Microsoft.CodeAnalysis.VisualBasic.Rename
-
-    Friend Class VisualBasicRenameRewriterLanguageService
+    Friend NotInheritable Class VisualBasicRenameRewriterLanguageService
         Inherits AbstractRenameRewriterLanguageService
 
         Public Shared ReadOnly Instance As New VisualBasicRenameRewriterLanguageService()
@@ -679,16 +678,15 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Rename
             Return False
         End Function
 
-        Public Overrides Function ComputeDeclarationConflictsAsync(
-            replacementText As String,
-            renamedSymbol As ISymbol,
-            renameSymbol As ISymbol,
-            referencedSymbols As IEnumerable(Of ISymbol),
-            baseSolution As Solution,
-            newSolution As Solution,
-            reverseMappedLocations As IDictionary(Of Location, Location),
-            cancellationToken As CancellationToken
-        ) As Task(Of ImmutableArray(Of Location))
+        Public Overrides Async Function ComputeDeclarationConflictsAsync(
+                replacementText As String,
+                renamedSymbol As ISymbol,
+                renameSymbol As ISymbol,
+                referencedSymbols As IEnumerable(Of ISymbol),
+                baseSolution As Solution,
+                newSolution As Solution,
+                reverseMappedLocations As IDictionary(Of Location, Location),
+                cancellationToken As CancellationToken) As Task(Of ImmutableArray(Of Location))
 
             Dim conflicts = ArrayBuilder(Of Location).GetInstance()
 
@@ -700,14 +698,19 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Rename
 
                 ' Find the method block or field declaration that we're in. Note the LastOrDefault
                 ' so we find the uppermost one, since VariableDeclarators live in methods too.
-                Dim methodBase = token.Parent.AncestorsAndSelf.Where(Function(s) TypeOf s Is MethodBlockBaseSyntax OrElse TypeOf s Is VariableDeclaratorSyntax) _
-                                                              .LastOrDefault()
-
-                Dim visitor As New LocalConflictVisitor(token, newSolution, cancellationToken)
-                visitor.Visit(methodBase)
-
-                conflicts.AddRange(visitor.ConflictingTokens.Select(Function(t) t.GetLocation()) _
-                               .Select(Function(loc) reverseMappedLocations(loc)))
+                Dim methodBase = token.Parent.
+                    AncestorsAndSelf().
+                    Where(Function(s) TypeOf s Is MethodBlockBaseSyntax OrElse TypeOf s Is VariableDeclaratorSyntax).
+                    LastOrDefault()
+
+                If methodBase IsNot Nothing Then
+                    Dim semanticModel = Await newSolution.
+                        GetRequiredDocument(methodBase.SyntaxTree).
+                        GetSemanticModelAsync(cancellationToken).ConfigureAwait(False)
+                    Dim visitor As New LocalConflictVisitor(token, semanticModel, cancellationToken)
+                    visitor.Visit(methodBase)
+                    conflicts.AddRange(visitor.ConflictingTokens.Select(Function(t) t.GetLocation()).Select(Function(loc) reverseMappedLocations(loc)))
+                End If
 
                 ' If this is a parameter symbol for a partial method definition, be sure we visited 
                 ' the implementation part's body.
@@ -719,11 +722,16 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Rename
 
                         token = matchingParameterSymbol.Locations.Single().FindToken(cancellationToken)
                         methodBase = token.GetAncestor(Of MethodBlockSyntax)
-                        visitor = New LocalConflictVisitor(token, newSolution, cancellationToken)
-                        visitor.Visit(methodBase)
 
-                        conflicts.AddRange(visitor.ConflictingTokens.Select(Function(t) t.GetLocation()) _
-                                       .Select(Function(loc) reverseMappedLocations(loc)))
+                        If methodBase IsNot Nothing Then
+                            Dim semanticModel = Await newSolution.
+                                GetRequiredDocument(methodBase.SyntaxTree).
+                                GetSemanticModelAsync(cancellationToken).ConfigureAwait(False)
+                            Dim visitor = New LocalConflictVisitor(token, semanticModel, cancellationToken)
+                            visitor.Visit(methodBase)
+
+                            conflicts.AddRange(visitor.ConflictingTokens.Select(Function(t) t.GetLocation()).Select(Function(loc) reverseMappedLocations(loc)))
+                        End If
                     End If
                 End If
 
@@ -792,7 +800,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Rename
                 Next
             End If
 
-            Return Task.FromResult(conflicts.ToImmutableAndFree())
+            Return conflicts.ToImmutableAndFree()
         End Function
 
         Public Overrides Async Function ComputeImplicitReferenceConflictsAsync(

src/Workspaces/VisualBasic/Portable/Simplification/VisualBasicSimplificationService.Expander.vb

@@ -562,7 +562,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification
                     End If
                 End If
 
-                Dim symbol = _semanticModel.GetSymbolInfo(originalSimpleName.Identifier).Symbol
+                Dim symbol = _semanticModel.GetSymbolInfo(originalSimpleName.Identifier, _cancellationToken).Symbol
                 If symbol Is Nothing Then
                     Return newNode
                 End If