github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-29 01:42:43 +03:00
Code Issues Projects Releases Wiki Activity

Sort keyed children using the ordering.

Browse Source
This commit is contained in:
Rob Rix 2015-11-02 17:29:43 -05:00
parent a740dcceee
commit 8c2e1f6f50
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
prototype/doubt-difftool/Unified.swift
View File

@ -8,12 +8,7 @@ private func unified(term: Term, source: String) -> String {
case let .Fixed(f):
return (unified(info.range, children: f, source: source), info.range)
case let .Keyed(k):
return (unified(info.range, children: k.values.sort { a, b in
if let a = a.1, b = b.1 {
return a.startIndex < b.startIndex
}
return false
}, source: source), info.range)
return (unified(info.range, children: k.values.sort(isOrderedBefore), source: source), info.range)
}
}.0
}
@ -57,12 +52,7 @@ func unified(diff: Diff, before: String, after: String) -> String {
case let .Fixed(f):
return (unified(info.1.range, children: f, source: after), info.1.range)
case let .Keyed(k):
return (unified(info.1.range, children: k.values.sort { a, b in
if let a = a.1, b = b.1 {
return a.startIndex < b.startIndex
}
return false
}, source: after), info.1.range)
return (unified(info.1.range, children: k.values.sort(isOrderedBefore), source: after), info.1.range)
}
}.0
}