Merge pull request #73535 from CyrusNajmabadi/classificationExt2

More classification perf fixes.
dotnet · May 17, 2024 · 9c89909 · 9c89909
2 parents a89e189 + 4fe82a9
commit 9c89909
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 44 deletions.
diff --git a/...ortable/EmbeddedLanguages/Classification/AbstractEmbeddedLanguageClassificationService.cs b/...ortable/EmbeddedLanguages/Classification/AbstractEmbeddedLanguageClassificationService.cs
@@ -89,7 +89,7 @@ public void VisitTokens(SyntaxNode node)
             while (stack.TryPop(out var currentNodeOrToken))
             {
                 _cancellationToken.ThrowIfCancellationRequested();
-                if (currentNodeOrToken.Span.IntersectsWith(_textSpan))
+                if (currentNodeOrToken.FullSpan.IntersectsWith(_textSpan))
                 {
                     if (currentNodeOrToken.IsNode)
                     {

diff --git a/src/Workspaces/CSharp/Portable/Classification/SyntaxClassification/NameSyntaxClassifier.cs b/src/Workspaces/CSharp/Portable/Classification/SyntaxClassification/NameSyntaxClassifier.cs
@@ -29,36 +29,21 @@ public override void AddClassifications(
         SegmentedList<ClassifiedSpan> result,
         CancellationToken cancellationToken)
     {
-        if (syntax is NameSyntax name)
-        {
+        if (syntax is SimpleNameSyntax name)
             ClassifyTypeSyntax(name, semanticModel, result, cancellationToken);
-        }
     }
 
     public override ImmutableArray<Type> SyntaxNodeTypes { get; } =
     [
-        typeof(AliasQualifiedNameSyntax),
-        typeof(GenericNameSyntax),
         typeof(IdentifierNameSyntax),
-        typeof(QualifiedNameSyntax),
-        typeof(SimpleNameSyntax),
+        typeof(GenericNameSyntax),
     ];
 
-    protected override int? GetRightmostNameArity(SyntaxNode node)
-    {
-        if (node is ExpressionSyntax expressionSyntax)
-        {
-            return expressionSyntax.GetRightmostName()?.Arity;
-        }
-
-        return null;
-    }
-
     protected override bool IsParentAnAttribute(SyntaxNode node)
         => node.IsParentKind(SyntaxKind.Attribute);
 
     private void ClassifyTypeSyntax(
-        NameSyntax name,
+        SimpleNameSyntax name,
         SemanticModel semanticModel,
         SegmentedList<ClassifiedSpan> result,
         CancellationToken cancellationToken)
@@ -73,7 +58,7 @@ private void ClassifyTypeSyntax(
     }
 
     private bool TryClassifySymbol(
-        NameSyntax name,
+        SimpleNameSyntax name,
         SymbolInfo symbolInfo,
         SegmentedList<ClassifiedSpan> result)
     {
@@ -104,7 +89,7 @@ CandidateReason.Ambiguous or
     }
 
     private static bool TryClassifyAmbiguousSymbol(
-        NameSyntax name,
+        SimpleNameSyntax name,
         SymbolInfo symbolInfo,
         SegmentedList<ClassifiedSpan> result)
     {
@@ -138,19 +123,19 @@ private static bool TryClassifyAmbiguousSymbol(
     }
 
     private static bool TryClassifySymbol(
-        NameSyntax name,
+        SimpleNameSyntax name,
         [NotNullWhen(returnValue: true)] ISymbol? symbol,
         out ClassifiedSpan classifiedSpan)
     {
         // For Namespace parts, we want don't want to classify the QualifiedNameSyntax
         // nodes, we instead wait for the each IdentifierNameSyntax node to avoid
         // creating overlapping ClassifiedSpans.
         if (symbol is INamespaceSymbol namespaceSymbol &&
-            name is IdentifierNameSyntax identifierNameSyntax)
+            name is IdentifierNameSyntax)
         {
             // Do not classify the global:: namespace. It is already syntactically classified as a keyword.
             var isGlobalNamespace = namespaceSymbol.IsGlobalNamespace &&
-                identifierNameSyntax.Identifier.IsKind(SyntaxKind.GlobalKeyword);
+                name.Identifier.IsKind(SyntaxKind.GlobalKeyword);
             if (isGlobalNamespace)
             {
                 classifiedSpan = default;
@@ -281,7 +266,7 @@ private static string GetClassificationForMethod(IMethodSymbol methodSymbol)
             : ClassificationTypeNames.MethodName;
     }
 
-    private static bool IsInVarContext(NameSyntax name)
+    private static bool IsInVarContext(SimpleNameSyntax name)
     {
         return
             name.CheckParent<RefTypeSyntax>(v => v.Type == name) ||
@@ -293,18 +278,18 @@ private static bool IsInVarContext(NameSyntax name)
     }
 
     private static bool TryClassifyFromIdentifier(
-        NameSyntax name,
+        SimpleNameSyntax name,
         SymbolInfo symbolInfo,
         SegmentedList<ClassifiedSpan> result)
     {
         // Okay - it wasn't a type. If the syntax matches "var q = from" or "q = from", and from
         // doesn't bind to anything then optimistically color from as a keyword.
-        if (name is IdentifierNameSyntax identifierName &&
-            identifierName.Identifier.HasMatchingText(SyntaxKind.FromKeyword) &&
+        if (name is IdentifierNameSyntax &&
+            name.Identifier.HasMatchingText(SyntaxKind.FromKeyword) &&
             symbolInfo.Symbol == null)
         {
-            var token = identifierName.Identifier;
-            if (identifierName.IsRightSideOfAnyAssignExpression() || identifierName.IsVariableDeclaratorValue())
+            var token = name.Identifier;
+            if (name.IsRightSideOfAnyAssignExpression() || name.IsVariableDeclaratorValue())
             {
                 result.Add(new ClassifiedSpan(token.Span, ClassificationTypeNames.Keyword));
                 return true;
@@ -315,21 +300,20 @@ private static bool TryClassifyFromIdentifier(
     }
 
     private static bool TryClassifyValueIdentifier(
-        NameSyntax name,
+        SimpleNameSyntax name,
         SymbolInfo symbolInfo,
         SegmentedList<ClassifiedSpan> result)
     {
-        if (name is IdentifierNameSyntax identifierName &&
-            symbolInfo.Symbol.IsImplicitValueParameter())
+        if (symbolInfo.Symbol.IsImplicitValueParameter())
         {
-            result.Add(new ClassifiedSpan(identifierName.Identifier.Span, ClassificationTypeNames.Keyword));
+            result.Add(new ClassifiedSpan(name.Identifier.Span, ClassificationTypeNames.Keyword));
             return true;
         }
 
         return false;
     }
 
-    private static bool TryClassifySomeContextualKeywordIdentifiersAsKeywords(NameSyntax name, SymbolInfo symbolInfo, SegmentedList<ClassifiedSpan> result)
+    private static bool TryClassifySomeContextualKeywordIdentifiersAsKeywords(SimpleNameSyntax name, SymbolInfo symbolInfo, SegmentedList<ClassifiedSpan> result)
     {
         // Simple approach, if the user ever types one of identifiers from the list and it doesn't actually bind to anything, presume that
         // they intend to use it as a keyword. This works for all error

diff --git a/...kspaces/Core/Portable/Classification/SyntaxClassification/AbstractNameSyntaxClassifier.cs b/...kspaces/Core/Portable/Classification/SyntaxClassification/AbstractNameSyntaxClassifier.cs
@@ -11,7 +11,6 @@ namespace Microsoft.CodeAnalysis.Classification.Classifiers;
 
 internal abstract class AbstractNameSyntaxClassifier : AbstractSyntaxClassifier
 {
-    protected abstract int? GetRightmostNameArity(SyntaxNode node);
     protected abstract bool IsParentAnAttribute(SyntaxNode node);
 
     protected ISymbol? TryGetSymbol(SyntaxNode node, SymbolInfo symbolInfo)

diff --git a/...rkspaces/VisualBasic/Portable/Classification/SyntaxClassification/NameSyntaxClassifier.vb b/...rkspaces/VisualBasic/Portable/Classification/SyntaxClassification/NameSyntaxClassifier.vb
@@ -60,14 +60,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Classification.Classifiers
             End If
         End Sub
 
-        Protected Overrides Function GetRightmostNameArity(node As SyntaxNode) As Integer?
-            If TypeOf (node) Is ExpressionSyntax Then
-                Return DirectCast(node, ExpressionSyntax).GetRightmostName()?.Arity
-            End If
-
-            Return Nothing
-        End Function
-
         Protected Overrides Function IsParentAnAttribute(node As SyntaxNode) As Boolean
             Return node.IsParentKind(SyntaxKind.Attribute)
         End Function