提交 51903bd3 编写于 作者: C CyrusNajmabadi 提交者: GitHub

Merge pull request #13151 from CyrusNajmabadi/listDecoupling

Decouple SyntaxList from SyntaxListBuilder.
......@@ -303,22 +303,24 @@ internal SyntaxTriviaList LexSyntaxLeadingTrivia()
{
_leadingTriviaCache.Clear();
this.LexSyntaxTrivia(afterFirstToken: TextWindow.Position > 0, isTrailing: false, triviaList: ref _leadingTriviaCache);
return new SyntaxTriviaList(default(Microsoft.CodeAnalysis.SyntaxToken), SyntaxList.List(_leadingTriviaCache), 0, 0);
return new SyntaxTriviaList(default(Microsoft.CodeAnalysis.SyntaxToken),
_leadingTriviaCache.ToListNode(), position: 0, index: 0);
}
internal SyntaxTriviaList LexSyntaxTrailingTrivia()
{
_trailingTriviaCache.Clear();
this.LexSyntaxTrivia(afterFirstToken: true, isTrailing: true, triviaList: ref _trailingTriviaCache);
return new SyntaxTriviaList(default(Microsoft.CodeAnalysis.SyntaxToken), SyntaxList.List(_trailingTriviaCache), 0, 0);
return new SyntaxTriviaList(default(Microsoft.CodeAnalysis.SyntaxToken),
_trailingTriviaCache.ToListNode(), position: 0, index: 0);
}
private SyntaxToken Create(ref TokenInfo info, SyntaxListBuilder leading, SyntaxListBuilder trailing, SyntaxDiagnosticInfo[] errors)
{
Debug.Assert(info.Kind != SyntaxKind.IdentifierToken || info.StringValue != null);
var leadingNode = SyntaxList.List(leading);
var trailingNode = SyntaxList.List(trailing);
var leadingNode = leading?.ToListNode();
var trailingNode = trailing?.ToListNode();
SyntaxToken token;
if (info.RequiresTextForXmlEntity)
......
......@@ -96,16 +96,6 @@ internal static SyntaxList List(ArrayElement<CSharpSyntaxNode>[] children)
}
}
internal static CSharpSyntaxNode List(SyntaxListBuilder builder)
{
if (builder != null)
{
return builder.ToListNode();
}
return null;
}
internal abstract void CopyTo(ArrayElement<CSharpSyntaxNode>[] array, int offset);
internal static CSharpSyntaxNode Concat(CSharpSyntaxNode left, CSharpSyntaxNode right)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册