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

Check Syntax now uses interval-maps

Browse Source
This commit is contained in:
Ryan Culpepper 2010-10-20 00:14:29 -06:00
parent b406e74a8e
commit ff7fd55d86
1 changed files with 110 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

190
collects/drracket/private/syncheck/gui.rkt
View File

@ -24,6 +24,8 @@ If the namespace does not, they are colored the unbound color.
racket/list racket/list
racket/promise racket/promise
racket/pretty racket/pretty
racket/dict
data/interval-map
drracket/tool drracket/tool
syntax/toplevel syntax/toplevel
syntax/boundmap syntax/boundmap
@ -158,7 +160,7 @@ If the namespace does not, they are colored the unbound color.
(inner (void) end-metadata-changes)) (inner (void) end-metadata-changes))
(super-new))) (super-new)))
#; #|
(define extra (define extra
(mixin (cs-clearing<%> drracket:unit:definitions-text<%>) () (mixin (cs-clearing<%> drracket:unit:definitions-text<%>) ()
(inherit set-do-cleanup) (inherit set-do-cleanup)
@ -169,6 +171,7 @@ If the namespace does not, they are colored the unbound color.
(set-do-cleanup #t) (set-do-cleanup #t)
(inner (void) end-metadata-changes)) (inner (void) end-metadata-changes))
(super-new))) (super-new)))
|#
(define basic (define basic
(mixin ((class->interface text%)) (cs-clearing<%>) (mixin ((class->interface text%)) (cs-clearing<%>)
@ -221,20 +224,18 @@ If the namespace does not, they are colored the unbound color.
highlight-range unhighlight-range highlight-range unhighlight-range
paragraph-end-position first-line-currently-drawn-specially?) paragraph-end-position first-line-currently-drawn-specially?)
;; arrow-records : (U #f hash[text% => arrow-record])
;; arrow-record = interval-map[(listof arrow-entry)]
;; arrow-entry is one of
;; - (cons (U #f sym) (menu -> void))
;; - def-link
;; - tail-link
;; - arrow
;; - string
(define (get-arrow-record table text)
(hash-ref! table text (lambda () (make-interval-map))))
(define arrow-records #f)
;; arrow-vectors :
;; (union
;; #f
;; (hash-table
;; (text%
;; . -o> .
;; (vector (listof (union (cons (union #f sym) (menu -> void))
;; def-link
;; tail-link
;; arrow
;; string))))))
(define arrow-vectors #f)
;; cleanup-texts : (or/c #f (listof text)) ;; cleanup-texts : (or/c #f (listof text))
(define cleanup-texts #f) (define cleanup-texts #f)
@ -380,7 +381,7 @@ If the namespace does not, they are colored the unbound color.
;; syncheck:init-arrows : -> void ;; syncheck:init-arrows : -> void
(define/public (syncheck:init-arrows) (define/public (syncheck:init-arrows)
(set! tacked-hash-table (make-hasheq)) (set! tacked-hash-table (make-hasheq))
(set! arrow-vectors (make-hasheq)) (set! arrow-records (make-hasheq))
(set! bindings-table (make-hash)) (set! bindings-table (make-hash))
(set! cleanup-texts '()) (set! cleanup-texts '())
(set! style-mapping (make-hash)) (set! style-mapping (make-hash))
@ -389,11 +390,11 @@ If the namespace does not, they are colored the unbound color.
(send f open-status-line 'drracket:check-syntax:mouse-over)))) (send f open-status-line 'drracket:check-syntax:mouse-over))))
(define/public (syncheck:arrows-visible?) (define/public (syncheck:arrows-visible?)
(or arrow-vectors cursor-location cursor-text)) (or arrow-records cursor-location cursor-text))
;; syncheck:clear-arrows : -> void ;; syncheck:clear-arrows : -> void
(define/public (syncheck:clear-arrows) (define/public (syncheck:clear-arrows)
(when (or arrow-vectors cursor-location cursor-text) (when (or arrow-records cursor-location cursor-text)
(let ([any-tacked? #f]) (let ([any-tacked? #f])
(when tacked-hash-table (when tacked-hash-table
(let/ec k (let/ec k
@ -403,7 +404,7 @@ If the namespace does not, they are colored the unbound color.
(set! any-tacked? #t) (set! any-tacked? #t)
(k (void)))))) (k (void))))))
(set! tacked-hash-table #f) (set! tacked-hash-table #f)
(set! arrow-vectors #f) (set! arrow-records #f)
(set! cursor-location #f) (set! cursor-location #f)
(set! cursor-text #f) (set! cursor-text #f)
(set! cursor-eles #f) (set! cursor-eles #f)
@ -439,12 +440,12 @@ If the namespace does not, they are colored the unbound color.
[else #f])) [else #f]))
(define/public (syncheck:add-menu text start-pos end-pos key make-menu) (define/public (syncheck:add-menu text start-pos end-pos key make-menu)
(when arrow-vectors (when arrow-records
(when (and (<= 0 start-pos end-pos (last-position))) (when (and (<= 0 start-pos end-pos (last-position)))
(add-to-range/key text start-pos end-pos make-menu key #t)))) (add-to-range/key text start-pos end-pos make-menu key #t))))
(define/public (syncheck:add-background-color text color start fin key) (define/public (syncheck:add-background-color text color start fin key)
(when arrow-vectors (when arrow-records
(when (is-a? text text:basic<%>) (when (is-a? text text:basic<%>)
(add-to-range/key text start fin (make-colored-region color text start fin) key #f)))) (add-to-range/key text start fin (make-colored-region color text start fin) key #f))))
@ -453,7 +454,7 @@ If the namespace does not, they are colored the unbound color.
(define/public (syncheck:add-arrow start-text start-pos-left start-pos-right (define/public (syncheck:add-arrow start-text start-pos-left start-pos-right
end-text end-pos-left end-pos-right end-text end-pos-left end-pos-right
actual? level) actual? level)
(when arrow-vectors (when arrow-records
(let* ([arrow (make-var-arrow #f #f #f #f (let* ([arrow (make-var-arrow #f #f #f #f
start-text start-pos-left start-pos-right start-text start-pos-left start-pos-right
end-text end-pos-left end-pos-right end-text end-pos-left end-pos-right
@ -466,19 +467,19 @@ If the namespace does not, they are colored the unbound color.
;; syncheck:add-tail-arrow : text number text number -> void ;; syncheck:add-tail-arrow : text number text number -> void
(define/public (syncheck:add-tail-arrow from-text from-pos to-text to-pos) (define/public (syncheck:add-tail-arrow from-text from-pos to-text to-pos)
(when arrow-vectors (when arrow-records
(let ([tail-arrow (make-tail-arrow #f #f #f #f to-text to-pos from-text from-pos)]) (let ([tail-arrow (make-tail-arrow #f #f #f #f to-text to-pos from-text from-pos)])
(add-to-range/key from-text from-pos (+ from-pos 1) tail-arrow #f #f) (add-to-range/key from-text from-pos (+ from-pos 1) tail-arrow #f #f)
(add-to-range/key to-text to-pos (+ to-pos 1) tail-arrow #f #f)))) (add-to-range/key to-text to-pos (+ to-pos 1) tail-arrow #f #f))))
;; syncheck:add-jump-to-definition : text start end id filename -> void ;; syncheck:add-jump-to-definition : text start end id filename -> void
(define/public (syncheck:add-jump-to-definition text start end id filename) (define/public (syncheck:add-jump-to-definition text start end id filename)
(when arrow-vectors (when arrow-records
(add-to-range/key text start end (make-def-link id filename) #f #f))) (add-to-range/key text start end (make-def-link id filename) #f #f)))
;; syncheck:add-mouse-over-status : text pos-left pos-right string -> void ;; syncheck:add-mouse-over-status : text pos-left pos-right string -> void
(define/public (syncheck:add-mouse-over-status text pos-left pos-right str) (define/public (syncheck:add-mouse-over-status text pos-left pos-right str)
(when arrow-vectors (when arrow-records
(add-to-range/key text pos-left pos-right str #f #f))) (add-to-range/key text pos-left pos-right str #f #f)))
;; add-to-range/key : text number number any any boolean -> void ;; add-to-range/key : text number number any any boolean -> void
@ -486,45 +487,35 @@ If the namespace does not, they are colored the unbound color.
;; If use-key? is #t, it adds `to-add' with the key, and does not ;; If use-key? is #t, it adds `to-add' with the key, and does not
;; replace a value with that key already there. ;; replace a value with that key already there.
;; If use-key? is #f, it adds `to-add' without a key. ;; If use-key? is #f, it adds `to-add' without a key.
;; pre: arrow-vectors is not #f ;; pre: arrow-records is not #f
(define/private (add-to-range/key text start end to-add key use-key?) (define/private (add-to-range/key text start end to-add key use-key?)
(let ([arrow-vector (hash-ref (let ([arrow-record (get-arrow-record arrow-records text)])
arrow-vectors ;; Dropped the check (< _ (vector-length arrow-vector))
text ;; which had the following comment:
(λ ()
(let ([new-vec
(make-vector
(add1 (send text last-position))
null)])
(hash-set!
arrow-vectors
text
new-vec)
new-vec)))])
(let loop ([p start])
(when (and (<= p end)
(< p (vector-length arrow-vector)))
;; the last test in the above and is because some syntax objects ;; the last test in the above and is because some syntax objects
;; appear to be from the original source, but can have bogus information. ;; appear to be from the original source, but can have bogus information.
(let ([r (vector-ref arrow-vector p)]) ;; Use (add1 end) below, because interval-maps use half-open intervals
(cond ;; ie, [start, end] = [start, end+1)
[use-key? (cond [use-key?
(unless (ormap (λ (x) (interval-map-update*! arrow-record
(and (pair? x) start (add1 end)
(car x) (lambda (old)
(eq? (car x) key))) (if (for/or ([x (in-list old)])
r) (and (pair? x) (car x) (eq? (car x) key)))
(vector-set! arrow-vector p (cons (cons key to-add) r)))] old
(cons to-add old)))
null)]
[else [else
(vector-set! arrow-vector p (cons to-add r))])) (interval-map-cons*! arrow-record
(loop (add1 p)))))) start (add1 end)
to-add null)])))
(inherit get-top-level-window) (inherit get-top-level-window)
(define/augment (on-change) (define/augment (on-change)
(inner (void) on-change) (inner (void) on-change)
(when arrow-vectors (when arrow-records
(flush-arrow-coordinates-cache) (flush-arrow-coordinates-cache)
(let ([any-tacked? #f]) (let ([any-tacked? #f])
(when tacked-hash-table (when tacked-hash-table
@ -538,26 +529,19 @@ If the namespace does not, they are colored the unbound color.
(invalidate-bitmap-cache))))) (invalidate-bitmap-cache)))))
;; flush-arrow-coordinates-cache : -> void ;; flush-arrow-coordinates-cache : -> void
;; pre-condition: arrow-vector is not #f. ;; pre-condition: arrow-records is not #f.
(define/private (flush-arrow-coordinates-cache) (define/private (flush-arrow-coordinates-cache)
(hash-for-each (for ([(text arrow-record) (in-hash arrow-records)])
arrow-vectors (for ([(start+end eles) (in-dict arrow-record)])
(λ (text arrow-vector) (for ([ele (in-list eles)])
(let loop ([n (vector-length arrow-vector)]) (when (arrow? ele)
(unless (zero? n)
(let ([eles (vector-ref arrow-vector (- n 1))])
(for-each (λ (ele)
(cond
[(arrow? ele)
(set-arrow-start-x! ele #f) (set-arrow-start-x! ele #f)
(set-arrow-start-y! ele #f) (set-arrow-start-y! ele #f)
(set-arrow-end-x! ele #f) (set-arrow-end-x! ele #f)
(set-arrow-end-y! ele #f)])) (set-arrow-end-y! ele #f))))))
eles))
(loop (- n 1)))))))
(define/override (on-paint before dc left top right bottom dx dy draw-caret) (define/override (on-paint before dc left top right bottom dx dy draw-caret)
(when (and arrow-vectors (not before)) (when (and arrow-records (not before))
(let ([draw-arrow2 (let ([draw-arrow2
(λ (arrow) (λ (arrow)
(unless (arrow-start-x arrow) (unless (arrow-start-x arrow)
@ -602,12 +586,10 @@ If the namespace does not, they are colored the unbound color.
(draw-arrow2 arrow)))) (draw-arrow2 arrow))))
(when (and cursor-location (when (and cursor-location
cursor-text) cursor-text)
(let* ([arrow-vector (hash-ref arrow-vectors cursor-text (λ () #f))]) (let* ([arrow-record (hash-ref arrow-records cursor-text #f)])
(when arrow-vector (when arrow-record
(let ([eles (vector-ref arrow-vector cursor-location)]) (for ([ele (in-list (interval-map-ref arrow-record cursor-location null))])
(for-each (λ (ele) (cond [(var-arrow? ele)
(cond
[(var-arrow? ele)
(if (var-arrow-actual? ele) (if (var-arrow-actual? ele)
(begin (send dc set-pen var-pen) (begin (send dc set-pen var-pen)
(send dc set-brush untacked-brush)) (send dc set-brush untacked-brush))
@ -617,8 +599,7 @@ If the namespace does not, they are colored the unbound color.
[(tail-arrow? ele) [(tail-arrow? ele)
(send dc set-pen tail-pen) (send dc set-pen tail-pen)
(send dc set-brush untacked-brush) (send dc set-brush untacked-brush)
(for-each-tail-arrows draw-arrow2 ele)])) (for-each-tail-arrows draw-arrow2 ele)])))))
eles)))))
(send dc set-brush old-brush) (send dc set-brush old-brush)
(send dc set-pen old-pen) (send dc set-pen old-pen)
(send dc set-font old-font) (send dc set-font old-font)
@ -647,18 +628,16 @@ If the namespace does not, they are colored the unbound color.
(f tail-arrow)) (f tail-arrow))
(let* ([next-pos (tail-arrow-pos tail-arrow)] (let* ([next-pos (tail-arrow-pos tail-arrow)]
[next-text (tail-arrow-text tail-arrow)] [next-text (tail-arrow-text tail-arrow)]
[arrow-vector (hash-ref arrow-vectors next-text (λ () #f))]) [arrow-record (hash-ref arrow-records next-text #f)])
(when arrow-vector (when arrow-record
(let ([eles (vector-ref arrow-vector next-pos)]) (for ([ele (in-list (interval-map-ref arrow-record next-pos null))])
(for-each (λ (ele)
(cond (cond
[(tail-arrow? ele) [(tail-arrow? ele)
(let ([other-pos (tail-arrow-other-pos ele)] (let ([other-pos (tail-arrow-other-pos ele)]
[other-text (tail-arrow-other-text ele)]) [other-text (tail-arrow-other-text ele)])
(when (and (= other-pos next-pos) (when (and (= other-pos next-pos)
(eq? other-text next-text)) (eq? other-text next-text))
(loop ele)))])) (loop ele)))]))))))))
eles))))))))
(for-each-tail-arrows/to/from tail-arrow-to-pos tail-arrow-to-text (for-each-tail-arrows/to/from tail-arrow-to-pos tail-arrow-to-text
tail-arrow-from-pos tail-arrow-from-text) tail-arrow-from-pos tail-arrow-from-text)
@ -666,7 +645,7 @@ If the namespace does not, they are colored the unbound color.
tail-arrow-to-pos tail-arrow-to-text)) tail-arrow-to-pos tail-arrow-to-text))
(define/override (on-event event) (define/override (on-event event)
(if arrow-vectors (if arrow-records
(cond (cond
[(send event leaving?) [(send event leaving?)
(update-docs-background #f) (update-docs-background #f)
@ -689,19 +668,17 @@ If the namespace does not, they are colored the unbound color.
(set! cursor-location pos) (set! cursor-location pos)
(set! cursor-text text) (set! cursor-text text)
(let* ([arrow-vector (hash-ref arrow-vectors cursor-text (λ () #f))] (let* ([arrow-record (hash-ref arrow-records cursor-text #f)]
[eles (and arrow-vector (vector-ref arrow-vector cursor-location))]) [eles (and arrow-record (interval-map-ref arrow-record cursor-location null))])
(unless (equal? cursor-eles eles) (unless (equal? cursor-eles eles)
(set! cursor-eles eles) (set! cursor-eles eles)
(update-docs-background eles) (update-docs-background eles)
(when eles (when eles
(update-status-line eles) (update-status-line eles)
(for-each (λ (ele) (for ([ele (in-list eles)])
(cond (cond [(arrow? ele)
[(arrow? ele)
(update-arrow-poss ele)])) (update-arrow-poss ele)]))
eles)
(invalidate-bitmap-cache)))))] (invalidate-bitmap-cache)))))]
[else [else
(update-docs-background #f) (update-docs-background #f)
@ -717,9 +694,9 @@ If the namespace does not, they are colored the unbound color.
[(send event button-down? 'right) [(send event button-down? 'right)
(let-values ([(pos text) (get-pos/text event)]) (let-values ([(pos text) (get-pos/text event)])
(if (and pos (is-a? text text%)) (if (and pos (is-a? text text%))
(let ([arrow-vector (hash-ref arrow-vectors text (λ () #f))]) (let ([arrow-record (hash-ref arrow-records text #f)])
(when arrow-vector (when arrow-record
(let ([vec-ents (vector-ref arrow-vector pos)] (let ([vec-ents (interval-map-ref arrow-record pos null)]
[start-selection (send text get-start-position)] [start-selection (send text get-start-position)]
[end-selection (send text get-end-position)]) [end-selection (send text get-end-position)])
(cond (cond
@ -760,7 +737,7 @@ If the namespace does not, they are colored the unbound color.
[callback [callback
(lambda (accept) (lambda (accept)
(tack-crossing-arrows-callback (tack-crossing-arrows-callback
arrow-vector arrow-record
start-selection start-selection
end-selection end-selection
text text
@ -782,7 +759,7 @@ If the namespace does not, they are colored the unbound color.
arrows-menu arrows-menu
(lambda (item evt) (lambda (item evt)
(untack-crossing-arrows (untack-crossing-arrows
arrow-vector arrow-record
start-selection start-selection
end-selection))))) end-selection)))))
(for-each (λ (f) (f menu)) add-menus) (for-each (λ (f) (f menu)) add-menus)
@ -860,14 +837,15 @@ If the namespace does not, they are colored the unbound color.
arrows)) arrows))
(invalidate-bitmap-cache)) (invalidate-bitmap-cache))
(define/private (tack-crossing-arrows-callback arrow-vector start end text kinds) (define/private (tack-crossing-arrows-callback arrow-record start end text kinds)
(define (xor a b) (define (xor a b)
(or (and a (not b)) (and (not a) b))) (or (and a (not b)) (and (not a) b)))
(define (within t p) (define (within t p)
(and (eq? t text) (and (eq? t text)
(<= start p end))) (<= start p end)))
;; FIXME: Add to interval-map: iteration over distinct ranges w/i given range
(for ([position (in-range start end)]) (for ([position (in-range start end)])
(define things (vector-ref arrow-vector position)) (define things (interval-map-ref arrow-record position null))
(for ([va things] #:when (var-arrow? va)) (for ([va things] #:when (var-arrow? va))
(define va-start (var-arrow-start-pos-left va)) (define va-start (var-arrow-start-pos-left va))
(define va-start-text (var-arrow-start-text va)) (define va-start-text (var-arrow-start-text va))
@ -879,9 +857,11 @@ If the namespace does not, they are colored the unbound color.
(hash-set! tacked-hash-table va #t))))) (hash-set! tacked-hash-table va #t)))))
(invalidate-bitmap-cache)) (invalidate-bitmap-cache))
(define/private (untack-crossing-arrows arrow-vector start end) (define/private (untack-crossing-arrows arrow-record start end)
;; FIXME: same comment as in 'tack-crossing...'
(for ([position (in-range start end)]) (for ([position (in-range start end)])
(for ([va (vector-ref arrow-vector position)] #:when (var-arrow? va)) (for ([va (interval-map-ref arrow-record position null)]
#:when (var-arrow? va))
(hash-set! tacked-hash-table va #f)))) (hash-set! tacked-hash-table va #f))))
;; syncheck:jump-to-binding-occurrence : text -> void ;; syncheck:jump-to-binding-occurrence : text -> void
@ -901,10 +881,10 @@ If the namespace does not, they are colored the unbound color.
(define/private (jump-to-binding/bound-helper text do-jump) (define/private (jump-to-binding/bound-helper text do-jump)
(let ([pos (send text get-start-position)]) (let ([pos (send text get-start-position)])
(when arrow-vectors (when arrow-records
(let ([arrow-vector (hash-ref arrow-vectors text (λ () #f))]) (let ([arrow-record (hash-ref arrow-records text #f)])
(when arrow-vector (when arrow-record
(let ([vec-ents (filter var-arrow? (vector-ref arrow-vector pos))]) (let ([vec-ents (filter var-arrow? (interval-map-ref arrow-record pos null))])
(unless (null? vec-ents) (unless (null? vec-ents)
(do-jump pos text vec-ents)))))))) (do-jump pos text vec-ents))))))))
@ -956,10 +936,10 @@ If the namespace does not, they are colored the unbound color.
;; syncheck:jump-to-definition : text -> void ;; syncheck:jump-to-definition : text -> void
(define/public (syncheck:jump-to-definition text) (define/public (syncheck:jump-to-definition text)
(let ([pos (send text get-start-position)]) (let ([pos (send text get-start-position)])
(when arrow-vectors (when arrow-records
(let ([arrow-vector (hash-ref arrow-vectors text (λ () #f))]) (let ([arrow-record (hash-ref arrow-records text #f)])
(when arrow-vector (when arrow-record
(let ([vec-ents (filter def-link? (vector-ref arrow-vector pos))]) (let ([vec-ents (filter def-link? (interval-map-ref arrow-record pos null))])
(unless (null? vec-ents) (unless (null? vec-ents)
(jump-to-definition-callback (car vec-ents))))))))) (jump-to-definition-callback (car vec-ents)))))))))