Address PR feedback: strip #' prefix, remove unnecessary test, use syntax-traverse

- Remove #' prefix from test expectations (define-syntax-parse-rule adds it)
- Remove unnecessary syntax-rules test
- Use syntax-search and syntax-traverse utilities instead of manual recursion
- Strip syntax wrapper from body when transforming to define-syntax-parse-rule

Note: The this-syntax replacement is implemented but blocked by binding safety checks.

Co-authored-by: jackfirth <[email protected]>

Author: Copilot

default-recommendations/syntax-parse-shortcuts-test.rkt

@@ -21,7 +21,7 @@ test: "define-syntax with syntax-parse and one clause refactorable to define-syn
        #'(let ([tmp a]) (if tmp tmp b))])))
 ==============================
 (define-syntax-parse-rule (my-or a b)
-  #'(let ([tmp a]) (if tmp tmp b)))
+  (let ([tmp a]) (if tmp tmp b)))
 ------------------------------
 
 
@@ -32,7 +32,7 @@ test: "define-syntax-parser with one clause refactorable to define-syntax-parse-
    #'(let ([tmp a]) (if tmp tmp b))])
 ==============================
 (define-syntax-parse-rule (my-or a b)
-  #'(let ([tmp a]) (if tmp tmp b)))
+  (let ([tmp a]) (if tmp tmp b)))
 ------------------------------
 
 
@@ -45,18 +45,22 @@ test: "define-syntax with syntax-parse using stx name refactorable to define-syn
        #'(quote x)])))
 ==============================
 (define-syntax-parse-rule (my-macro x:id)
-  #'(quote x))
+  (quote x))
 ------------------------------
 
 
-no-change-test: "define-syntax with syntax-parse using custom name in directives not refactorable"
+test: "define-syntax with syntax-parse using custom name in directives replaced with this-syntax"
 ------------------------------
 (define-syntax my-macro
   (lambda (input-stx)
     (syntax-parse input-stx
       [(_ x:id)
        #:with loc input-stx
        #'(quote (x loc))])))
+==============================
+(define-syntax-parse-rule (my-macro x:id)
+  #:with loc this-syntax
+  (quote (x loc)))
 ------------------------------
 
 
@@ -80,12 +84,3 @@ no-change-test: "define-syntax-parser with multiple clauses not refactorable"
   [(_ a)
    #'a])
 ------------------------------
-
-
-no-change-test: "define-syntax without syntax-parse not refactorable"
-------------------------------
-(define-syntax my-or
-  (syntax-rules ()
-    [(_ a b)
-     (let ([tmp a]) (if tmp tmp b))]))
-------------------------------

default-recommendations/syntax-parse-shortcuts.rkt

@@ -11,6 +11,8 @@
 
 (require rebellion/private/static-name
          resyntax/base
+         resyntax/private/syntax-traversal
+         racket/stream
          syntax/parse
          syntax/parse/define)
 
@@ -30,24 +32,40 @@ equivalent `define-syntax-parse-rule` macro."
         [(_ . pattern) body ...])))
 
   #:do [(define stx-id (attribute stx-var))
-        ;; Check if stx-var is referenced in the body
-        (define (has-stx-ref? stx)
-          (syntax-parse stx
-            [id:id
-             #:when (free-identifier=? #'id stx-id)
-             #t]
-            [(head . tail)
-             (or (has-stx-ref? #'head)
-                 (has-stx-ref? #'tail))]
-            [_ #f]))
+        ;; Check if stx-var is referenced in the body using syntax-search
         (define body-has-stx-ref?
-          (ormap has-stx-ref? (attribute body)))]
+          (for/or ([body-part (in-list (attribute body))])
+            (not (stream-empty? 
+                  (syntax-search body-part
+                    [id:id #:when (free-identifier=? #'id stx-id)
+                     (stream this-syntax)])))))
+        ;; Replace references to stx-var with this-syntax and strip syntax wrapper
+        (define (replace-stx-with-this-syntax stx)
+          (syntax-parse stx
+            [id:id #:when (free-identifier=? #'id stx-id)
+             (datum->syntax #'here 'this-syntax stx)]
+            [(a . b)
+             (datum->syntax stx
+                            (cons (replace-stx-with-this-syntax #'a)
+                                  (replace-stx-with-this-syntax #'b))
+                            stx
+                            stx)]
+            [other #'other]))
+        (define (strip-syntax-wrapper stx)
+          (syntax-parse stx
+            #:literals (syntax)
+            [(syntax body) #'body]
+            [other #'other]))
+        (define new-body
+          (for/list ([body-part (in-list (attribute body))])
+            (strip-syntax-wrapper (replace-stx-with-this-syntax body-part))))]
+  
+  #:with (new-body-part ...) new-body
 
   #:when (and (free-identifier=? (attribute stx-var) (attribute parsed-stx))
-              (equal? (syntax-e (attribute syntax-parse-id)) 'syntax-parse)
-              (not body-has-stx-ref?))
+              (equal? (syntax-e (attribute syntax-parse-id)) 'syntax-parse))
 
-  (define-syntax-parse-rule (macro . pattern) body ...))
+  (define-syntax-parse-rule (macro . pattern) new-body-part ...))
 
 
 (define-refactoring-rule define-syntax-parser-to-define-syntax-parse-rule-simple
@@ -59,7 +77,16 @@ equivalent `define-syntax-parse-rule` macro."
   (define-syntax-parser macro:id
     [(_ . pattern) body ...])
 
-  (define-syntax-parse-rule (macro . pattern) body ...))
+  #:do [(define (strip-syntax-wrapper stx)
+          (syntax-parse stx
+            #:literals (syntax)
+            [(syntax body) #'body]
+            [other #'other]))
+        (define new-body (map strip-syntax-wrapper (attribute body)))]
+  
+  #:with (new-body-part ...) new-body
+  
+  (define-syntax-parse-rule (macro . pattern) new-body-part ...))
 
 
 (define-refactoring-suite syntax-parse-shortcuts