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

fix the get-token-range method in the case that the colorer's current region doesn't start at the begining of the buffer

Browse Source 
Please merge to the release branch

original commit: 8c6c1a0e9bfee79db27b6234a806df533b5bd7cb
This commit is contained in:
Robby Findler 2011-02-01 14:49:57 -06:00
parent 02aa21f3fa
commit b32fc91757
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -817,16 +817,18 @@ added get-regions
;; Determines whether a position is a 'comment, 'string, etc.
(define/public (classify-position position)
(define tokens (get-tokens-at-position 'classify-position position))
(define-values (tokens ls) (get-tokens-at-position 'classify-position position))
(and tokens
(let ([root-data (send tokens get-root-data)])
(and root-data
(data-type root-data)))))
(define/public (get-token-range position)
(define tokens (get-tokens-at-position 'get-token-range position))
(values (and tokens (send tokens get-root-start-position))
(and tokens (send tokens get-root-end-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)))))
(define/private (get-tokens-at-position who position)
(when stopped?
@ -836,7 +838,7 @@ added get-regions
(let ([tokens (lexer-state-tokens ls)])
(tokenize-to-pos ls position)
(send tokens search! (- position (lexer-state-start-pos ls)))
tokens))))
(values tokens ls)))))
(define/private (tokenize-to-pos ls position)
(when (and (not (lexer-state-up-to-date? ls))