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

small tweaks to scribble indentation

Browse Source 
- try to avoid special-casing blank lines as much
- when there are close curley braces all alone on a line,
  count the line as outside for the purposes of identing
This commit is contained in:
Robby Findler 2015-04-17 11:36:06 -05:00
parent f9e16fa6fb
commit 20520bf88e
1 changed files with 53 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
gui-lib/scribble/private/indentation.rkt
View File

@ -80,27 +80,49 @@
;; Return exact integer represents number of #\space to put in front of current paragraph(line) or #f ;; Return exact integer represents number of #\space to put in front of current paragraph(line) or #f
(define (determine-spaces txt posi) (define (determine-spaces txt posi)
(define current-para (send txt position-paragraph posi)) (define current-para (send txt position-paragraph posi))
(if (not (empty-line? txt current-para));not an empty paragraph/comment string (define para-start (send txt paragraph-start-position current-para))
(let* ([para-start (send txt paragraph-start-position current-para)] (define para-start-skip-space (start-skip-spaces txt current-para 'forward))
[para-start-skip-space (start-skip-spaces txt current-para 'forward)] (cond
[char-classify (send txt classify-position para-start-skip-space)] [para-start-skip-space
[prev-posi (send txt find-up-sexp para-start-skip-space)]) (define char-classify (send txt classify-position para-start-skip-space))
(cond (prev-posi (define prev-posi (send txt find-up-sexp para-start-skip-space))
(let ([this-para (send txt position-paragraph prev-posi)]) (cond
(cond ((equal? #\[ (send txt get-character prev-posi)) [prev-posi
(let ((this-para-start (send txt paragraph-start-position this-para))) (define this-para (send txt position-paragraph prev-posi))
(cond
[(equal? #\[ (send txt get-character prev-posi))
(define this-para-start (send txt paragraph-start-position this-para))
(if (= current-para this-para) (if (= current-para this-para)
0 0
(if (rest-empty? txt this-para prev-posi) (if (rest-empty? txt this-para prev-posi)
1 1
(add1 (- prev-posi this-para-start)))))) (add1 (- prev-posi this-para-start))))]
;;if it is inside a racket function and not the first line of the racket function ;;if it is inside a racket function and not the first line of the racket function
((equal? #\( (send txt get-character prev-posi)) [(equal? #\( (send txt get-character prev-posi)) #f]
(send txt tabify para-start) #f);call corresponding function to indent racket stuff [else
(else (count-parens txt prev-posi))))) (define curleys (number-of-curley-braces-if-there-are-only-curley-braces txt current-para))
((equal? 'text char-classify) 0) ;;0 space if line is just a "outside" text (if curleys
(else (send txt tabify para-start) #f)));;call tabify (max 0 (- (count-parens txt prev-posi) curleys))
#f));;empty line, do nothing (count-parens txt prev-posi))])]
[(equal? 'text char-classify) 0]
[else #f])]
[else #f]))
(define (number-of-curley-braces-if-there-are-only-curley-braces txt para)
(define number-of-curley-braces 0)
(define line-contains-only-curley-braces?
(for/and ([p (in-range (send txt paragraph-start-position para)
(send txt paragraph-end-position para))])
(define c (send txt get-character p))
(cond
[(char-whitespace? c) #t]
[(equal? c #\})
(set! number-of-curley-braces (+ number-of-curley-braces 1))
#t]
[else #f])))
(and line-contains-only-curley-braces?
number-of-curley-braces))
;;(adjust-para-width a-racket:text position width) → boolean? ;;(adjust-para-width a-racket:text position width) → boolean?
;; position : exact-integer? = current position ;; position : exact-integer? = current position
@ -641,6 +663,15 @@
(send t get-text)) (send t get-text))
"#lang scribble/base\n\ntestcase @a{b\n\n\n\n\n c}\n\n") "#lang scribble/base\n\ntestcase @a{b\n\n\n\n\n c}\n\n")
(check-equal? (let ([t (new racket:text%)])
(send t insert "#lang scribble/base\n@a{b\n } \n")
(determine-spaces t 26))
0)
(check-equal? (let ([t (new racket:text%)])
(send t insert "#lang scribble/base\n@a{b\n@{\n}}\n")
(determine-spaces t 30))
0)
;;test case for adjust paragraph width ;;test case for adjust paragraph width
(check-equal? (let ([t (new racket:text%)]) (check-equal? (let ([t (new racket:text%)])
(send t insert "#lang scribble/base\naaa bbb\n @ccc ddd") (send t insert "#lang scribble/base\naaa bbb\n @ccc ddd")