Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make GreenNode.CreateList static #48536

Merged
merged 4 commits into from
Oct 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Compilers/Core/Portable/Syntax/GreenNode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -904,7 +904,7 @@ private static bool EquivalentToInternal(GreenNode node1, GreenNode node2)
public abstract SyntaxToken CreateSeparator<TNode>(SyntaxNode element) where TNode : SyntaxNode;
public abstract bool IsTriviaWithEndOfLine(); // trivia node has end of line

public virtual GreenNode? CreateList(IEnumerable<GreenNode>? nodes, bool alwaysCreateListNode = false)
public static GreenNode? CreateList(IEnumerable<GreenNode>? nodes, bool alwaysCreateListNode = false)
{
if (nodes == null)
{
Expand Down
16 changes: 2 additions & 14 deletions src/Compilers/Core/Portable/Syntax/SyntaxList`1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ public SyntaxList<TNode> InsertRange(int index, IEnumerable<TNode> nodes)
}
else
{
return CreateList(list[0].Green, list);
return CreateList(list);
}
}

Expand Down Expand Up @@ -309,25 +309,13 @@ public SyntaxList<TNode> ReplaceRange(TNode nodeInList, IEnumerable<TNode> newNo
}

private static SyntaxList<TNode> CreateList(List<TNode> items)
{
if (items.Count == 0)
{
return default(SyntaxList<TNode>);
}
else
{
return CreateList(items[0].Green, items);
}
}

private static SyntaxList<TNode> CreateList(GreenNode creator, List<TNode> items)
{
if (items.Count == 0)
{
return default(SyntaxList<TNode>);
}

var newGreen = creator.CreateList(items.Select(n => n.Green));
var newGreen = GreenNode.CreateList(items.Select(n => n.Green));
HurricanKai marked this conversation as resolved.
Show resolved Hide resolved
return new SyntaxList<TNode>(newGreen!.CreateRed());
}

Expand Down
13 changes: 6 additions & 7 deletions src/Compilers/Core/Portable/Syntax/SyntaxNodeOrTokenList.cs
Original file line number Diff line number Diff line change
Expand Up @@ -306,20 +306,20 @@ public SyntaxNodeOrTokenList InsertRange(int index, IEnumerable<SyntaxNodeOrToke

var nodes = this.ToList();
nodes.InsertRange(index, nodesAndTokens);
return CreateList(nodes[0].UnderlyingNode!, nodes);
return CreateList(nodes);
}

private static SyntaxNodeOrTokenList CreateList(GreenNode creator, List<SyntaxNodeOrToken> items)
private static SyntaxNodeOrTokenList CreateList(List<SyntaxNodeOrToken> items)
{
if (items.Count == 0)
{
return default(SyntaxNodeOrTokenList);
}

var newGreen = creator.CreateList(items.Select(n => n.UnderlyingNode!))!;
var newGreen = GreenNode.CreateList(items.Select(n => n.UnderlyingNode!))!;
if (newGreen.IsToken)
{
newGreen = creator.CreateList(new[] { newGreen }, alwaysCreateListNode: true)!;
newGreen = GreenNode.CreateList(new[] { newGreen }, alwaysCreateListNode: true)!;
}

return new SyntaxNodeOrTokenList(newGreen.CreateRed(), 0);
Expand All @@ -336,10 +336,9 @@ public SyntaxNodeOrTokenList RemoveAt(int index)
throw new ArgumentOutOfRangeException(nameof(index));
}

var node = this[index];
var nodes = this.ToList();
nodes.RemoveAt(index);
return CreateList(node.UnderlyingNode!, nodes);
return CreateList(nodes);
}

/// <summary>
Expand Down Expand Up @@ -385,7 +384,7 @@ public SyntaxNodeOrTokenList ReplaceRange(SyntaxNodeOrToken nodeOrTokenInList, I
var nodes = this.ToList();
nodes.RemoveAt(index);
nodes.InsertRange(index, newNodesAndTokens);
return CreateList(nodeOrTokenInList.UnderlyingNode!, nodes);
return CreateList(nodes);
}

throw new ArgumentOutOfRangeException(nameof(nodeOrTokenInList));
Expand Down
4 changes: 2 additions & 2 deletions src/Compilers/Core/Portable/Syntax/SyntaxToken.cs
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ public SyntaxToken WithLeadingTrivia(IEnumerable<SyntaxTrivia>? trivia)
var greenList = trivia?.Select(t => t.RequiredUnderlyingNode);

return Node != null
? new SyntaxToken(null, Node.WithLeadingTrivia(Node.CreateList(greenList)), position: 0, index: 0)
? new SyntaxToken(null, Node.WithLeadingTrivia(GreenNode.CreateList(greenList)), position: 0, index: 0)
: default(SyntaxToken);
}

Expand Down Expand Up @@ -508,7 +508,7 @@ public SyntaxToken WithTrailingTrivia(IEnumerable<SyntaxTrivia>? trivia)
var greenList = trivia?.Select(t => t.RequiredUnderlyingNode);

return Node != null
? new SyntaxToken(null, Node.WithTrailingTrivia(Node.CreateList(greenList)), position: 0, index: 0)
? new SyntaxToken(null, Node.WithTrailingTrivia(GreenNode.CreateList(greenList)), position: 0, index: 0)
: default(SyntaxToken);
}

Expand Down
9 changes: 3 additions & 6 deletions src/Compilers/Core/Portable/Syntax/SyntaxTokenList.cs
Original file line number Diff line number Diff line change
Expand Up @@ -361,8 +361,7 @@ public SyntaxTokenList InsertRange(int index, IEnumerable<SyntaxToken> tokens)
return this;
}

Debug.Assert(list[0].Node is object);
return new SyntaxTokenList(null, list[0].Node!.CreateList(list.Select(n => n.RequiredNode)), 0, 0);
return new SyntaxTokenList(null, GreenNode.CreateList(list.Select(n => n.RequiredNode)), 0, 0);
}

/// <summary>
Expand All @@ -378,8 +377,7 @@ public SyntaxTokenList RemoveAt(int index)

var list = this.ToList();
list.RemoveAt(index);
Debug.Assert(Node is object);
return new SyntaxTokenList(null, Node.CreateList(list.Select(n => n.Node!)), 0, 0);
return new SyntaxTokenList(null, GreenNode.CreateList(list.Select(n => n.Node!)), 0, 0);
}

/// <summary>
Expand Down Expand Up @@ -425,8 +423,7 @@ public SyntaxTokenList ReplaceRange(SyntaxToken tokenInList, IEnumerable<SyntaxT
var list = this.ToList();
list.RemoveAt(index);
list.InsertRange(index, newTokens);
Debug.Assert(Node is object);
return new SyntaxTokenList(null, Node.CreateList(list.Select(n => n.Node!)), 0, 0);
return new SyntaxTokenList(null, GreenNode.CreateList(list.Select(n => n.Node!)), 0, 0);
}

throw new ArgumentOutOfRangeException(nameof(tokenInList));
Expand Down
4 changes: 2 additions & 2 deletions src/Compilers/Core/Portable/Syntax/SyntaxTriviaList.cs
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ public SyntaxTriviaList RemoveAt(int index)

var list = this.ToList();
list.RemoveAt(index);
return new SyntaxTriviaList(default(SyntaxToken), Node!.CreateList(list.Select(n => n.RequiredUnderlyingNode)), 0, 0);
return new SyntaxTriviaList(default(SyntaxToken), GreenNode.CreateList(list.Select(n => n.RequiredUnderlyingNode)), 0, 0);
}

/// <summary>
Expand Down Expand Up @@ -397,7 +397,7 @@ public SyntaxTriviaList ReplaceRange(SyntaxTrivia triviaInList, IEnumerable<Synt
var list = this.ToList();
list.RemoveAt(index);
list.InsertRange(index, newTrivia);
return new SyntaxTriviaList(default(SyntaxToken), Node!.CreateList(list.Select(n => n.RequiredUnderlyingNode)), 0, 0);
return new SyntaxTriviaList(default(SyntaxToken), GreenNode.CreateList(list.Select(n => n.RequiredUnderlyingNode)), 0, 0);
}

throw new ArgumentOutOfRangeException(nameof(triviaInList));
Expand Down