Automated Resyntax fixes (#744)

Co-authored-by: resyntax-ci[bot] <181813515+resyntax-ci[bot]@users.noreply.github.com>
Co-authored-by: Jack Firth <[email protected]>

Author: resyntax-ci[bot]

cli.rkt

@@ -302,10 +302,10 @@ For help on these, use 'analyze --help' or 'fix --help'."
 
   (match (resyntax-analyze-options-output-destination options)
     ['console
-     (printf "resyntax: --- displaying results ---\n")
+     (displayln "resyntax: --- displaying results ---")
      (display-results)]
     [(? path? output-path)
-     (printf "resyntax: --- writing results to file ---\n")
+     (displayln "resyntax: --- writing results to file ---")
      (with-output-to-file output-path display-results #:mode 'text)]))
 
 
@@ -347,7 +347,7 @@ For help on these, use 'analyze --help' or 'fix --help'."
   (define issue-string (if (> total-fixes 1) "issues" "issue"))
   (define file-string (if (> total-files 1) "files" "file"))
   (if (zero? total-fixes)
-      (printf "Resyntax found no issues.\n")
+      (displayln "Resyntax found no issues.")
       (printf "Resyntax fixed ~a ~a in ~a ~a.\n\n" total-fixes issue-string total-files file-string))
   (for ([rule+count (in-list fix-counts-by-rule)])
     (match-define (entry rule count) rule+count)
@@ -358,7 +358,7 @@ For help on these, use 'analyze --help' or 'fix --help'."
 
 
 (define (resyntax-fix-print-plain-text-summary analysis)
-  (printf "resyntax: --- summary ---\n\n")
+  (displayln "resyntax: --- summary ---\n")
   (define total-fixes (resyntax-analysis-total-fixes analysis))
   (define total-files (resyntax-analysis-total-sources-modified analysis))
   (define message
@@ -399,11 +399,11 @@ For help on these, use 'analyze --help' or 'fix --help'."
         (define issue-string (if (> total-fixes 1) "issues" "issue"))
         (define file-string (if (> total-files 1) "files" "file"))
         (if (zero? total-fixes)
-            (printf "Resyntax found no issues.")
+            (display "Resyntax found no issues.")
             (printf "Resyntax fixed ~a ~a in ~a ~a." 
                     total-fixes issue-string total-files file-string))
         (unless (zero? total-fixes)
-          (printf "\n")
+          (newline)
           (for ([rule+count (in-list fix-counts-by-rule)])
             (match-define (entry rule count) rule+count)
             (define occurrence-string (if (> count 1) "occurrences" "occurrence"))

default-recommendations/analyzers/private/expanded-id-table.rkt

@@ -59,11 +59,10 @@
   (define phase (expanded-identifier-phase id))
   (define stx (expanded-identifier-syntax id))
   (define phase-table (hash-ref (expanded-id-table-table table) phase #false))
-  (if phase-table
-      (free-id-table-ref phase-table stx failure-result)
-      (if (procedure? failure-result)
-          (failure-result)
-          failure-result)))
+  (cond
+    [phase-table (free-id-table-ref phase-table stx failure-result)]
+    [(procedure? failure-result) (failure-result)]
+    [else failure-result]))
 
 
 (define (expanded-id-table-set! table id value)

default-recommendations/legacy/legacy-contract-migrations-test.rkt

@@ -103,16 +103,10 @@ test: "flat-contract in contract-out refactorable to predicate"
 
 
 test: "contract-struct refactorable to struct"
-------------------------------
-(contract-struct person (name age))
-==============================
-(struct person (name age))
-------------------------------
+- (contract-struct person (name age))
+- (struct person (name age))
 
 
 test: "define-contract-struct refactorable to struct with extra constructor"
-------------------------------
-(define-contract-struct point (x y))
-==============================
-(struct point (x y) #:extra-constructor-name make-point)
-------------------------------
+- (define-contract-struct point (x y))
+- (struct point (x y) #:extra-constructor-name make-point)

default-recommendations/let-binding-suggestions-test.rkt

@@ -7,11 +7,8 @@ require: resyntax/default-recommendations let-binding-suggestions
 header:
 - #lang racket/base
 test: "named lets which don't refer to the name are refactorable to unnamed lets"
-------------------------------
-(let loop ([x 1]) x)
-==============================
-(let ([x 1]) x)
-------------------------------
+- (let loop ([x 1]) x)
+- (let ([x 1]) x)
 
 
 no-change-test: "named lets which do refer to the name aren't refactorable to unnamed lets"

private/file-group.rkt

@@ -156,7 +156,7 @@
       (check-equal? (single-file-group-ranges group) (range-set (closed-open-range 1 10 #:comparator natural<=>))))
 
     (test-case "file-group-resolve returns single file"
-      (define test-dir (make-temporary-file "resyntax-test-~a" 'directory))
+      (define test-dir (make-temporary-directory "resyntax-test-~a"))
       (define test-file (build-path test-dir "test.rkt"))
       (call-with-output-file test-file
         (λ (out) (displayln "#lang racket/base" out)))
@@ -175,7 +175,7 @@
       (check-equal? (directory-file-group-path group) (simple-form-path "/tmp")))
 
     (test-case "file-group-resolve returns only .rkt files"
-      (define test-dir (make-temporary-file "resyntax-test-~a" 'directory))
+      (define test-dir (make-temporary-directory "resyntax-test-~a"))
       (define rkt-file1 (build-path test-dir "test1.rkt"))
       (define rkt-file2 (build-path test-dir "test2.rkt"))
       (define txt-file (build-path test-dir "test.txt"))
@@ -220,7 +220,7 @@
       (check-equal? (git-repository-file-group-ref group) "HEAD"))
 
     (test-case "file-group-resolve with git repository"
-      (define test-dir (make-temporary-file "resyntax-test-git-~a" 'directory))
+      (define test-dir (make-temporary-directory "resyntax-test-git-~a"))
       (parameterize ([current-directory test-dir])
         (unless (system "git init -q")
           (fail "git init failed"))
@@ -246,7 +246,7 @@
 
   (test-case "file-groups-resolve"
     (test-case "resolves multiple groups into hash"
-      (define test-dir (make-temporary-file "resyntax-test-~a" 'directory))
+      (define test-dir (make-temporary-directory "resyntax-test-~a"))
       (define test-file1 (build-path test-dir "test1.rkt"))
       (define test-file2 (build-path test-dir "test2.rkt"))
       (call-with-output-file test-file1
@@ -263,7 +263,7 @@
       (delete-directory/files test-dir))
 
     (test-case "combines ranges for same file"
-      (define test-dir (make-temporary-file "resyntax-test-~a" 'directory))
+      (define test-dir (make-temporary-directory "resyntax-test-~a"))
       (define test-file (build-path test-dir "test.rkt"))
       (call-with-output-file test-file
         (λ (out) (displayln "#lang racket/base" out)))

private/syntax-delta.rkt

@@ -83,7 +83,7 @@
       [(empty-syntax-path? start) #false]
       [(empty-syntax-path? next-start) #false]
       [(equal? (syntax-path-parent start) (syntax-path-parent next-start))
-       (<= (+ (syntax-path-last-element start)) (syntax-path-last-element next-start))]
+       (<= (syntax-path-last-element start) (syntax-path-last-element next-start))]
       [else #true]))
   (unless disjoint?
     (raise-arguments-error 'syntax-delta "overlapping splices"

private/syntax-path.rkt

@@ -277,19 +277,23 @@
      'string->syntax-path
      "syntax path string must not end with / (except for root path)"
      "given" str))
-  (if (equal? str "/")
-      empty-syntax-path
-      (let* ([parts (string-split (substring str 1) "/")]
-             [numbers (for/list ([part (in-list parts)])
-                        (define num (string->number part))
-                        (unless (and num (exact-nonnegative-integer? num))
-                          (raise-arguments-error
-                           'string->syntax-path
-                           "syntax path string contains invalid element (must be nonnegative integer)"
-                           "given" str
-                           "invalid element" part))
-                        num)])
-        (syntax-path numbers))))
+  (cond
+    [(equal? str "/") empty-syntax-path]
+    [else
+     (define parts (string-split (substring str 1) "/"))
+     (define numbers
+       (for/list ([part (in-list parts)])
+         (define num (string->number part))
+         (unless (and num (exact-nonnegative-integer? num))
+           (raise-arguments-error
+            'string->syntax-path
+            "syntax path string contains invalid element (must be nonnegative integer)"
+            "given"
+            str
+            "invalid element"
+            part))
+         num))
+     (syntax-path numbers)]))
 
 
 (module+ test