Add CLI support for analyzer timeout and test demonstration

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

Author: Copilot

cli.rkt

@@ -37,7 +37,7 @@
 
 (define-enum-type resyntax-output-format (plain-text github-pull-request-review git-commit-message json))
 (define-enum-type resyntax-fix-method (modify-files create-multiple-git-commits))
-(define-record-type resyntax-analyze-options (targets suite output-format output-destination))
+(define-record-type resyntax-analyze-options (targets suite output-format output-destination analyzer-timeout-ms))
 
 
 (define-record-type resyntax-fix-options
@@ -48,7 +48,8 @@
    max-fixes
    max-modified-files
    max-modified-lines
-   max-pass-count))
+   max-pass-count
+   analyzer-timeout-ms))
 
 
 (define all-lines (range-set (unbounded-range #:comparator natural<=>)))
@@ -60,6 +61,7 @@
   (define selected-rule #false)
   (define output-format plain-text)
   (define output-destination 'console)
+  (define analyzer-timeout-ms 10000)
 
   (command-line
    #:program "resyntax analyze"
@@ -105,6 +107,11 @@ changed relative to baseref are analyzed."
     (define rule-sym (string->symbol rule-name))
     (set! selected-rule rule-sym))
 
+   ("--analyzer-timeout"
+    timeout-ms
+    "The timeout in milliseconds for expansion analyzers. Defaults to 10000 (10 seconds)."
+    (set! analyzer-timeout-ms (string->number timeout-ms)))
+
    ("--output-to-file"
     outputpath
     "Store results in a file instead of printing them to the console."
@@ -128,7 +135,8 @@ determined by the GITHUB_REPOSITORY and GITHUB_REF environment variables."
    #:targets (build-vector targets)
    #:suite suite
    #:output-format output-format
-   #:output-destination output-destination))
+   #:output-destination output-destination
+   #:analyzer-timeout-ms analyzer-timeout-ms))
 
 
 (define (resyntax-fix-parse-command-line)
@@ -143,6 +151,7 @@ determined by the GITHUB_REPOSITORY and GITHUB_REF environment variables."
   (define max-pass-count 10)
   (define max-modified-files +inf.0)
   (define max-modified-lines +inf.0)
+  (define analyzer-timeout-ms 10000)
 
   (command-line
    #:program "resyntax fix"
@@ -197,6 +206,11 @@ changed relative to baseref are analyzed and fixed."
     (define rule-sym (string->symbol rule-name))
     (set! selected-rule rule-sym))
 
+   ("--analyzer-timeout"
+    timeout-ms
+    "The timeout in milliseconds for expansion analyzers. Defaults to 10000 (10 seconds)."
+    (set! analyzer-timeout-ms (string->number timeout-ms)))
+
    ("--max-pass-count"
     passcount
     "The maximum number of times Resyntax will fix each file. By default, Resyntax runs at most 10 \
@@ -235,7 +249,8 @@ are needed when applying a fix unlocks further fixes."
                         #:max-fixes max-fixes
                         #:max-modified-files max-modified-files
                         #:max-modified-lines max-modified-lines
-                        #:max-pass-count max-pass-count))
+                        #:max-pass-count max-pass-count
+                        #:analyzer-timeout-ms analyzer-timeout-ms))
 
 
 (define (resyntax-run)
@@ -273,7 +288,8 @@ For help on these, use 'analyze --help' or 'fix --help'."
   (define analysis
     (resyntax-analyze-all sources
                           #:suite (resyntax-analyze-options-suite options)
-                          #:max-passes 1))
+                          #:max-passes 1
+                          #:timeout-ms (resyntax-analyze-options-analyzer-timeout-ms options)))
   (define results
     (transduce (resyntax-analysis-all-results analysis)
                (append-mapping in-hash-values)
@@ -322,7 +338,8 @@ For help on these, use 'analyze --help' or 'fix --help'."
                           #:max-fixes (resyntax-fix-options-max-fixes options)
                           #:max-passes (resyntax-fix-options-max-pass-count options)
                           #:max-modified-sources max-modified-files
-                          #:max-modified-lines max-modified-lines))
+                          #:max-modified-lines max-modified-lines
+                          #:timeout-ms (resyntax-fix-options-analyzer-timeout-ms options)))
   (match fix-method
     [(== modify-files)
      (resyntax-analysis-write-file-changes! analysis)]

main.rkt

@@ -24,7 +24,8 @@
          #:max-fixes (or/c exact-nonnegative-integer? +inf.0)
          #:max-passes exact-nonnegative-integer?
          #:max-modified-sources (or/c exact-nonnegative-integer? +inf.0)
-         #:max-modified-lines (or/c exact-nonnegative-integer? +inf.0))
+         #:max-modified-lines (or/c exact-nonnegative-integer? +inf.0)
+         #:timeout-ms exact-nonnegative-integer?)
         resyntax-analysis?)]
   [reysntax-analyze-for-properties-only
    (->* (source?) (#:suite refactoring-suite? #:timeout-ms exact-nonnegative-integer?) syntax-property-bundle?)]
@@ -265,7 +266,8 @@
                               #:max-fixes [max-fixes +inf.0]
                               #:max-passes [max-passes 10]
                               #:max-modified-sources [max-modified-sources +inf.0]
-                              #:max-modified-lines [max-modified-lines +inf.0])
+                              #:max-modified-lines [max-modified-lines +inf.0]
+                              #:timeout-ms [timeout-ms 10000])
   (log-resyntax-info "--- analyzing code ---")
   (for/fold ([pass-result-lists '()]
              [sources sources]
@@ -279,7 +281,8 @@
                                                 #:suite suite
                                                 #:max-fixes max-fixes
                                                 #:max-modified-sources max-modified-sources
-                                                #:max-modified-lines max-modified-lines))
+                                                #:max-modified-lines max-modified-lines
+                                                #:timeout-ms timeout-ms))
                    (define pass-fix-count (count-total-results pass-results))
                    (define new-max-fixes (- max-fixes pass-fix-count))]
              #:break (hash-empty? pass-results)
@@ -303,7 +306,8 @@
                                    #:suite suite
                                    #:max-fixes max-fixes
                                    #:max-modified-sources max-modified-sources
-                                   #:max-modified-lines max-modified-lines)
+                                   #:max-modified-lines max-modified-lines
+                                   #:timeout-ms timeout-ms)
   (transduce (in-hash-entries sources) ; entries with source keys and line range set values
 
              ;; The following steps perform a kind of layered shuffle: the files to refactor are
@@ -331,7 +335,7 @@
              (append-mapping
               (λ (e)
                 (match-define (entry source lines) e)
-                (define result-set (resyntax-analyze source #:suite suite #:lines lines))
+                (define result-set (resyntax-analyze source #:suite suite #:lines lines #:timeout-ms timeout-ms))
                 (refactoring-result-set-results result-set)))
              (limiting max-modified-lines
                        #:by (λ (result)
@@ -529,6 +533,7 @@
     ;; Test with multipass analyze
     (define analysis
       (resyntax-analyze-all (hash test-source (range-set (unbounded-range #:comparator natural<=>)))
-                            #:suite breaking-suite))
+                            #:suite breaking-suite
+                            #:timeout-ms 10000))
     (check-equal? (resyntax-analysis-total-fixes analysis) 0
                   "Breaking suggestions should be filtered from resyntax-analyze-all")))

test.rkt

@@ -149,19 +149,19 @@
       #:with (id ...) (list #'current-line-mask)
       #:with (value ...) (list #'line-set))
 
-    (pattern (~seq (#:option #:analyzer-timeout-millis timeout:number))
+    (pattern (~seq (#:option #:analyzer-timeout-millis timeout-value:number))
       #:with (id ...) (list #'current-analyzer-timeout-millis)
-      #:with (value ...) (list #'timeout))
+      #:with (value ...) (list #`'#,(syntax-e #'timeout-value)))
 
     (pattern (~seq (#:option #:lines (~and line-set (#:range-set _ ...)))
-                   (#:option #:analyzer-timeout-millis timeout:number))
+                   (#:option #:analyzer-timeout-millis timeout-value:number))
       #:with (id ...) (list #'current-line-mask #'current-analyzer-timeout-millis)
-      #:with (value ...) (list #'line-set #'timeout))
+      #:with (value ...) (list #'line-set #`'#,(syntax-e #'timeout-value)))
 
-    (pattern (~seq (#:option #:analyzer-timeout-millis timeout:number)
+    (pattern (~seq (#:option #:analyzer-timeout-millis timeout-value:number)
                    (#:option #:lines (~and line-set (#:range-set _ ...))))
       #:with (id ...) (list #'current-analyzer-timeout-millis #'current-line-mask)
-      #:with (value ...) (list #'timeout #'line-set)))
+      #:with (value ...) (list #`'#,(syntax-e #'timeout-value) #'line-set)))
 
   (define-splicing-syntax-class code-block-test-args
     #:attributes ([check 1])

test/analyzer-timeout-test.rkt

@@ -0,0 +1,18 @@
+#lang resyntax/test
+
+
+header:
+------------------------------
+#lang racket/base
+------------------------------
+
+
+test: "timeout parameter can be customized in tests"
+@analyzer-timeout-millis 5000
+- (or 1 (or 2 3))
+- (or 1 2 3)
+
+
+no-change-test: "timeout parameter works with no-change-test"
+@analyzer-timeout-millis 5000
+- (define x 42)