From 63b27a8eeb7e11b22c83a3fb43a72d6304e6bf30 Mon Sep 17 00:00:00 2001 From: Alexis King Date: Sun, 2 Aug 2015 17:53:14 -0700 Subject: [PATCH] Use a regular expression to indent for loops in framework --- gui-lib/framework/private/main.rkt | 4 +--- gui-test/framework/tests/racket.rkt | 10 ++++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gui-lib/framework/private/main.rkt b/gui-lib/framework/private/main.rkt index 812a0fa9..88fe930d 100644 --- a/gui-lib/framework/private/main.rkt +++ b/gui-lib/framework/private/main.rkt @@ -415,8 +415,6 @@ splicing-letrec-syntaxes splicing-letrec-syntaxes+values splicing-local splicing-syntax-parameterize - ,@all-fors - do: kernel-syntax-case @@ -447,7 +445,7 @@ type-case)) (preferences:set-default 'framework:tabify - (list defaults-ht #rx"^begin" #rx"^def" #f #f) + (list defaults-ht #rx"^begin" #rx"^def" #rx"^for\\*?(/|$)" #f) (list/c (hash/c symbol? (or/c 'for/fold 'define 'begin 'lambda) #:flat? #t) (or/c #f regexp?) (or/c #f regexp?) (or/c #f regexp?) (or/c #f regexp?))) diff --git a/gui-test/framework/tests/racket.rkt b/gui-test/framework/tests/racket.rkt index 2f6d08c3..a88ea3c6 100644 --- a/gui-test/framework/tests/racket.rkt +++ b/gui-test/framework/tests/racket.rkt @@ -142,6 +142,16 @@ (test-indentation "(lambdaa (x)\nb)" "(lambdaa (x)\n b)") (test-indentation "(define x\n (let/ec return\n (when 1\n (when 2\n\t\t 3))\n 2))" "(define x\n (let/ec return\n (when 1\n (when 2\n 3))\n 2))") +(test-indentation "(for ([x 1])\nx)" + "(for ([x 1])\n x)") +(test-indentation "(for/list ([x 1])\nx)" + "(for/list ([x 1])\n x)") +(test-indentation "(for/anything ([x 1])\nx)" + "(for/anything ([x 1])\n x)") +(test-indentation "(for*/anything ([x 1])\nx)" + "(for*/anything ([x 1])\n x)") +(test-indentation "(for-anything ([x 1])\nx)" + "(for-anything ([x 1])\n x)") (test-indentation "(for/fold ([x 1])\n([y 2])\n3\n4)" "(for/fold ([x 1])\n ([y 2])\n 3\n 4)") (test-indentation "a\na\na\n" "a\na\na\n")