Improve definition context reformatting behavior (#358)

Author: jackfirth

default-recommendations/definition-shortcuts-test.rkt

@@ -106,3 +106,16 @@ test: "inlining immediately returned variable definition doesn't reformat entire
 
   1)
 ------------------------------
+
+
+test: "inlining immediately returned variable definition in empty context does reformat"
+------------------------------
+(map (λ (x)
+       (define y (* x 2))
+       y)
+     (list 1 2 3))
+------------------------------
+------------------------------
+(map (λ (x) (* x 2))
+     (list 1 2 3))
+------------------------------

default-recommendations/definition-shortcuts.rkt

@@ -10,6 +10,7 @@
 
 
 (require (for-syntax racket/base)
+         racket/list
          rebellion/private/static-name
          resyntax/base
          syntax/parse)
@@ -32,7 +33,11 @@
   #:literals (define)
   (~seq body-before ... (~and definition (define id1:id expr)) id2:id)
   #:when (free-identifier=? #'id1 #'id2)
-  (body-before ... (~focus-replacement-on (~replacement expr #:original-splice (definition id2)))))
+  #:with replacement #'(~replacement expr #:original-splice (definition id2))
+  #:with focused (if (empty? (attribute body-before))
+                     #'replacement
+                     #'(~focus-replacement-on replacement))
+  (body-before ... focused))
 
 
 (define-refactoring-suite definition-shortcuts

default-recommendations/match-shortcuts-test.rkt

@@ -51,6 +51,19 @@ test: "migrating single-clause match expressions to match-define doesn't reforma
 ------------------------------
 
 
+test: "migrating single-clause match expressions in single-form contexts does reformat"
+------------------------------
+(map (λ (x) (match x [(list a b c) (+ a b c)]))
+     (list (list 1 2 3) (list 4 5 6)))
+------------------------------
+------------------------------
+(map (λ (x)
+       (match-define (list a b c) x)
+       (+ a b c))
+     (list (list 1 2 3) (list 4 5 6)))
+------------------------------
+
+
 test: "single-clause match expressions inside cond can be replaced with match-define expressions"
 ------------------------------
 (define (foo x condition)

default-recommendations/match-shortcuts.rkt

@@ -9,16 +9,11 @@
   [match-shortcuts refactoring-suite?]))
 
 
-(require (for-syntax racket/base)
+(require racket/list
          racket/match
          racket/set
-         rebellion/private/static-name
          resyntax/base
-         resyntax/default-recommendations/private/definition-context
          resyntax/default-recommendations/private/syntax-identifier-sets
-         resyntax/default-recommendations/private/syntax-lines
-         resyntax/default-recommendations/private/syntax-tree
-         resyntax/private/syntax-neighbors
          syntax/parse)
 
 
@@ -41,7 +36,11 @@
   (~seq body-before ... match-expression:single-clause-match)
   #:when (set-empty? (set-intersect (syntax-bound-identifiers #'(body-before ...))
                                     (syntax-bound-identifiers #'match-expression.match-pattern)))
-  (body-before ... (~@ . (~focus-replacement-on (match-expression.as-definition-context-body ...)))))
+  #:with (new-body ...) (if (empty? (attribute body-before))
+                            (attribute match-expression.as-definition-context-body)
+                            #'(~focus-replacement-on
+                               (match-expression.as-definition-context-body ...)))
+  (body-before ... new-body ...))
 
 
 (define-refactoring-suite match-shortcuts