From 5d1df3d05db25f891909efacf277d115817b9d38 Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Wed, 2 Feb 2011 16:05:59 -0600 Subject: [PATCH] missed a multiple-vlaues change in a short-cut case. Please merge to the 5.1 release branch original commit: 63aa388d495fc753c9772cc645e32672a841cc89 --- collects/framework/private/color.rkt | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/collects/framework/private/color.rkt b/collects/framework/private/color.rkt index a1203f8f..365c48f0 100644 --- a/collects/framework/private/color.rkt +++ b/collects/framework/private/color.rkt @@ -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))