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

missed a multiple-vlaues change in a short-cut case.

Browse Source 
Please merge to the 5.1 release branch
(cherry picked from commit 63aa388d49)
This commit is contained in:
Robby Findler 2011-02-02 16:05:59 -06:00 committed by Eli Barzilay
parent 68e13d8587
commit 9b9dc8c2f8
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
collects/framework/private/color.rkt
View File

@ -825,20 +825,23 @@ added get-regions
(define/public (get-token-range position)
(define-values (tokens ls) (get-tokens-at-position 'get-token-range position))
(values (and tokens (+ (lexer-state-start-pos ls)
(send tokens get-root-start-position)))
(and tokens (+ (lexer-state-start-pos ls)
(send tokens get-root-end-position)))))
(values (and tokens ls
(+ (lexer-state-start-pos ls)
(send tokens get-root-start-position)))
(and tokens ls
(+ (lexer-state-start-pos ls)
(send tokens get-root-end-position)))))
(define/private (get-tokens-at-position who position)
(when stopped?
(error who "called on a color:text<%> whose colorer is stopped."))
(let ([ls (find-ls position)])
(and ls
(let ([tokens (lexer-state-tokens ls)])
(if ls
(let ([tokens (lexer-state-tokens ls)])
(tokenize-to-pos ls position)
(send tokens search! (- position (lexer-state-start-pos ls)))
(values tokens ls)))))
(values tokens ls))
(values #f #f))))
(define/private (tokenize-to-pos ls position)
(when (and (not (lexer-state-up-to-date? ls))