提交 fe08f95f 编写于 作者: C CyrusNajmabadi

Rename methods.

上级 82b71608
......@@ -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
......
......@@ -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)
......
......@@ -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
......
......@@ -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,
......
......@@ -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
......
......@@ -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))
......
......@@ -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))
......
......@@ -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))
......
......@@ -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
......
......@@ -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
......
......@@ -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,
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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))
......
......@@ -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
......
......@@ -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))
......
......@@ -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,
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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))
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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))
......
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册