traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure symbols are written in a predictable order in conflict messages

Browse source
This commit is contained in:
Max Brunsfeld 2019-02-08 09:39:00 -08:00
parent 1d1674811c
commit 51a9f14f7d
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cli/src/generate/build_tables/build_parse_table.rs
View file

@ -520,11 +520,12 @@ impl<'a> ParseTableBuilder<'a> {
let mut resolution_count = 0;
write!(&mut msg, "\nPossible resolutions:\n\n").unwrap();
let shift_items = conflicting_items
let mut shift_items = conflicting_items
.iter()
.filter(|i| !i.is_done())
.cloned()
.collect::<Vec<_>>();
shift_items.sort_unstable();
if actual_conflict.len() > 1 {
if shift_items.len() > 0 {
resolution_count += 1;