From e935b1fa8e987a2867bb5ddb881d78cbdb23b98d Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Tue, 29 Nov 2011 09:22:11 -0600 Subject: [PATCH] change the framework & drracket so that they still use the colorer methods (paren matching, mostly) when the colorer is frozen (but continue to avoid using them when the colrer is stopped) closes PR 12374 --- collects/drracket/private/rep.rkt | 1 - collects/drracket/private/unit.rkt | 3 +-- collects/framework/private/scheme.rkt | 9 +++------ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/collects/drracket/private/rep.rkt b/collects/drracket/private/rep.rkt index 831a4061c0..11d91f130c 100644 --- a/collects/drracket/private/rep.rkt +++ b/collects/drracket/private/rep.rkt @@ -436,7 +436,6 @@ TODO insert-before insert-between invalidate-bitmap-cache - is-frozen? is-locked? last-position line-location diff --git a/collects/drracket/private/unit.rkt b/collects/drracket/private/unit.rkt index 301fd5bd58..7815d12676 100644 --- a/collects/drracket/private/unit.rkt +++ b/collects/drracket/private/unit.rkt @@ -204,8 +204,7 @@ module browser threading seems wrong. (define (find-symbol text pos) (cond [(and (is-a? text scheme:text<%>) - (not (send text is-stopped?)) - (not (send text is-frozen?))) + (not (send text is-stopped?))) (let* ([before (send text get-backward-sexp pos)] [before+ (and before (send text get-forward-sexp before))] [after (send text get-forward-sexp pos)] diff --git a/collects/framework/private/scheme.rkt b/collects/framework/private/scheme.rkt index 8698cff8c0..d175214e77 100644 --- a/collects/framework/private/scheme.rkt +++ b/collects/framework/private/scheme.rkt @@ -169,7 +169,6 @@ ;; split/collapse-text : (instanceof menu%) (instanceof editor<%>) (instanceof mouse-event%) -> void (define (split/collapse-text menu text event) (when (and (is-a? text -text<%>) - (not (send text is-frozen?)) (not (send text is-stopped?))) (let* ([on-it-box (box #f)] [click-pos @@ -427,7 +426,6 @@ get-end-position flash-on insert - is-frozen? is-stopped? kill last-position @@ -457,7 +455,7 @@ (define/override (get-word-at current-pos) (let ([no-word ""]) (cond - [(or (is-stopped?) (is-frozen?)) + [(is-stopped?) no-word] [else (let ([type (classify-position (max 0 (- current-pos 1)))]) @@ -493,7 +491,7 @@ (define/public (tabify-on-return?) #t) (define/public (tabify [pos (get-start-position)]) - (unless (or (is-stopped?) (is-frozen?)) + (unless (is-stopped?) (let* ([tabify-prefs (preferences:get 'framework:tabify)] [last-pos (last-position)] [para (position-paragraph pos)] @@ -701,7 +699,7 @@ (define/public (tabify-selection [start-pos (get-start-position)] [end-pos (get-end-position)]) - (unless (or (is-frozen?) (is-stopped?)) + (unless (is-stopped?) (define first-para (position-paragraph start-pos)) (define end-para (position-paragraph end-pos)) (with-handlers ([exn:break? @@ -1419,7 +1417,6 @@ (λ (text) (cond [(or (not (preferences:get 'framework:fixup-open-parens)) - (send text is-frozen?) (send text is-stopped?)) (maybe-insert-brace-pair text #\[ #\])] [else