2015-11-03 01:15:27 +03:00
|
|
|
private func unified(patch: Patch<Term>, before: String, after: String) -> String {
|
2015-11-02 22:21:34 +03:00
|
|
|
return (patch.state.before.map { "{-\($0)-}" } ?? "")
|
|
|
|
+ (patch.state.after.map { "{+\($0)+}" } ?? "")
|
|
|
|
}
|
|
|
|
|
2015-11-03 00:07:34 +03:00
|
|
|
private func range(patch: Patch<Term>) -> Range<Int>? {
|
2015-11-03 00:07:57 +03:00
|
|
|
return patch.state.after?.extract.range
|
2015-11-03 00:02:23 +03:00
|
|
|
}
|
|
|
|
|
2015-11-03 00:14:03 +03:00
|
|
|
private func unified(range: Range<Int>, children: [(String, Range<Int>?)], source: String) -> String {
|
|
|
|
var previous = range.startIndex
|
|
|
|
var out: String = ""
|
|
|
|
for (string, range) in children {
|
|
|
|
if let range = range {
|
|
|
|
out += String(source.utf16[previous..<range.startIndex])
|
|
|
|
previous = range.endIndex
|
|
|
|
}
|
|
|
|
out += string
|
|
|
|
}
|
|
|
|
return out + String(source.utf16[previous..<range.endIndex])
|
|
|
|
}
|
|
|
|
|
2015-11-02 22:19:10 +03:00
|
|
|
func unified(diff: Diff, before: String, after: String) -> String {
|
2015-11-03 01:15:27 +03:00
|
|
|
return diff.map { (unified($0, before: before, after: after), range($0)) }.cata { info, syntax in
|
2015-11-03 00:02:58 +03:00
|
|
|
switch syntax {
|
|
|
|
case .Leaf:
|
|
|
|
return (String(after.utf16[info.1.range]), info.1.range)
|
|
|
|
case let .Indexed(i):
|
2015-11-03 00:15:34 +03:00
|
|
|
return (unified(info.1.range, children: i, source: after), info.1.range)
|
2015-11-03 00:02:58 +03:00
|
|
|
case let .Fixed(f):
|
2015-11-03 00:15:13 +03:00
|
|
|
return (unified(info.1.range, children: f, source: after), info.1.range)
|
2015-11-03 00:02:58 +03:00
|
|
|
case let .Keyed(k):
|
2015-11-03 01:15:39 +03:00
|
|
|
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)
|
2015-11-03 00:02:58 +03:00
|
|
|
}
|
|
|
|
}.0
|
2015-11-02 22:04:48 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
import Doubt
|