From fe08f95f53b68e7654baacfd6a0fc1b023b82448 Mon Sep 17 00:00:00 2001 From: CyrusNajmabadi Date: Mon, 7 Nov 2016 13:06:12 -0800 Subject: [PATCH] Rename methods. --- .../AccessorDeclarationStructureProvider.vb | 2 +- .../CompilationUnitStructureProvider.vb | 2 +- .../ConstructorDeclarationStructureProvider.vb | 2 +- .../DisabledTextTriviaStructureProvider.vb | 2 +- .../Providers/DoLoopBlockStructureProvider.vb | 2 +- .../DocumentationCommentStructureProvider.vb | 2 +- .../EnumDeclarationStructureProvider.vb | 2 +- .../EventDeclarationStructureProvider.vb | 2 +- .../Providers/ForBlockStructureProvider.vb | 2 +- .../Providers/ForEachBlockStructureProvider.vb | 2 +- .../MetadataRegionDirectiveStructureProvider.vb | 2 +- .../MethodDeclarationStructureProvider.vb | 2 +- .../MultiLineIfBlockStructureProvider.vb | 2 +- .../MultilineLambdaStructureProvider.vb | 2 +- .../NamespaceDeclarationStructureProvider.vb | 2 +- .../OperatorDeclarationStructureProvider.vb | 2 +- .../PropertyDeclarationStructureProvider.vb | 2 +- .../RegionDirectiveStructureProvider.vb | 2 +- .../Providers/SelectBlockStructureProvider.vb | 2 +- .../Providers/SyncLockBlockStructureProvider.vb | 2 +- .../Providers/TryBlockStructureProvider.vb | 2 +- .../TypeDeclarationStructureProvider.vb | 2 +- .../Providers/UsingBlockStructureProvider.vb | 2 +- .../Providers/WhileBlockStructureProvider.vb | 2 +- .../Providers/WithBlockStructureProvider.vb | 2 +- .../Providers/XmlExpressionStructureProvider.vb | 2 +- .../Structure/VisualBasicStructureHelpers.vb | 16 ++++++++-------- 27 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/AccessorDeclarationStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/AccessorDeclarationStructureProvider.vb index 5ff2b2fea5a..93c5bd23c7f 100644 --- a/src/Features/VisualBasic/Portable/Structure/Providers/AccessorDeclarationStructureProvider.vb +++ b/src/Features/VisualBasic/Portable/Structure/Providers/AccessorDeclarationStructureProvider.vb @@ -17,7 +17,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure Dim block = TryCast(accessorDeclaration.Parent, AccessorBlockSyntax) If Not block?.EndBlockStatement.IsMissing Then - spans.AddIfNotNull(CreateRegionFromBlock( + spans.AddIfNotNull(CreateBlockSpanFromBlock( block, bannerNode:=accessorDeclaration, autoCollapse:=True, type:=BlockTypes.Member, isCollapsible:=True)) End If diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/CompilationUnitStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/CompilationUnitStructureProvider.vb index 469739d8f8d..63b3cfacd45 100644 --- a/src/Features/VisualBasic/Portable/Structure/Providers/CompilationUnitStructureProvider.vb +++ b/src/Features/VisualBasic/Portable/Structure/Providers/CompilationUnitStructureProvider.vb @@ -14,7 +14,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure options As OptionSet, cancellationToken As CancellationToken) CollectCommentsRegions(compilationUnit, spans) - spans.AddIfNotNull(CreateRegion( + spans.AddIfNotNull(CreateBlockSpan( compilationUnit.Imports, bannerText:="Imports" & SpaceEllipsis, autoCollapse:=True, type:=BlockTypes.Imports, isCollapsible:=True)) CollectCommentsRegions(compilationUnit.EndOfFileToken.LeadingTrivia, spans) diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/ConstructorDeclarationStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/ConstructorDeclarationStructureProvider.vb index 92f46a32775..41599acfc97 100644 --- a/src/Features/VisualBasic/Portable/Structure/Providers/ConstructorDeclarationStructureProvider.vb +++ b/src/Features/VisualBasic/Portable/Structure/Providers/ConstructorDeclarationStructureProvider.vb @@ -19,7 +19,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure Dim block = TryCast(constructorDeclaration.Parent, ConstructorBlockSyntax) If Not block?.EndBlockStatement.IsMissing Then - spans.AddIfNotNull(CreateRegionFromBlock( + spans.AddIfNotNull(CreateBlockSpanFromBlock( block, bannerNode:=constructorDeclaration, autoCollapse:=True, type:=BlockTypes.Member, isCollapsible:=True)) End If diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/DisabledTextTriviaStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/DisabledTextTriviaStructureProvider.vb index e7d25de5a1a..dd2b5d80805 100644 --- a/src/Features/VisualBasic/Portable/Structure/Providers/DisabledTextTriviaStructureProvider.vb +++ b/src/Features/VisualBasic/Portable/Structure/Providers/DisabledTextTriviaStructureProvider.vb @@ -17,7 +17,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure Dim startPos = nodeSpan.Start Dim endPos = startPos + trivia.ToString().TrimEnd().Length - spans.AddIfNotNull(CreateRegion( + spans.AddIfNotNull(CreateBlockSpan( span:=TextSpan.FromBounds(startPos, endPos), bannerText:=Ellipsis, autoCollapse:=True, type:=BlockTypes.PreprocessorRegion, diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/DoLoopBlockStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/DoLoopBlockStructureProvider.vb index 17485583732..3b649029dd4 100644 --- a/src/Features/VisualBasic/Portable/Structure/Providers/DoLoopBlockStructureProvider.vb +++ b/src/Features/VisualBasic/Portable/Structure/Providers/DoLoopBlockStructureProvider.vb @@ -13,7 +13,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure spans As ArrayBuilder(Of BlockSpan), options As OptionSet, cancellationToken As CancellationToken) - spans.AddIfNotNull(CreateRegionFromBlock( + spans.AddIfNotNull(CreateBlockSpanFromBlock( node, node.DoStatement, autoCollapse:=False, type:=BlockTypes.Loop, isCollapsible:=True)) End Sub diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/DocumentationCommentStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/DocumentationCommentStructureProvider.vb index 4b3d209e6f9..5e5a3d145e2 100644 --- a/src/Features/VisualBasic/Portable/Structure/Providers/DocumentationCommentStructureProvider.vb +++ b/src/Features/VisualBasic/Portable/Structure/Providers/DocumentationCommentStructureProvider.vb @@ -88,7 +88,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure Dim fullSpan = TextSpan.FromBounds(startPos, endPos) - spans.AddIfNotNull(CreateRegion( + spans.AddIfNotNull(CreateBlockSpan( fullSpan, GetBannerText(documentationComment, cancellationToken), autoCollapse:=True, type:=BlockTypes.Comment, isCollapsible:=True, isDefaultCollapsed:=False)) diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/EnumDeclarationStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/EnumDeclarationStructureProvider.vb index f835b4cec92..cdcd2c4bb7a 100644 --- a/src/Features/VisualBasic/Portable/Structure/Providers/EnumDeclarationStructureProvider.vb +++ b/src/Features/VisualBasic/Portable/Structure/Providers/EnumDeclarationStructureProvider.vb @@ -17,7 +17,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure Dim block = TryCast(enumDeclaration.Parent, EnumBlockSyntax) If Not block?.EndEnumStatement.IsMissing Then - spans.AddIfNotNull(CreateRegionFromBlock( + spans.AddIfNotNull(CreateBlockSpanFromBlock( block, bannerNode:=enumDeclaration, autoCollapse:=True, type:=BlockTypes.Type, isCollapsible:=True)) diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/EventDeclarationStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/EventDeclarationStructureProvider.vb index e9c4655d1a2..d129ed6c23c 100644 --- a/src/Features/VisualBasic/Portable/Structure/Providers/EventDeclarationStructureProvider.vb +++ b/src/Features/VisualBasic/Portable/Structure/Providers/EventDeclarationStructureProvider.vb @@ -17,7 +17,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure Dim block = TryCast(eventDeclaration.Parent, EventBlockSyntax) If Not block?.EndEventStatement.IsMissing Then - spans.AddIfNotNull(CreateRegionFromBlock( + spans.AddIfNotNull(CreateBlockSpanFromBlock( block, bannerNode:=eventDeclaration, autoCollapse:=True, type:=BlockTypes.Member, isCollapsible:=True)) diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/ForBlockStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/ForBlockStructureProvider.vb index 44e8e0b1e5b..8b05b857d9a 100644 --- a/src/Features/VisualBasic/Portable/Structure/Providers/ForBlockStructureProvider.vb +++ b/src/Features/VisualBasic/Portable/Structure/Providers/ForBlockStructureProvider.vb @@ -13,7 +13,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure spans As ArrayBuilder(Of BlockSpan), options As OptionSet, cancellationToken As CancellationToken) - spans.AddIfNotNull(CreateRegionFromBlock( + spans.AddIfNotNull(CreateBlockSpanFromBlock( node, node.ForOrForEachStatement, autoCollapse:=False, type:=BlockTypes.Loop, isCollapsible:=True)) End Sub diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/ForEachBlockStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/ForEachBlockStructureProvider.vb index 72b40b42b38..8f82347bf69 100644 --- a/src/Features/VisualBasic/Portable/Structure/Providers/ForEachBlockStructureProvider.vb +++ b/src/Features/VisualBasic/Portable/Structure/Providers/ForEachBlockStructureProvider.vb @@ -13,7 +13,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure spans As ArrayBuilder(Of BlockSpan), options As OptionSet, cancellationToken As CancellationToken) - spans.AddIfNotNull(CreateRegionFromBlock( + spans.AddIfNotNull(CreateBlockSpanFromBlock( node, node.ForOrForEachStatement, autoCollapse:=False, type:=BlockTypes.Loop, isCollapsible:=True)) End Sub diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/MetadataAsSource/MetadataRegionDirectiveStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/MetadataAsSource/MetadataRegionDirectiveStructureProvider.vb index 224ce9d4bc5..a6ba081edaf 100644 --- a/src/Features/VisualBasic/Portable/Structure/Providers/MetadataAsSource/MetadataRegionDirectiveStructureProvider.vb +++ b/src/Features/VisualBasic/Portable/Structure/Providers/MetadataAsSource/MetadataRegionDirectiveStructureProvider.vb @@ -26,7 +26,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure.MetadataAsSource cancellationToken As CancellationToken) Dim match = regionDirective.GetMatchingStartOrEndDirective(cancellationToken) If match IsNot Nothing Then - spans.AddIfNotNull(CreateRegion( + spans.AddIfNotNull(CreateBlockSpan( TextSpan.FromBounds(regionDirective.SpanStart, match.Span.End), GetBannerText(regionDirective), autoCollapse:=True, type:=BlockTypes.PreprocessorRegion, diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/MethodDeclarationStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/MethodDeclarationStructureProvider.vb index cbf5d033dc5..5efb9c54c76 100644 --- a/src/Features/VisualBasic/Portable/Structure/Providers/MethodDeclarationStructureProvider.vb +++ b/src/Features/VisualBasic/Portable/Structure/Providers/MethodDeclarationStructureProvider.vb @@ -17,7 +17,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure Dim block = TryCast(methodDeclaration.Parent, MethodBlockSyntax) If Not block?.EndBlockStatement.IsMissing Then - spans.AddIfNotNull(CreateRegionFromBlock( + spans.AddIfNotNull(CreateBlockSpanFromBlock( block, bannerNode:=methodDeclaration, autoCollapse:=True, type:=BlockTypes.Member, isCollapsible:=True)) End If diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/MultiLineIfBlockStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/MultiLineIfBlockStructureProvider.vb index db9307a30c0..e3b02ba2cc5 100644 --- a/src/Features/VisualBasic/Portable/Structure/Providers/MultiLineIfBlockStructureProvider.vb +++ b/src/Features/VisualBasic/Portable/Structure/Providers/MultiLineIfBlockStructureProvider.vb @@ -13,7 +13,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure spans As ArrayBuilder(Of BlockSpan), options As OptionSet, cancellationToken As CancellationToken) - spans.AddIfNotNull(CreateRegionFromBlock( + spans.AddIfNotNull(CreateBlockSpanFromBlock( node, node.IfStatement, autoCollapse:=False, type:=BlockTypes.Conditional, isCollapsible:=True)) End Sub diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/MultilineLambdaStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/MultilineLambdaStructureProvider.vb index 681a8b93b3a..81278cd655f 100644 --- a/src/Features/VisualBasic/Portable/Structure/Providers/MultilineLambdaStructureProvider.vb +++ b/src/Features/VisualBasic/Portable/Structure/Providers/MultilineLambdaStructureProvider.vb @@ -14,7 +14,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure options As OptionSet, cancellationToken As CancellationToken) If Not lambdaExpression.EndSubOrFunctionStatement.IsMissing Then - spans.AddIfNotNull(CreateRegionFromBlock( + spans.AddIfNotNull(CreateBlockSpanFromBlock( lambdaExpression, bannerNode:=lambdaExpression.SubOrFunctionHeader, autoCollapse:=False, type:=BlockTypes.Expression, isCollapsible:=True)) End If diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/NamespaceDeclarationStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/NamespaceDeclarationStructureProvider.vb index 3a1d54e257a..d6e1bc5b591 100644 --- a/src/Features/VisualBasic/Portable/Structure/Providers/NamespaceDeclarationStructureProvider.vb +++ b/src/Features/VisualBasic/Portable/Structure/Providers/NamespaceDeclarationStructureProvider.vb @@ -17,7 +17,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure Dim block = TryCast(namespaceDeclaration.Parent, NamespaceBlockSyntax) If Not block?.EndNamespaceStatement.IsMissing Then - spans.AddIfNotNull(CreateRegionFromBlock( + spans.AddIfNotNull(CreateBlockSpanFromBlock( block, bannerNode:=namespaceDeclaration, autoCollapse:=False, type:=BlockTypes.Namespace, isCollapsible:=True)) diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/OperatorDeclarationStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/OperatorDeclarationStructureProvider.vb index 713fd74427b..11d8de8105f 100644 --- a/src/Features/VisualBasic/Portable/Structure/Providers/OperatorDeclarationStructureProvider.vb +++ b/src/Features/VisualBasic/Portable/Structure/Providers/OperatorDeclarationStructureProvider.vb @@ -17,7 +17,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure Dim block = TryCast(operatorDeclaration.Parent, OperatorBlockSyntax) If Not block?.EndBlockStatement.IsMissing Then - spans.AddIfNotNull(CreateRegionFromBlock( + spans.AddIfNotNull(CreateBlockSpanFromBlock( block, bannerNode:=operatorDeclaration, autoCollapse:=True, type:=BlockTypes.Member, isCollapsible:=True)) End If diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/PropertyDeclarationStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/PropertyDeclarationStructureProvider.vb index a4729f97ebd..9d001779911 100644 --- a/src/Features/VisualBasic/Portable/Structure/Providers/PropertyDeclarationStructureProvider.vb +++ b/src/Features/VisualBasic/Portable/Structure/Providers/PropertyDeclarationStructureProvider.vb @@ -17,7 +17,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure Dim block = TryCast(propertyDeclaration.Parent, PropertyBlockSyntax) If Not block?.EndPropertyStatement.IsMissing Then - spans.AddIfNotNull(CreateRegionFromBlock( + spans.AddIfNotNull(CreateBlockSpanFromBlock( block, bannerNode:=propertyDeclaration, autoCollapse:=True, type:=BlockTypes.Member, isCollapsible:=True)) diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/RegionDirectiveStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/RegionDirectiveStructureProvider.vb index 9023328bf79..88fe7ece620 100644 --- a/src/Features/VisualBasic/Portable/Structure/Providers/RegionDirectiveStructureProvider.vb +++ b/src/Features/VisualBasic/Portable/Structure/Providers/RegionDirectiveStructureProvider.vb @@ -29,7 +29,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure Dim autoCollapse = options.GetOption( BlockStructureOptions.CollapseRegionsWhenCollapsingToDefinitions, LanguageNames.VisualBasic) - spans.AddIfNotNull(CreateRegion( + spans.AddIfNotNull(CreateBlockSpan( TextSpan.FromBounds(regionDirective.SpanStart, matchingDirective.Span.End), GetBannerText(regionDirective), autoCollapse:=autoCollapse, diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/SelectBlockStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/SelectBlockStructureProvider.vb index 3843db0b72e..b106f4812aa 100644 --- a/src/Features/VisualBasic/Portable/Structure/Providers/SelectBlockStructureProvider.vb +++ b/src/Features/VisualBasic/Portable/Structure/Providers/SelectBlockStructureProvider.vb @@ -13,7 +13,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure spans As ArrayBuilder(Of BlockSpan), options As OptionSet, cancellationToken As CancellationToken) - spans.AddIfNotNull(CreateRegionFromBlock( + spans.AddIfNotNull(CreateBlockSpanFromBlock( node, node.SelectStatement, autoCollapse:=False, type:=BlockTypes.Conditional, isCollapsible:=True)) End Sub diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/SyncLockBlockStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/SyncLockBlockStructureProvider.vb index 19b36d81abb..8aa6436ac2c 100644 --- a/src/Features/VisualBasic/Portable/Structure/Providers/SyncLockBlockStructureProvider.vb +++ b/src/Features/VisualBasic/Portable/Structure/Providers/SyncLockBlockStructureProvider.vb @@ -13,7 +13,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure spans As ArrayBuilder(Of BlockSpan), options As OptionSet, cancellationToken As CancellationToken) - spans.AddIfNotNull(CreateRegionFromBlock( + spans.AddIfNotNull(CreateBlockSpanFromBlock( node, node.SyncLockStatement, autoCollapse:=False, type:=BlockTypes.Statement, isCollapsible:=True)) End Sub diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/TryBlockStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/TryBlockStructureProvider.vb index 558d675e684..75644a7400d 100644 --- a/src/Features/VisualBasic/Portable/Structure/Providers/TryBlockStructureProvider.vb +++ b/src/Features/VisualBasic/Portable/Structure/Providers/TryBlockStructureProvider.vb @@ -13,7 +13,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure spans As ArrayBuilder(Of BlockSpan), options As OptionSet, cancellationToken As CancellationToken) - spans.AddIfNotNull(CreateRegionFromBlock( + spans.AddIfNotNull(CreateBlockSpanFromBlock( node, node.TryStatement, autoCollapse:=False, type:=BlockTypes.Statement, isCollapsible:=True)) End Sub diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/TypeDeclarationStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/TypeDeclarationStructureProvider.vb index c413e7e0cc8..929b5ca0dc5 100644 --- a/src/Features/VisualBasic/Portable/Structure/Providers/TypeDeclarationStructureProvider.vb +++ b/src/Features/VisualBasic/Portable/Structure/Providers/TypeDeclarationStructureProvider.vb @@ -17,7 +17,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure Dim block = TryCast(typeDeclaration.Parent, TypeBlockSyntax) If Not block?.EndBlockStatement.IsMissing Then - spans.AddIfNotNull(CreateRegionFromBlock( + spans.AddIfNotNull(CreateBlockSpanFromBlock( block, bannerNode:=typeDeclaration, autoCollapse:=False, type:=BlockTypes.Type, isCollapsible:=True)) diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/UsingBlockStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/UsingBlockStructureProvider.vb index 5b51d287043..d8890b4820a 100644 --- a/src/Features/VisualBasic/Portable/Structure/Providers/UsingBlockStructureProvider.vb +++ b/src/Features/VisualBasic/Portable/Structure/Providers/UsingBlockStructureProvider.vb @@ -13,7 +13,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure spans As ArrayBuilder(Of BlockSpan), options As OptionSet, cancellationToken As CancellationToken) - spans.AddIfNotNull(CreateRegionFromBlock( + spans.AddIfNotNull(CreateBlockSpanFromBlock( node, node.UsingStatement, autoCollapse:=False, type:=BlockTypes.Statement, isCollapsible:=True)) End Sub diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/WhileBlockStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/WhileBlockStructureProvider.vb index e7360631498..f61f2e33dc7 100644 --- a/src/Features/VisualBasic/Portable/Structure/Providers/WhileBlockStructureProvider.vb +++ b/src/Features/VisualBasic/Portable/Structure/Providers/WhileBlockStructureProvider.vb @@ -13,7 +13,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure spans As ArrayBuilder(Of BlockSpan), options As OptionSet, cancellationToken As CancellationToken) - spans.AddIfNotNull(CreateRegionFromBlock( + spans.AddIfNotNull(CreateBlockSpanFromBlock( node, node.WhileStatement, autoCollapse:=False, type:=BlockTypes.Loop, isCollapsible:=True)) End Sub diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/WithBlockStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/WithBlockStructureProvider.vb index 49235a2a7a7..c89fc1709fb 100644 --- a/src/Features/VisualBasic/Portable/Structure/Providers/WithBlockStructureProvider.vb +++ b/src/Features/VisualBasic/Portable/Structure/Providers/WithBlockStructureProvider.vb @@ -13,7 +13,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure spans As ArrayBuilder(Of BlockSpan), options As OptionSet, cancellationToken As CancellationToken) - spans.AddIfNotNull(CreateRegionFromBlock( + spans.AddIfNotNull(CreateBlockSpanFromBlock( node, node.WithStatement, autoCollapse:=False, type:=BlockTypes.Statement, isCollapsible:=True)) End Sub diff --git a/src/Features/VisualBasic/Portable/Structure/Providers/XmlExpressionStructureProvider.vb b/src/Features/VisualBasic/Portable/Structure/Providers/XmlExpressionStructureProvider.vb index ef100358bf2..8cc918da079 100644 --- a/src/Features/VisualBasic/Portable/Structure/Providers/XmlExpressionStructureProvider.vb +++ b/src/Features/VisualBasic/Portable/Structure/Providers/XmlExpressionStructureProvider.vb @@ -24,7 +24,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure Dim lineText = line.ToString().Substring(span.Start - line.Start) Dim bannerText = lineText & SpaceEllipsis - spans.AddIfNotNull(CreateRegion( + spans.AddIfNotNull(CreateBlockSpan( span, bannerText, autoCollapse:=False, type:=BlockTypes.Expression, isCollapsible:=True, isDefaultCollapsed:=False)) diff --git a/src/Features/VisualBasic/Portable/Structure/VisualBasicStructureHelpers.vb b/src/Features/VisualBasic/Portable/Structure/VisualBasicStructureHelpers.vb index ea07f2cb2e9..a5677e581a9 100644 --- a/src/Features/VisualBasic/Portable/Structure/VisualBasicStructureHelpers.vb +++ b/src/Features/VisualBasic/Portable/Structure/VisualBasicStructureHelpers.vb @@ -20,7 +20,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure Private Function CreateCommentsRegion(startComment As SyntaxTrivia, endComment As SyntaxTrivia) As BlockSpan? - Return CreateRegion( + Return CreateBlockSpan( TextSpan.FromBounds(startComment.SpanStart, endComment.Span.End), GetCommentBannerText(startComment), autoCollapse:=True, @@ -76,7 +76,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure CollectCommentsRegions(triviaList, spans) End Sub - Friend Function CreateRegion( + Friend Function CreateBlockSpan( span As TextSpan, bannerText As String, autoCollapse As Boolean, @@ -92,28 +92,28 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure isCollapsible:=isCollapsible) End Function - Friend Function CreateRegionFromBlock( + Friend Function CreateBlockSpanFromBlock( blockNode As SyntaxNode, bannerText As String, autoCollapse As Boolean, type As String, isCollapsible As Boolean) As BlockSpan? - Return CreateRegion(blockNode.Span, bannerText, autoCollapse, + Return CreateBlockSpan(blockNode.Span, bannerText, autoCollapse, type, isCollapsible, isDefaultCollapsed:=False) End Function - Friend Function CreateRegionFromBlock( + Friend Function CreateBlockSpanFromBlock( blockNode As SyntaxNode, bannerNode As SyntaxNode, autoCollapse As Boolean, type As String, isCollapsible As Boolean) As BlockSpan? - Return CreateRegion( + Return CreateBlockSpan( blockNode.Span, GetNodeBannerText(bannerNode), autoCollapse, type, isCollapsible, isDefaultCollapsed:=False) End Function - Friend Function CreateRegion(syntaxList As IEnumerable(Of SyntaxNode), + Friend Function CreateBlockSpan(syntaxList As IEnumerable(Of SyntaxNode), bannerText As String, autoCollapse As Boolean, type As String, @@ -124,7 +124,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Structure Dim startPos = syntaxList.First().SpanStart Dim endPos = syntaxList.Last().Span.End - Return CreateRegion( + Return CreateBlockSpan( TextSpan.FromBounds(startPos, endPos), bannerText, autoCollapse, type, isCollapsible, isDefaultCollapsed:=False) End Function -- GitLab