Skip to content

make-visible: use port-name-matches? for symbols #708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rfindler merged 1 commit into from
Jan 5, 2025
Merged

make-visible: use port-name-matches? for symbols #708

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 22 additions & 24 deletions drracket/drracket/private/unit.rkt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3419,33 +3419,31 @@
(path->string (normal-case-path (normalize-path p2))))))

(define/override (make-visible filename #:start-pos [start-pos #f] #:end-pos [end-pos start-pos])
(let ([tab (find-matching-tab filename)])
(when tab
(change-to-tab tab)
(when (and start-pos end-pos)
(define (set-the-position ed)
(when (send ed port-name-matches? filename)
(send (send ed get-canvas) focus)
(send ed set-caret-owner #f)
(send ed set-position start-pos end-pos)))
(set-the-position (send tab get-defs))
(set-the-position (send tab get-ints))))))
(match (find-matching-tab/which-editor filename)
[(cons tab ed)
(change-to-tab tab)
(when (and start-pos end-pos)
(send (send ed get-canvas) focus)
(send ed set-caret-owner #f)
(send ed set-position start-pos end-pos))]
[#f (void)]))

(define/public (find-matching-tab filename)
(define fn-path (if (string? filename)
(string->path filename)
filename))
(for/or ([tab (in-list tabs)])
(define tab-filename (send (send tab get-defs) get-filename))
(and tab-filename
(pathname-equal? fn-path tab-filename)
tab)))

(match (find-matching-tab/which-editor filename)
[(cons tab ed) tab]
[#f #f]))

(define/override (editing-this-file? filename)
(ormap (λ (tab)
(or (send (send tab get-defs) port-name-matches? filename)
(send (send tab get-ints) port-name-matches? filename)))
tabs))
(and (find-matching-tab/which-editor filename) #t))

(define/private (find-matching-tab/which-editor path-string)
(define filename (if (string? path-string) (string->path path-string) path-string))
(for/or ([tab (in-list tabs)])
(define (try ed)
(and (send ed port-name-matches? filename)
(cons tab ed)))
(or (try (send tab get-defs))
(try (send tab get-ints)))))

(define/override (get-all-open-files)
(filter
Expand Down
Loading