Support importing analyzers directly in test require: statements (#703)

Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: jackfirth <[email protected]>

Author: Copilot

base.rkt

@@ -18,7 +18,9 @@
   [refactoring-suite? (-> any/c boolean?)]
   [refactoring-suite
    (->* ()
-        (#:rules (sequence/c refactoring-rule?) #:name (or/c interned-symbol? #false))
+        (#:rules (sequence/c refactoring-rule?)
+         #:analyzers (sequence/c expansion-analyzer?)
+         #:name (or/c interned-symbol? #false))
         refactoring-suite?)]
   [refactoring-suite-rules (-> refactoring-suite? (listof refactoring-rule?))]
   [refactoring-suite-analyzers (-> refactoring-suite? (set/c expansion-analyzer?))]))
@@ -234,12 +236,16 @@
   #:omit-root-binding)
 
 
-(define (refactoring-suite #:rules [rules '()] #:name [name #false])
+(define (refactoring-suite #:rules [rules '()] #:analyzers [analyzers '()] #:name [name #false])
   (define rule-list (sequence->list rules))
-  (define combined-analyzers
+  (define analyzers-from-rules
     (for*/set ([rule (in-list rule-list)]
                [analyzer (in-set (refactoring-rule-analyzers rule))])
       analyzer))
+  (define extra-analyzers
+    (for/set ([analyzer analyzers])
+      analyzer))
+  (define combined-analyzers (set-union analyzers-from-rules extra-analyzers))
   (constructor:refactoring-suite #:rules rule-list #:analyzers combined-analyzers #:name name))
 
 

default-recommendations/analyzers/identifier-usage-test.rkt

@@ -1,7 +1,7 @@
 #lang resyntax/test
 
 
-require: resyntax/default-recommendations default-recommendations
+require: resyntax/default-recommendations/analyzers/identifier-usage identifier-usage-analyzer
 header: - #lang racket/base
 
 

default-recommendations/analyzers/ignored-result-values-test.rkt

@@ -1,5 +1,5 @@
 #lang resyntax/test
-require: resyntax/default-recommendations default-recommendations
+require: resyntax/default-recommendations/analyzers/ignored-result-values ignored-result-values-analyzer
 header: - #lang racket/base
 
 

default-recommendations/analyzers/variable-mutability-test.rkt

@@ -1,5 +1,5 @@
 #lang resyntax/test
-require: resyntax/default-recommendations default-recommendations
+require: resyntax/default-recommendations/analyzers/variable-mutability variable-mutability-analyzer
 header: - #lang racket/base
 
 

test/private/rackunit.rkt

@@ -18,6 +18,7 @@
          racket/match
          racket/port
          racket/pretty
+         racket/set
          racket/string
          rackunit
          rebellion/base/comparator
@@ -33,6 +34,7 @@
          rebellion/type/tuple
          resyntax
          resyntax/base
+         resyntax/private/analyzer
          resyntax/private/logger
          resyntax/private/refactoring-result
          resyntax/private/source
@@ -91,10 +93,23 @@
   (current-suite-under-test (refactoring-suite #:rules '())))
 
 
-(define (add-suite-under-test! suite)
-  (define current-rules (refactoring-suite-rules (current-suite-under-test)))
-  (define new-rules (append current-rules (refactoring-suite-rules suite)))
-  (current-suite-under-test (refactoring-suite #:rules new-rules)))
+(define (add-suite-under-test! suite-or-analyzer)
+  (cond
+    [(refactoring-suite? suite-or-analyzer)
+     (define current-rules (refactoring-suite-rules (current-suite-under-test)))
+     (define current-analyzers (refactoring-suite-analyzers (current-suite-under-test)))
+     (define new-rules (append current-rules (refactoring-suite-rules suite-or-analyzer)))
+     (define new-analyzers (set-union current-analyzers (refactoring-suite-analyzers suite-or-analyzer)))
+     (current-suite-under-test (refactoring-suite #:rules new-rules #:analyzers new-analyzers))]
+    [(expansion-analyzer? suite-or-analyzer)
+     (define current-rules (refactoring-suite-rules (current-suite-under-test)))
+     (define current-analyzers (refactoring-suite-analyzers (current-suite-under-test)))
+     (define new-analyzers (set-add current-analyzers suite-or-analyzer))
+     (current-suite-under-test (refactoring-suite #:rules current-rules #:analyzers new-analyzers))]
+    [else
+     (raise-argument-error 'add-suite-under-test!
+                           "(or/c refactoring-suite? expansion-analyzer?)"
+                           suite-or-analyzer)]))
 
 
 (define current-header (make-parameter (code-block "")))
@@ -249,7 +264,7 @@
 
   (define actual-props
     (call-with-logs-captured
-     (λ () (reysntax-analyze-for-properties-only program-src))))
+     (λ () (reysntax-analyze-for-properties-only program-src #:suite suite))))
 
   (define target-src (string-source (string-trim (code-block-raw-string target))))
   (define context-src-list