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

fix close parens behavior in interactions and comments

Browse Source 
original commit: c0a412ed0ef9a4e5e3529569ce1f171d8bd10378
This commit is contained in:
Nadeem Abdul Hamid 2012-12-04 20:51:27 -05:00 committed by Robby Findler
parent ba24e8fa61
commit 827dc1286d
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -994,10 +994,12 @@ added get-regions
;; -> (values (or #f number) (or #f number) (or #f string) boolean) ;; -> (values (or #f number) (or #f number) (or #f string) boolean)
(define/private (find-next-close-paren pos closers [adj? #t]) (define/private (find-next-close-paren pos closers [adj? #t])
(define next-pos (skip-whitespace pos 'forward #t)) (define next-pos (skip-whitespace pos 'forward #t))
(define tree (lexer-state-tokens (find-ls next-pos))) (define ls (find-ls next-pos))
(define start-pos (begin (send tree search! next-pos) (define ls-start (lexer-state-start-pos ls))
(send tree get-root-start-position))) (define tree (lexer-state-tokens ls))
(define end-pos (send tree get-root-end-position)) (send tree search! (- next-pos ls-start))
(define start-pos (+ ls-start (send tree get-root-start-position)))
(define end-pos (+ ls-start (send tree get-root-end-position)))
#;(printf "~a |~a| |~a|~n" (list pos next-pos start-pos end-pos (send tree get-root-data)) closers (get-text start-pos end-pos)) #;(printf "~a |~a| |~a|~n" (list pos next-pos start-pos end-pos (send tree get-root-data)) closers (get-text start-pos end-pos))

1
collects/framework/private/racket.rkt
View File

@ -509,6 +509,7 @@
(preferences:get 'framework:fixup-parens) (preferences:get 'framework:fixup-parens)
(or smart-skip (or smart-skip
(and (preferences:get 'framework:automatic-parens) (and (preferences:get 'framework:automatic-parens)
(not (in-string/comment? this))
'adjacent)))) 'adjacent))))
(define/public (tabify-on-return?) #t) (define/public (tabify-on-return?) #t)

1
collects/tests/framework/racket.rkt
View File

@ -179,6 +179,7 @@
; description before-cursor after-cursor ; description before-cursor after-cursor
'(("in-line-comment" ";; abc def " " ghi ") '(("in-line-comment" ";; abc def " " ghi ")
("end-of-line-comment" ";; abc def " "") ("end-of-line-comment" ";; abc def " "")
("end-of-line-comment-with-close-paren" ";; abc def " " ) \n )")
("in-block-comment" "#| abc def " " ghi |#") ("in-block-comment" "#| abc def " " ghi |#")
)) ))
(for ([s scenarios]) (for ([s scenarios])