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

Indenter bug corrections; indented files according to indenter

Browse Source 
svn: r10371
This commit is contained in:
Kathy Gray 2008-06-19 13:40:25 +00:00
parent 707315b1b4
commit 08015efba8
3 changed files with 84 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
collects/profj/tool.ss
View File

@ -182,18 +182,20 @@
(cond (cond
[(equal? opener #\{) [(equal? opener #\{)
(let* ([previous-open (get-sexp-start (sub1 open-at))] (let* ([previous-open (get-sexp-start (sub1 open-at))]
[brace? (and previous-open (equal? #\{ (get-character (sub1 previous-open))))] [brace? (and previous-open
[base-line-start (and brace? (skip-whitespace (add1 previous-open) 'forward #f))]) (> (sub1 previous-open) 0)
#;(printf "brace? ~a bls ~a~n" brace? base-line-start) (equal? #\{ (get-character (sub1 previous-open))))]
[base-line-text (and brace? (skip-whitespace (add1 previous-open) 'forward #f))]
[base-line-start (and base-line-text (find-string eol 'backward base-line-text 0 #f))])
#;(printf "brace? ~a blt ~a bls ~a~n" brace? base-line-text base-line-start)
(cond (cond
[base-line-start (+ single-tab-stop [base-line-start (+ single-tab-stop
(max 0 (sub1 (- base-line-start previous-open))))] (max 0 (sub1 (- base-line-text base-line-start))))]
[brace? (+ single-tab-stop 0)] [brace? (+ single-tab-stop 0)]
[else (+ single-tab-stop last-line-indent)]))] [else (+ single-tab-stop last-line-indent)]))]
[(equal? opener #\() [(equal? opener #\()
(+ (max 0 (+ (max 0
(- open-at #;(find-string "(" 'forward last-line-start start-pos #f) (- open-at last-line-start))
last-line-start))
last-line-indent)] last-line-indent)]
[(equal? opener #\[) [(equal? opener #\[)
(+ (max 0 (+ (max 0
@ -240,6 +242,7 @@
(cond (cond
[(not old-open) last-line-indent] [(not old-open) last-line-indent]
[(and old-open (<= curr-open old-open)) last-line-indent] [(and old-open (<= curr-open old-open)) last-line-indent]
[(< (sub1 curr-open) 0) base-offset]
[else [else
(sensitive-indent last-line-indent last-line-start (get-character (sub1 curr-open)) curr-open) (sensitive-indent last-line-indent last-line-start (get-character (sub1 curr-open)) curr-open)
#;(+ single-tab-stop last-line-indent)]))] #;(+ single-tab-stop last-line-indent)]))]
@ -251,6 +254,7 @@
(cond (cond
[(not old-open) last-line-indent] [(not old-open) last-line-indent]
[(and old-open (<= curr-open old-open)) last-line-indent] [(and old-open (<= curr-open old-open)) last-line-indent]
[(< (sub1 curr-open) 0) base-offset]
[else [else
(sensitive-indent last-line-indent last-line-start (get-character (sub1 curr-open)) curr-open) (sensitive-indent last-line-indent last-line-start (get-character (sub1 curr-open)) curr-open)
#;(+ single-tab-stop last-line-indent)]))]))])))]) #;(+ single-tab-stop last-line-indent)]))]))])))])
@ -311,15 +315,20 @@
[end-para (position-paragraph (get-end-position))]) [end-para (position-paragraph (get-end-position))])
(begin-edit-sequence) (begin-edit-sequence)
(let loop ([para start-para]) (let loop ([para start-para])
#;(printf "in tabify outer loop ~a ~a~n" para end-para)
(let* ([para-start (paragraph-start-position para)] (let* ([para-start (paragraph-start-position para)]
[curr-white-space (skip-whitespace para-start 'forward #f)]
[insertion (get-indentation (max 0 (sub1 para-start)))] [insertion (get-indentation (max 0 (sub1 para-start)))]
[closer? #f] [closer? #f]
[delete? #f]) [delete? #f])
(let loop () (let loop ()
#;(printf "in tabify inner loop ~a ~a, ~a ~n" para para-start curr-white-space)
(let ([c (get-character para-start)] (let ([c (get-character para-start)]
[class (classify-position para-start)]) [class (classify-position para-start)])
#;(printf "character is ~a, ~a~n" c class)
(cond (cond
[(and (eq? 'white-space class) [(and (eq? 'white-space class)
(not (= curr-white-space para-start))
(not (char=? c #\015)) (not (char=? c #\015))
(not (char=? c #\012))) (not (char=? c #\012)))
(set! delete? #t) (set! delete? #t)
@ -332,8 +341,7 @@
(insert (substring insertion 0 (max 0 (- (string-length insertion) single-tab-stop))) para-start para-start)] (insert (substring insertion 0 (max 0 (- (string-length insertion) single-tab-stop))) para-start para-start)]
[(or delete? (not (eq? 'block-comment (classify-position para-start)))) [(or delete? (not (eq? 'block-comment (classify-position para-start))))
(insert insertion para-start para-start)])) (insert insertion para-start para-start)]))
(unless (= para end-para) (unless (= para end-para) (loop (+ para 1))))
(loop (+ para 1))))
(end-edit-sequence))) (end-edit-sequence)))
(super-new))) (super-new)))