suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

In the multi-file search window, only re-load the file

Browse Source 
in the bottom window when it really is a different file
(ie, using a same-file predicate that involves opening
the files and comparing the ports)

closes PR 12635 (hopefully -- if not, then we can reopen)
This commit is contained in:
Robby Findler 2012-06-03 09:19:35 -05:00
parent 1801efe66a
commit b5258e0e2b
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
collects/drracket/private/multi-file-search.rkt
View File

@ -240,7 +240,8 @@
(set-position new-line-position new-line-position)
(send zoom-text begin-edit-sequence)
(send zoom-text lock #f)
(send zoom-text load-file/gui-error full-filename)
(unless (really-same-file? full-filename (send zoom-text get-filename))
(send zoom-text load-file/gui-error full-filename))
(send zoom-text set-position (send zoom-text paragraph-start-position line-number))
(let ([start (+ (send zoom-text paragraph-start-position line-number)
col-number)])
@ -299,6 +300,20 @@
(set-styles-sticky #f)
(insert (string-constant mfs-searching...))))
(define (really-same-file? fn1 fn2)
(define p1 (with-handlers ((exn:fail? (λ (x) #f))) (open-input-file fn1)))
(define p2 (with-handlers ((exn:fail? (λ (x) #f))) (open-input-file fn2)))
(cond
[(and p1 p2)
(begin0
(= (port-file-identity p1) (port-file-identity p2))
(close-input-port p1)
(close-input-port p2))]
[else
(when p1 (close-input-port p1))
(when p2 (close-input-port p2))
#f]))
;; collaborates with search-size-frame%
(define searching-canvas%
(class canvas:basic%