Merge pull request #68460 from CyrusNajmabadi/norecurse

Move off of recursion when determining pp-directive information for a file.

Author: CyrusNajmabadi

src/Features/CSharp/Portable/BraceMatching/CSharpDirectiveTriviaBraceMatcher.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Composition;
 using System.Linq;
 using System.Threading;
@@ -27,13 +28,13 @@ public CSharpDirectiveTriviaBraceMatcher()
         {
         }
 
-        internal override List<DirectiveTriviaSyntax>? GetMatchingConditionalDirectives(DirectiveTriviaSyntax directive, CancellationToken cancellationToken)
-                => directive.GetMatchingConditionalDirectives(cancellationToken)?.ToList();
+        protected override ImmutableArray<DirectiveTriviaSyntax> GetMatchingConditionalDirectives(DirectiveTriviaSyntax directive, CancellationToken cancellationToken)
+            => directive.GetMatchingConditionalDirectives(cancellationToken);
 
-        internal override DirectiveTriviaSyntax GetMatchingDirective(DirectiveTriviaSyntax directive, CancellationToken cancellationToken)
-                => directive.GetMatchingDirective(cancellationToken);
+        protected override DirectiveTriviaSyntax? GetMatchingDirective(DirectiveTriviaSyntax directive, CancellationToken cancellationToken)
+            => directive.GetMatchingDirective(cancellationToken);
 
         internal override TextSpan GetSpanForTagging(DirectiveTriviaSyntax directive)
-                => TextSpan.FromBounds(directive.HashToken.SpanStart, directive.DirectiveNameToken.Span.End);
+            => TextSpan.FromBounds(directive.HashToken.SpanStart, directive.DirectiveNameToken.Span.End);
     }
 }

src/Features/CSharp/Portable/Highlighting/KeywordHighlighters/ConditionalPreprocessorHighlighter.cs

@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Composition;
@@ -29,11 +27,6 @@ protected override void AddHighlights(
             DirectiveTriviaSyntax directive, List<TextSpan> highlights, CancellationToken cancellationToken)
         {
             var conditionals = directive.GetMatchingConditionalDirectives(cancellationToken);
-            if (conditionals == null)
-            {
-                return;
-            }
-
             foreach (var conditional in conditionals)
             {
                 highlights.Add(TextSpan.FromBounds(

src/Features/Core/Portable/BraceMatching/AbstractDirectiveTriviaBraceMatcher.cs

@@ -2,11 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
-using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Text;
 
 namespace Microsoft.CodeAnalysis.BraceMatching
@@ -23,29 +22,27 @@ internal abstract class AbstractDirectiveTriviaBraceMatcher<TDirectiveTriviaSynt
             where TRegionDirectiveTriviaSyntax : TDirectiveTriviaSyntax
             where TEndRegionDirectiveTriviaSyntax : TDirectiveTriviaSyntax
     {
-        internal abstract List<TDirectiveTriviaSyntax> GetMatchingConditionalDirectives(TDirectiveTriviaSyntax directive, CancellationToken cancellationToken);
-        internal abstract TDirectiveTriviaSyntax GetMatchingDirective(TDirectiveTriviaSyntax directive, CancellationToken cancellationToken);
+        protected abstract ImmutableArray<TDirectiveTriviaSyntax> GetMatchingConditionalDirectives(TDirectiveTriviaSyntax directive, CancellationToken cancellationToken);
+        protected abstract TDirectiveTriviaSyntax? GetMatchingDirective(TDirectiveTriviaSyntax directive, CancellationToken cancellationToken);
         internal abstract TextSpan GetSpanForTagging(TDirectiveTriviaSyntax directive);
 
         public async Task<BraceMatchingResult?> FindBracesAsync(Document document, int position, BraceMatchingOptions options, CancellationToken cancellationToken)
         {
-            var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+            var root = await document.GetRequiredSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
             var token = root.FindToken(position, findInsideTrivia: true);
 
             if (token.Parent is not TDirectiveTriviaSyntax directive)
             {
                 return null;
             }
 
-            TDirectiveTriviaSyntax matchingDirective = null;
+            TDirectiveTriviaSyntax? matchingDirective = null;
             if (IsConditionalDirective(directive))
             {
                 // #if/#elif/#else/#endif directive cases.
                 var matchingDirectives = GetMatchingConditionalDirectives(directive, cancellationToken);
-                if (matchingDirectives?.Count > 0)
-                {
-                    matchingDirective = matchingDirectives[(matchingDirectives.IndexOf(directive) + 1) % matchingDirectives.Count];
-                }
+                if (matchingDirectives.Length > 0)
+                    matchingDirective = matchingDirectives[(matchingDirectives.IndexOf(directive) + 1) % matchingDirectives.Length];
             }
             else
             {
@@ -65,11 +62,9 @@ internal abstract class AbstractDirectiveTriviaBraceMatcher<TDirectiveTriviaSynt
         }
 
         private static bool IsConditionalDirective(TDirectiveTriviaSyntax directive)
-        {
-            return directive is TIfDirectiveTriviaSyntax or
+            => directive is TIfDirectiveTriviaSyntax or
                    TElseIfDirectiveTriviaSyntax or
                    TElseDirectiveTriviaSyntax or
                    TEndIfDirectiveTriviaSyntax;
-        }
     }
 }

src/Features/VisualBasic/Portable/BraceMatching/VisualBasicDirectiveTriviaBraceMatcher.vb

@@ -2,6 +2,7 @@
 ' The .NET Foundation licenses this file to you under the MIT license.
 ' See the LICENSE file in the project root for more information.
 
+Imports System.Collections.Immutable
 Imports System.Composition
 Imports System.Threading
 Imports Microsoft.CodeAnalysis.BraceMatching
@@ -22,11 +23,11 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.BraceMatching
         Public Sub New()
         End Sub
 
-        Friend Overrides Function GetMatchingConditionalDirectives(directive As DirectiveTriviaSyntax, cancellationToken As CancellationToken) As List(Of DirectiveTriviaSyntax)
-            Return directive.GetMatchingConditionalDirectives(cancellationToken)?.ToList()
+        Protected Overrides Function GetMatchingConditionalDirectives(directive As DirectiveTriviaSyntax, cancellationToken As CancellationToken) As ImmutableArray(Of DirectiveTriviaSyntax)
+            Return directive.GetMatchingConditionalDirectives(cancellationToken)
         End Function
 
-        Friend Overrides Function GetMatchingDirective(directive As DirectiveTriviaSyntax, cancellationToken As CancellationToken) As DirectiveTriviaSyntax
+        Protected Overrides Function GetMatchingDirective(directive As DirectiveTriviaSyntax, cancellationToken As CancellationToken) As DirectiveTriviaSyntax
             Return directive.GetMatchingStartOrEndDirective(cancellationToken)
         End Function
 
@@ -40,7 +41,5 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.BraceMatching
 
             Return TextSpan.FromBounds(directive.HashToken.SpanStart, keywordToken.Span.End)
         End Function
-
     End Class
-
 End Namespace

src/Features/VisualBasic/Portable/Highlighting/KeywordHighlighters/ConditionalPreprocessorHighlighter.vb

@@ -21,10 +21,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.KeywordHighlighting
 
         Protected Overloads Overrides Sub AddHighlights(directive As DirectiveTriviaSyntax, highlights As List(Of TextSpan), cancellationToken As CancellationToken)
             Dim conditionals = directive.GetMatchingConditionalDirectives(cancellationToken)
-            If conditionals Is Nothing Then
-                Return
-            End If
-
             For Each conditional In conditionals
                 If TypeOf conditional Is IfDirectiveTriviaSyntax Then
                     With DirectCast(conditional, IfDirectiveTriviaSyntax)

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/CSharpCompilerExtensions.projitems

@@ -29,9 +29,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\ConversionExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\DefaultExpressionSyntaxExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\DirectiveSyntaxExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Extensions\DirectiveSyntaxExtensions.DirectiveInfo.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Extensions\DirectiveSyntaxExtensions.DirectiveSyntaxEqualityComparer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Extensions\DirectiveSyntaxExtensions.DirectiveWalker.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\ExpressionSyntaxExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\ForEachStatementSyntaxExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\ILocalSymbolExtensions.cs" />