385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
|
# crossing a separator
proc diffWithSeparator {RE line1 line2 opts} {
set ixs1 [regexp -all -inline -indices -- $RE $line1]
set ixs2 [regexp -all -inline -indices -- $RE $line2]
# Fake a separator after end of line, makes the loop below simpler
lappend ixs1 [list [string length $line1] [string length $line1]]
lappend ixs2 [list [string length $line2] [string length $line2]]
set res {}
set s1 0
set s2 0
foreach ix1 $ixs1 ix2 $ixs2 {
# Handle if one index list is shorter
if {$ix1 eq ""} {
set str1 ""
set sep1 ""
|
>
>
|
|
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
|
# crossing a separator
proc diffWithSeparator {RE line1 line2 opts} {
set ixs1 [regexp -all -inline -indices -- $RE $line1]
set ixs2 [regexp -all -inline -indices -- $RE $line2]
# Fake a separator after end of line, makes the loop below simpler
lappend ixs1 [list [string length $line1] [string length $line1]]
lappend ixs2 [list [string length $line2] [string length $line2]]
# Res is at all times starting and ending with an equal pair
# i.e. same format as the result from DiffStrings
set res [list {} {}]
set s1 0
set s2 0
foreach ix1 $ixs1 ix2 $ixs2 {
# Handle if one index list is shorter
if {$ix1 eq ""} {
set str1 ""
set sep1 ""
|
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
|
} else {
lassign $ix2 e2 ns2
incr e2 -1
set str2 [string range $line2 $s2 $e2]
set sep2 [string range $line2 {*}$ix2]
}
if {$str1 eq $str2} {
# Could be better at merging equalites...
lappend res "" "" $str1$sep1 $str2$sep2
} else {
set r [DiffUtil::diffStrings {*}$opts $str1 $str2]
# Could be better at merging equalites...
lappend res "" "" {*}$r "" "" $sep1 $sep2
}
set s1 [expr {$ns1 + 1}]
set s2 [expr {$ns2 + 1}]
}
# Remove the extra pair added in the loop
set res [lrange $res 2 end]
#puts "RES $res"
|
|
>
>
|
>
>
>
>
|
>
>
>
>
>
>
>
>
>
>
|
<
<
|
|
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
|
} else {
lassign $ix2 e2 ns2
incr e2 -1
set str2 [string range $line2 $s2 $e2]
set sep2 [string range $line2 {*}$ix2]
}
if {$str1 eq $str2} {
# Merge this equality with end of res
set resEq1 [lindex $res end-1]
set resEq2 [lindex $res end]
lset res end-1 $resEq1$str1$sep1
lset res end $resEq2$str2$sep2
} else {
set r [DiffUtil::diffStrings {*}$opts $str1 $str2]
# Starting equal pair
set rEq1a [lindex $r 0]
set rEq2a [lindex $r 1]
# Ending equal pair
set rEq1b [lindex $r end-1]
set rEq2b [lindex $r end]
# Mid part
set r [lrange $r 2 end-2]
# Merge starting equalities with end of res
set resEq1 [lindex $res end-1]
set resEq2 [lindex $res end]
lset res end-1 $resEq1$rEq1a
lset res end $resEq2$rEq2a
# Merge equality at end with separator
lappend res {*}$r $rEq1b$sep1 $rEq2b$sep2
}
set s1 [expr {$ns1 + 1}]
set s2 [expr {$ns2 + 1}]
}
#puts "RES '$res'"
return $res
}
# Insert one line in each text widget.
# Mark them as changed, and optionally parse them.
proc insertMatchingLines {top line1 line2} {
global doingLine1 doingLine2
|