Skip to content

Only apply #:when and #:unless refactoring to multi-body loops #779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Only apply #:when and #:unless refactoring to multi-body loops #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a8eb17
Initial plan
Copilot Dec 8, 2025
ea001d9
Modify when/unless rules to only apply with multi-body loops
Copilot Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 52 additions & 12 deletions default-recommendations/loops/for-loop-shortcuts-test.rkt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,51 +341,91 @@ test: "nested for/and forms can be flattened to a for*/and form"
------------------------------


test: "(when ...) in a for loop refactored to #:when clause"
test: "(when ...) in a for loop refactored to #:when clause when multiple body forms"
------------------------------------------------------------
(for ([x (in-list (list 1 2 'a 3 'b 4))])
(when (number? x)
(displayln x)))
(displayln x)
(displayln (* x 2))))
============================================================
(for ([x (in-list (list 1 2 'a 3 'b 4))]
#:when (number? x))
(displayln x))
(displayln x)
(displayln (* x 2)))
------------------------------------------------------------


test: "(when ...) in a for* loop refactored to #:when clause"
no-change-test: "(when ...) with single body form in a for loop not refactored"
------------------------------------------------------------
(for* ([x (in-list (list 1 2 'a 3 'b 4))])
(for ([x (in-list (list 1 2 'a 3 'b 4))])
(when (number? x)
(displayln x)))
------------------------------------------------------------


test: "(when ...) in a for* loop refactored to #:when clause when multiple body forms"
------------------------------------------------------------
(for* ([x (in-list (list 1 2 'a 3 'b 4))])
(when (number? x)
(displayln x)
(displayln (* x 2))))
============================================================
(for* ([x (in-list (list 1 2 'a 3 'b 4))]
#:when (number? x))
(displayln x))
(displayln x)
(displayln (* x 2)))
------------------------------------------------------------


no-change-test: "(when ...) with single body form in a for* loop not refactored"
------------------------------------------------------------
(for* ([x (in-list (list 1 2 'a 3 'b 4))])
(when (number? x)
(displayln x)))
------------------------------------------------------------


test: "(unless ...) in a for loop refactored to #:when clause"
test: "(unless ...) in a for loop refactored to #:unless clause when multiple body forms"
------------------------------------------------------------
(for ([x (in-list (list 1 2 'a 3 'b 4))])
(unless (number? x)
(displayln x)))
(displayln x)
(displayln "non-number")))
============================================================
(for ([x (in-list (list 1 2 'a 3 'b 4))]
#:unless (number? x))
(displayln x))
(displayln x)
(displayln "non-number"))
------------------------------------------------------------


test: "(unless ...) in a for* loop refactored to #:when clause"
no-change-test: "(unless ...) with single body form in a for loop not refactored"
------------------------------------------------------------
(for* ([x (in-list (list 1 2 'a 3 'b 4))])
(for ([x (in-list (list 1 2 'a 3 'b 4))])
(unless (number? x)
(displayln x)))
------------------------------------------------------------


test: "(unless ...) in a for* loop refactored to #:unless clause when multiple body forms"
------------------------------------------------------------
(for* ([x (in-list (list 1 2 'a 3 'b 4))])
(unless (number? x)
(displayln x)
(displayln "non-number")))
============================================================
(for* ([x (in-list (list 1 2 'a 3 'b 4))]
#:unless (number? x))
(displayln x))
(displayln x)
(displayln "non-number"))
------------------------------------------------------------


no-change-test: "(unless ...) with single body form in a for* loop not refactored"
------------------------------------------------------------
(for* ([x (in-list (list 1 2 'a 3 'b 4))])
(unless (number? x)
(displayln x)))
------------------------------------------------------------


Expand Down
2 changes: 2 additions & 0 deletions default-recommendations/loops/for-loop-shortcuts.rkt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,13 +261,15 @@ return just that result."
#:description "Use the `#:when` keyword instead of `when` to reduce loop body indentation."
#:literals (when for for*)
((~or for-id:for for-id:for*) (clause ...) (when condition body ...))
#:when (>= (length (attribute body)) 2)
(for-id (clause ... #:when condition) body ...))


(define-refactoring-rule unless-expression-in-for-loop-to-unless-keyword
#:description "Use the `#:unless` keyword instead of `unless` to reduce loop body indentation."
#:literals (unless for for*)
((~or for-id:for for-id:for*) (clause ...) (unless condition body ...))
#:when (>= (length (attribute body)) 2)
(for-id (clause ... #:unless condition) body ...))


Expand Down