Fix tidy-require handling of non-phase forms (#312)

Closes #306.
jackfirth · Sep 19, 2024 · ac406cf · ac406cf
1 parent 1675e0a
commit ac406cf
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/default-recommendations/require-and-provide-suggestions-test.rkt b/default-recommendations/require-and-provide-suggestions-test.rkt
@@ -97,7 +97,7 @@ test: "require tidying sorts for-syntax before plain"
 ----------------------------------------
 
 
-test: "require tidying should move non-phase spec forms to the end"
+test: "require tidying should move non-phase spec forms after collections"
 ----------------------------------------
 (require (only-in racket/list first)
          (only-in racket/list second)
@@ -110,3 +110,18 @@ test: "require tidying should move non-phase spec forms to the end"
          (only-in racket/list second)
          (prefix-in s: racket/string))
 ----------------------------------------
+
+
+test: "require tidying should move non-phase spec forms before relative paths"
+----------------------------------------
+(require "require-and-provide-suggestions.rkt"
+         (only-in racket/list first)
+         (only-in racket/list second)
+         (prefix-in s: racket/string))
+----------------------------------------
+----------------------------------------
+(require (only-in racket/list first)
+         (only-in racket/list second)
+         (prefix-in s: racket/string)
+         "require-and-provide-suggestions.rkt")
+----------------------------------------
diff --git a/default-recommendations/require-and-provide-suggestions.rkt b/default-recommendations/require-and-provide-suggestions.rkt
@@ -117,7 +117,7 @@
 
 
 (define phase-form<=> (comparator-of-constants 'for-syntax 'for-template 'for-label 'for-meta 'plain))
-(define import-kind<=> (comparator-of-constants 'collection 'file 'other))
+(define import-kind<=> (comparator-of-constants 'collection 'other 'file))
 
 
 (define (false-last<=> cmp)