Skip to content
This repository has been archived by the owner on Mar 8, 2020. It is now read-only.

Do the duplicate removal on all node roles, not only the new ones. #202

Merged
merged 2 commits into from
Nov 7, 2017
Merged

Do the duplicate removal on all node roles, not only the new ones. #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c3393b
Do the duplicate removal on all roles, not only the new ones.
Nov 7, 2017
d424c2d
Improve duplicates role test.
Nov 7, 2017
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
7 changes: 7 additions & 0 deletions uast/ann/ann.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,12 @@ func AddRoles(roles ...uast.Role) Action {
func appendUniqueRoles(n *uast.Node, roles ...uast.Role) {
addedRoles := make(map[string]bool)

for _, role := range n.Roles {
if _, ok := addedRoles[role.String()]; !ok {
addedRoles[role.String()] = true
}
}

for _, role := range roles {
if _, ok := addedRoles[role.String()]; !ok {
n.Roles = append(n.Roles, role)
Expand Down Expand Up @@ -480,3 +486,4 @@ func matchSuffixPredicates(path uast.Path, preds []Predicate) bool {

return true
}

2 changes: 2 additions & 0 deletions uast/ann/ann_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,8 @@ func TestAddDuplicatedRoles(t *testing.T) {
err := a.Do(input)
require.NoError(err)
require.Equal(expected, input)
err = a.Do(input)
require.Equal(expected, input)
}

func TestRuleOnApply(t *testing.T) {
Expand Down