From 55001b7da0305e5537ac67e26e4692d6fe731600 Mon Sep 17 00:00:00 2001 From: "resyntax-ci[bot]" <181813515+resyntax-ci[bot]@users.noreply.github.com> Date: Sun, 15 Dec 2024 00:11:03 +0000 Subject: [PATCH 1/5] Fix 6 occurrences of `tidy-require` Keep imports in `require` sorted and grouped by phase, with collections before files. --- drracket/browser/browser.rkt | 12 ++++++------ drracket/browser/external.rkt | 6 +++--- drracket/browser/htmltext.rkt | 18 +++++++++--------- drracket/browser/tool.rkt | 4 ++-- drracket/drracket/drracket.rkt | 4 +++- drracket/drracket/sprof.rkt | 6 +++--- 6 files changed, 26 insertions(+), 24 deletions(-) diff --git a/drracket/browser/browser.rkt b/drracket/browser/browser.rkt index 0a86c066f..3c2b67abe 100644 --- a/drracket/browser/browser.rkt +++ b/drracket/browser/browser.rkt @@ -1,12 +1,12 @@ #lang racket -(require racket/unit - racket/gui - mred/mred-sig - setup/plt-installer-sig - setup/plt-installer +(require mred/mred-sig net/tcp-sig - net/url-sig net/url + net/url-sig + racket/gui + racket/unit + setup/plt-installer + setup/plt-installer-sig "browser-sig.rkt" "browser-unit.rkt") diff --git a/drracket/browser/external.rkt b/drracket/browser/external.rkt index 2fba81299..33044a82a 100644 --- a/drracket/browser/external.rkt +++ b/drracket/browser/external.rkt @@ -1,12 +1,12 @@ #lang racket/base - (require string-constants - racket/gui + (require net/url racket/class racket/file + racket/gui racket/list racket/match + string-constants (prefix-in raw: net/sendurl) - net/url (prefix-in fw: framework)) (provide send-url (rename-out [raw:browser-preference? browser-preference?]) diff --git a/drracket/browser/htmltext.rkt b/drracket/browser/htmltext.rkt index a56820477..2e9baf82b 100644 --- a/drracket/browser/htmltext.rkt +++ b/drracket/browser/htmltext.rkt @@ -1,16 +1,16 @@ #lang racket/base -(require racket/unit - racket/class - "browser-sig.rkt" - "private/sig.rkt" - "private/html.rkt" - "private/bullet.rkt" +(require browser/external + mred/mred-sig + mred/mred-unit net/url net/url-sig + racket/class racket/gui/base - mred/mred-unit - mred/mred-sig - browser/external) + racket/unit + "browser-sig.rkt" + "private/bullet.rkt" + "private/html.rkt" + "private/sig.rkt") (define-unit-from-context url@ url^) diff --git a/drracket/browser/tool.rkt b/drracket/browser/tool.rkt index 40d350d79..24e94d1f1 100644 --- a/drracket/browser/tool.rkt +++ b/drracket/browser/tool.rkt @@ -1,7 +1,7 @@ #lang racket -(require (only-in "external.rkt" install-help-browser-preference-panel) +(require drracket/tool racket/unit - drracket/tool) + (only-in "external.rkt" install-help-browser-preference-panel)) (provide tool@) ;; to add a preference pannel to drracket that sets the browser preference diff --git a/drracket/drracket/drracket.rkt b/drracket/drracket/drracket.rkt index bb2c621c4..92864fc7e 100644 --- a/drracket/drracket/drracket.rkt +++ b/drracket/drracket/drracket.rkt @@ -1,5 +1,7 @@ #lang racket/base -(require racket/gui/base "private/key.rkt" "private/compiled-dir.rkt") +(require racket/gui/base + "private/compiled-dir.rkt" + "private/key.rkt") (module test racket/base) diff --git a/drracket/drracket/sprof.rkt b/drracket/drracket/sprof.rkt index 0f5062686..58cce6bed 100644 --- a/drracket/drracket/sprof.rkt +++ b/drracket/drracket/sprof.rkt @@ -1,7 +1,7 @@ #lang racket/base -(require racket/gui/base - framework - racket/class) +(require framework + racket/class + racket/gui/base) ;; how long between samples (define pause-time 0.1) From 6de7f1ef43ff96e6b1269cac2fac6be898f01d3b Mon Sep 17 00:00:00 2001 From: "resyntax-ci[bot]" <181813515+resyntax-ci[bot]@users.noreply.github.com> Date: Sun, 15 Dec 2024 00:11:03 +0000 Subject: [PATCH 2/5] Fix 9 occurrences of `let-to-define` Internal definitions are recommended instead of `let` expressions, to reduce nesting. --- drracket/browser/external.rkt | 383 +++++++++++++++++---------------- drracket/drracket/drracket.rkt | 30 ++- drracket/drracket/sprof.rkt | 44 ++-- 3 files changed, 230 insertions(+), 227 deletions(-) diff --git a/drracket/browser/external.rkt b/drracket/browser/external.rkt index 33044a82a..573b4ab00 100644 --- a/drracket/browser/external.rkt +++ b/drracket/browser/external.rkt @@ -40,10 +40,11 @@ ;; sync-current-proxy-servers : proxy-pref -> void ;; syncs current-proxy-servers parameter with the proxy-pref-val (define (sync-current-proxy-servers pref-val) - (let* ([ops (current-proxy-servers)] - [removed (remove-all-proxies "http" ops)]) - (current-proxy-servers - (if pref-val (cons pref-val removed) removed)))) + (define ops (current-proxy-servers)) + (define removed (remove-all-proxies "http" ops)) + (current-proxy-servers (if pref-val + (cons pref-val removed) + removed))) (define (remove-all-proxies scheme proxies) (filter (lambda (x) (and (pair? x) (not (equal? (car x) scheme)))) @@ -94,38 +95,37 @@ ;; and in that case, the user can choose to use the internal ;; broswer. (define (choose-browser url) - (let* ([title (string-constant choose-browser)] - [d (make-object dialog% title)] - [main-pane (make-object vertical-pane% d)] - [internal-ok? (not url)] - [ok? #f] - [orig-external (fw:preferences:get 'external-browser)]) - (make-object message% title main-pane) - ;; No need to show the URL (it can be very long) - ;; (when url - ;; (make-object message% (format "URL: ~a" url) main-pane)) - (let-values ([(panel callbacks) (make-help-browser-preference-panel internal-ok? #f (lambda (f) (f main-pane)))]) - (let*-values ([(button-pane) (instantiate horizontal-panel% (main-pane) - (alignment '(right center)))] - [(ok-button cancel-button) - (fw:gui-utils:ok/cancel-buttons - button-pane - (lambda (b e) (set! ok? #t) (send d show #f)) - (lambda (b e) - (fw:preferences:set 'external-browser orig-external) - (send d show #f)))] - [(enable-button) (lambda (_n _v) - (queue-callback - (lambda () - (send ok-button enable (fw:preferences:get 'external-browser)))))]) - (send ok-button enable #f) - (set! callbacks - (cons - (fw:preferences:add-callback 'external-browser enable-button) - callbacks))) - (send d show #t) - (map (lambda (f) (f)) callbacks) - ok?))) + (define title (string-constant choose-browser)) + (define d (make-object dialog% title)) + (define main-pane (make-object vertical-pane% d)) + (define internal-ok? (not url)) + (define ok? #f) + (define orig-external (fw:preferences:get 'external-browser)) + (make-object message% title main-pane) + ;; No need to show the URL (it can be very long) + ;; (when url + ;; (make-object message% (format "URL: ~a" url) main-pane)) + (define-values (panel callbacks) + (make-help-browser-preference-panel internal-ok? #f (lambda (f) (f main-pane)))) + (let*-values ([(button-pane) (instantiate horizontal-panel% (main-pane) + [alignment '(right center)])] + [(ok-button cancel-button) (fw:gui-utils:ok/cancel-buttons + button-pane + (lambda (b e) + (set! ok? #t) + (send d show #f)) + (lambda (b e) + (fw:preferences:set 'external-browser orig-external) + (send d show #f)))] + [(enable-button) + (lambda (_n _v) + (queue-callback + (lambda () (send ok-button enable (fw:preferences:get 'external-browser)))))]) + (send ok-button enable #f) + (set! callbacks (cons (fw:preferences:add-callback 'external-browser enable-button) callbacks))) + (send d show #t) + (map (lambda (f) (f)) callbacks) + ok?) (define panel-installed? #f) (define prefs-panel #f) @@ -140,11 +140,11 @@ (lambda (f) (fw:preferences:add-panel (string-constant browser) (lambda (parent) - (let-values ([(panel cbs) (f parent)]) - (set! prefs-panel panel) - (map (lambda (f) (f panel)) additions) - (set! additions null) - panel))))))) + (define-values (panel cbs) (f parent)) + (set! prefs-panel panel) + (map (lambda (f) (f panel)) additions) + (set! additions null) + panel)))))) (define (add-to-browser-prefs-panel proc) (if prefs-panel @@ -155,150 +155,157 @@ (mk (lambda (parent) (define callbacks null) - (let ([pref-panel (instantiate vertical-panel% () - [parent parent] - [alignment '(left center)])]) - - ;; -------------------- external browser for Unix -------------------- - (when (unix-browser?) - (unless synchronized? - ;; Keep 'external-browser in sync - (fw:preferences:add-callback 'external-browser - (lambda (name browser) - (try-put-preferences (list 'external-browser) (list browser))))) - - (letrec ([v-panel (instantiate group-box-panel% () - (parent pref-panel) - (alignment '(right center)) - (stretchable-height #f) - (label (string-constant external-browser-choice-title)))] - [h-panel (instantiate horizontal-panel% () - (parent v-panel) - (alignment '(center bottom)))] - [none-index (length raw:unix-browser-list)] - [custom-index (add1 none-index)] - [r (instantiate radio-box% () - (label #f) - (choices (append unix-browser-names - (list (string-constant no-browser) - (string-constant browser-command-line-label)))) - (parent h-panel) - (callback - (lambda (radio event) - (let ([n (send radio get-selection)]) - (set-browser! - (cond - [(= n none-index) #f] - [(= n custom-index) (get-custom)] - [else (list-ref raw:unix-browser-list n)]))))))] - [select-custom - (lambda (_ __) - (send r set-selection custom-index) - (set-browser! (get-custom)))] - [get-custom - (lambda () (cons (send pre get-value) (send post get-value)))] - [template-panel (instantiate horizontal-panel% (h-panel) - (spacing 0) - (stretchable-height #f))] - [pre (instantiate text-field% () - (label #f) (parent template-panel) (callback select-custom) - (horiz-margin 0))] - [mess (instantiate message% () (label "") (parent template-panel) - (horiz-margin 0))] - [post (instantiate text-field% () - (label #f) (parent template-panel) (callback select-custom) - (horiz-margin 0))] - [note1 (instantiate message% ((string-constant browser-cmdline-expl-line-1) - v-panel))] - [note2 (instantiate message% ((string-constant browser-cmdline-expl-line-2) - v-panel))] - [refresh-controls (lambda (pref) - (if (pair? pref) - (begin - (send r set-selection custom-index) - (send pre set-value (car pref)) - (send post set-value (cdr pref))) - (let init ([x raw:unix-browser-list] [n 0]) - (cond - [(null? x) (send r set-selection n)] - [else (if (eq? pref (car x)) - (send r set-selection n) - (init (cdr x) (add1 n)))]))))]) - - (unless ask-later? - (send r enable none-index #f)) - - (refresh-controls (fw:preferences:get 'external-browser)) - (set! callbacks - (cons (fw:preferences:add-callback 'external-browser - (lambda (name browser) (refresh-controls browser))) - callbacks)))) - - ;; -------------------- proxy for doc downloads -------------------- - (when set-help? - (letrec ([p (instantiate group-box-panel% () - [label (string-constant http-proxy)] - [parent pref-panel] - [stretchable-height #f] - [alignment '(left top)])] - [rb (make-object radio-box% - #f (list (string-constant proxy-direct-connection) - (string-constant proxy-use-proxy)) - p - (lambda (r e) - (let ([proxy? (= 1 (send r get-selection))]) - (send proxy-spec enable proxy?) - (if proxy? - (update-proxy) - (fw:preferences:set http-proxy-preference #f)))))] - [proxy-spec (instantiate horizontal-panel% (p) - [stretchable-width #f] - [stretchable-height #f] - [alignment '(left center)])] - [update-proxy (lambda () - (let ([host (send host get-value)] - [port (send port get-value)]) - (let ([ok? (and (regexp-match? #rx"^[-0-9a-zA-Z.]+$" host) - (regexp-match? #rx"^[0-9]+$" port) - (string->number port) - (<= 1 (string->number port) 65535))]) - (when ok? - (fw:preferences:set - http-proxy-preference - (list "http" host (string->number port)))) - (send bad-host show (not ok?)))))] - [host (make-object text-field% - (string-constant proxy-host) - proxy-spec (lambda (x y) (update-proxy)) - "www.someplacethatisaproxy.domain.com")] - [port (make-object text-field% - (string-constant proxy-port) - proxy-spec (lambda (x y) (update-proxy)) "65535")] - [bad-host (make-object message% - (string-constant proxy-bad-host) - p)] - [update-gui - (lambda (proxy-val) - (send bad-host show #f) - (if proxy-val - (begin - (send rb set-selection 1) - (send proxy-spec enable #t) - (unless (string=? (cadr proxy-val) (send host get-value)) - (send host set-value (cadr proxy-val))) - (unless (equal? (caddr proxy-val) (string->number (send port get-value))) - (send port set-value (number->string (caddr proxy-val))))) - (begin - (send rb set-selection 0) - (send proxy-spec enable #f) - (send host set-value "") - (send port set-value ""))))]) - - (fw:preferences:add-callback http-proxy-preference - (lambda (name val) - (update-gui val))) - (update-gui (fw:preferences:get http-proxy-preference)) - (send bad-host show #f))) - - (set! synchronized? #t) - (values pref-panel callbacks))))) + (define pref-panel + (instantiate vertical-panel% () + [parent parent] + [alignment '(left center)])) + + ;; -------------------- external browser for Unix -------------------- + (when (unix-browser?) + (unless synchronized? + ;; Keep 'external-browser in sync + (fw:preferences:add-callback + 'external-browser + (lambda (name browser) (try-put-preferences (list 'external-browser) (list browser))))) + + (letrec + ([v-panel (instantiate group-box-panel% () + [parent pref-panel] + [alignment '(right center)] + [stretchable-height #f] + [label (string-constant external-browser-choice-title)])] + [h-panel (instantiate horizontal-panel% () + [parent v-panel] + [alignment '(center bottom)])] + [none-index (length raw:unix-browser-list)] + [custom-index (add1 none-index)] + [r (instantiate radio-box% () + [label #f] + [choices + (append unix-browser-names + (list (string-constant no-browser) + (string-constant browser-command-line-label)))] + [parent h-panel] + [callback + (lambda (radio event) + (let ([n (send radio get-selection)]) + (set-browser! (cond + [(= n none-index) #f] + [(= n custom-index) (get-custom)] + [else (list-ref raw:unix-browser-list n)]))))])] + [select-custom (lambda (_ __) + (send r set-selection custom-index) + (set-browser! (get-custom)))] + [get-custom (lambda () (cons (send pre get-value) (send post get-value)))] + [template-panel (instantiate horizontal-panel% (h-panel) + [spacing 0] + [stretchable-height #f])] + [pre (instantiate text-field% () + [label #f] + [parent template-panel] + [callback select-custom] + [horiz-margin 0])] + [mess (instantiate message% () + [label ""] + [parent template-panel] + [horiz-margin 0])] + [post (instantiate text-field% () + [label #f] + [parent template-panel] + [callback select-custom] + [horiz-margin 0])] + [note1 (instantiate message% ((string-constant browser-cmdline-expl-line-1) v-panel))] + [note2 (instantiate message% ((string-constant browser-cmdline-expl-line-2) v-panel))] + [refresh-controls (lambda (pref) + (if (pair? pref) + (begin + (send r set-selection custom-index) + (send pre set-value (car pref)) + (send post set-value (cdr pref))) + (let init ([x raw:unix-browser-list] + [n 0]) + (cond + [(null? x) (send r set-selection n)] + [else + (if (eq? pref (car x)) + (send r set-selection n) + (init (cdr x) + (add1 n)))]))))]) + + (unless ask-later? + (send r enable none-index #f)) + + (refresh-controls (fw:preferences:get 'external-browser)) + (set! callbacks + (cons (fw:preferences:add-callback 'external-browser + (lambda (name browser) + (refresh-controls browser))) + callbacks)))) + + ;; -------------------- proxy for doc downloads -------------------- + (when set-help? + (letrec ([p (instantiate group-box-panel% () + [label (string-constant http-proxy)] + [parent pref-panel] + [stretchable-height #f] + [alignment '(left top)])] + [rb (make-object radio-box% + #f + (list (string-constant proxy-direct-connection) + (string-constant proxy-use-proxy)) + p + (lambda (r e) + (let ([proxy? (= 1 (send r get-selection))]) + (send proxy-spec enable proxy?) + (if proxy? + (update-proxy) + (fw:preferences:set http-proxy-preference #f)))))] + [proxy-spec (instantiate horizontal-panel% (p) + [stretchable-width #f] + [stretchable-height #f] + [alignment '(left center)])] + [update-proxy (lambda () + (let ([host (send host get-value)] + [port (send port get-value)]) + (let ([ok? (and (regexp-match? #rx"^[-0-9a-zA-Z.]+$" host) + (regexp-match? #rx"^[0-9]+$" port) + (string->number port) + (<= 1 (string->number port) 65535))]) + (when ok? + (fw:preferences:set http-proxy-preference + (list "http" host (string->number port)))) + (send bad-host show (not ok?)))))] + [host (make-object text-field% + (string-constant proxy-host) + proxy-spec + (lambda (x y) (update-proxy)) + "www.someplacethatisaproxy.domain.com")] + [port (make-object text-field% + (string-constant proxy-port) + proxy-spec + (lambda (x y) (update-proxy)) + "65535")] + [bad-host (make-object message% (string-constant proxy-bad-host) p)] + [update-gui (lambda (proxy-val) + (send bad-host show #f) + (if proxy-val + (begin + (send rb set-selection 1) + (send proxy-spec enable #t) + (unless (string=? (cadr proxy-val) (send host get-value)) + (send host set-value (cadr proxy-val))) + (unless (equal? (caddr proxy-val) + (string->number (send port get-value))) + (send port set-value (number->string (caddr proxy-val))))) + (begin + (send rb set-selection 0) + (send proxy-spec enable #f) + (send host set-value "") + (send port set-value ""))))]) + + (fw:preferences:add-callback http-proxy-preference (lambda (name val) (update-gui val))) + (update-gui (fw:preferences:get http-proxy-preference)) + (send bad-host show #f))) + + (set! synchronized? #t) + (values pref-panel callbacks)))) diff --git a/drracket/drracket/drracket.rkt b/drracket/drracket/drracket.rkt index 92864fc7e..8cf648c13 100644 --- a/drracket/drracket/drracket.rkt +++ b/drracket/drracket/drracket.rkt @@ -26,17 +26,15 @@ (flush-output)) (define (run-trace-thread) - (let ([evt (make-log-receiver (current-logger) 'info)]) - (void - (thread - (λ () - (let loop () - (define vec (sync evt)) - (define str (vector-ref vec 1)) - (when (regexp-match #rx"^cm: *compil(ing|ed)" str) - (display str) - (newline)) - (loop))))))) + (define evt (make-log-receiver (current-logger) 'info)) + (void (thread (λ () + (let loop () + (define vec (sync evt)) + (define str (vector-ref vec 1)) + (when (regexp-match #rx"^cm: *compil(ing|ed)" str) + (display str) + (newline)) + (loop)))))) (cond [debugging? @@ -148,11 +146,11 @@ ;; it creates a new custodian and installs it, but the ;; original eventspace was created on the original custodian ;; and this code does not create a new eventspace. - (let ([orig-cust (current-custodian)] - [orig-eventspace (current-eventspace)] - [new-cust (make-custodian)]) - (current-custodian new-cust) - ((dynamic-require 'drracket/private/profile-drs 'start-profile) orig-cust))) + (define orig-cust (current-custodian)) + (current-eventspace) + (define new-cust (make-custodian)) + (current-custodian new-cust) + ((dynamic-require 'drracket/private/profile-drs 'start-profile) orig-cust)) (dynamic-require 'drracket/private/drracket-normal #f) diff --git a/drracket/drracket/sprof.rkt b/drracket/drracket/sprof.rkt index 58cce6bed..d3c5f8c15 100644 --- a/drracket/drracket/sprof.rkt +++ b/drracket/drracket/sprof.rkt @@ -14,22 +14,20 @@ (define traces-table (make-hash)) (let loop ([i 0]) (sleep pause-time) - (let ([new-traces - (map (λ (t) (continuation-mark-set->context (continuation-marks t))) - (get-threads))]) - (for-each - (λ (trace) - (for-each - (λ (line) - (hash-set! traces-table line (cons trace (hash-ref traces-table line '())))) - trace)) - new-traces) - (cond - [(zero? i) - (update-gui traces-table) - (loop update-frequency)] - [else - (loop (- i 1))])))))) + (define new-traces + (map (λ (t) (continuation-mark-set->context (continuation-marks t))) (get-threads))) + (for-each (λ (trace) + (for-each (λ (line) + (hash-set! traces-table + line + (cons trace (hash-ref traces-table line '())))) + trace)) + new-traces) + (cond + [(zero? i) + (update-gui traces-table) + (loop update-frequency)] + [else (loop (- i 1))]))))) (define (format-fn-name i) (let ([id (car i)] @@ -76,8 +74,8 @@ (send t end-edit-sequence)) (define (format-percentage n) - (let ([trunc (floor (* n 100))]) - (format "~a%" (pad3 trunc)))) + (define trunc (floor (* n 100))) + (format "~a%" (pad3 trunc))) (define (pad3 n) (cond @@ -187,11 +185,11 @@ (define/public (open-current-pr) (when clicked-srcloc-pr - (let ([src (cdr clicked-srcloc-pr)]) - (when (path? (srcloc-source src)) - (printf "open ~s\n" (srcloc-source src)) - (when (number? (srcloc-position src)) - (printf "go to ~s\n" (srcloc-position src))))))) + (define src (cdr clicked-srcloc-pr)) + (when (path? (srcloc-source src)) + (printf "open ~s\n" (srcloc-source src)) + (when (number? (srcloc-position src)) + (printf "go to ~s\n" (srcloc-position src)))))) (define/private (update-info-editor pr) (send vp change-children (λ (l) (if pr (list ec1 lp) (list ec1)))) From 4fa8e97d2f769c489293d828063382617d3dc04d Mon Sep 17 00:00:00 2001 From: "resyntax-ci[bot]" <181813515+resyntax-ci[bot]@users.noreply.github.com> Date: Sun, 15 Dec 2024 00:11:03 +0000 Subject: [PATCH 3/5] Fix 2 occurrences of `cond-let-to-cond-define` Internal definitions are recommended instead of `let` expressions, to reduce nesting. --- drracket/drracket/drracket.rkt | 16 ++++++++-------- drracket/drracket/sprof.rkt | 20 ++++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drracket/drracket/drracket.rkt b/drracket/drracket/drracket.rkt index 8cf648c13..8ec755401 100644 --- a/drracket/drracket/drracket.rkt +++ b/drracket/drracket/drracket.rkt @@ -57,14 +57,14 @@ (run-trace-thread)))] [install-cm? (flprintf "PLTDRCM: loading compilation manager\n") - (let ([make-compilation-manager-load/use-compiled-handler - (parameterize ([current-namespace (make-base-empty-namespace)]) - (dynamic-require 'compiler/cm 'make-compilation-manager-load/use-compiled-handler))]) - (flprintf "PLTDRCM: installing compilation manager\n") - (current-load/use-compiled (make-compilation-manager-load/use-compiled-handler)) - (when cm-trace? - (flprintf "PLTDRCM: enabling CM tracing\n") - (run-trace-thread)))] + (define make-compilation-manager-load/use-compiled-handler + (parameterize ([current-namespace (make-base-empty-namespace)]) + (dynamic-require 'compiler/cm 'make-compilation-manager-load/use-compiled-handler))) + (flprintf "PLTDRCM: installing compilation manager\n") + (current-load/use-compiled (make-compilation-manager-load/use-compiled-handler)) + (when cm-trace? + (flprintf "PLTDRCM: enabling CM tracing\n") + (run-trace-thread))] [first-parallel? (flprintf "PLTDRPAR: loading compilation manager\n") (define tools? (not (getenv "PLTNOTOOLS"))) diff --git a/drracket/drracket/sprof.rkt b/drracket/drracket/sprof.rkt index d3c5f8c15..90a74269b 100644 --- a/drracket/drracket/sprof.rkt +++ b/drracket/drracket/sprof.rkt @@ -108,16 +108,16 @@ (define/override (on-event event) (cond [(send event button-up? 'left) - (let ([admin (get-admin)]) - (when admin - (let ([dc (send admin get-dc)]) - (let-values ([(x y) (dc-location-to-editor-location (send event get-x) - (send event get-y))]) - (let* ([loc (find-position x y)] - [para (position-paragraph loc)]) - (set! clicked-srcloc-pr (and (<= 0 para (last-paragraph)) - (car (list-ref gui-display-data para)))) - (update-gui-display))))))] + (define admin (get-admin)) + (when admin + (let ([dc (send admin get-dc)]) + (let-values ([(x y) (dc-location-to-editor-location (send event get-x) + (send event get-y))]) + (let* ([loc (find-position x y)] + [para (position-paragraph loc)]) + (set! clicked-srcloc-pr + (and (<= 0 para (last-paragraph)) (car (list-ref gui-display-data para)))) + (update-gui-display)))))] [else (void)])) (define/public (set-gui-display-data/refresh traces-table) From 1cb20672177687811bafb5b44e2020808c0f6c8f Mon Sep 17 00:00:00 2001 From: "resyntax-ci[bot]" <181813515+resyntax-ci[bot]@users.noreply.github.com> Date: Sun, 15 Dec 2024 00:11:03 +0000 Subject: [PATCH 4/5] Fix 2 occurrences of `map-to-for` This `map` operation can be replaced with a `for/list` loop. --- drracket/browser/external.rkt | 5 ++--- drracket/drracket/drracket.rkt | 24 +++++++++++------------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/drracket/browser/external.rkt b/drracket/browser/external.rkt index 573b4ab00..ac98248e2 100644 --- a/drracket/browser/external.rkt +++ b/drracket/browser/external.rkt @@ -85,9 +85,8 @@ (loop (add1 tries))))))) (define unix-browser-names - (map (lambda (s) - (string-titlecase (regexp-replace* #rx"-" (symbol->string s) " "))) - raw:unix-browser-list)) + (for/list ([s (in-list raw:unix-browser-list)]) + (string-titlecase (regexp-replace* #rx"-" (symbol->string s) " ")))) ;; : (U str #f) -> (U symbol #f) ;; to prompt the user for a browser preference diff --git a/drracket/drracket/drracket.rkt b/drracket/drracket/drracket.rkt index 8ec755401..7b2762ee5 100644 --- a/drracket/drracket/drracket.rkt +++ b/drracket/drracket/drracket.rkt @@ -90,19 +90,17 @@ (define (tool-files id) (apply append - (map - (λ (x) - (define proc (get-info/full x)) - (if proc - (map (λ (dirs) - (apply build-path - x - (if (list? dirs) - dirs - (list dirs)))) - (proc id (λ () '()))) - '())) - (find-relevant-directories (list id))))) + (for/list ([x (in-list (find-relevant-directories (list id)))]) + (define proc (get-info/full x)) + (if proc + (map (λ (dirs) + (apply build-path + x + (if (list? dirs) + dirs + (list dirs)))) + (proc id (λ () '()))) + '())))) (define make-compilation-manager-load/use-compiled-handler (parameterize ([current-namespace (make-base-empty-namespace)]) From 2d4d23a1a47c3f70669d3b0763ae39a621661b1b Mon Sep 17 00:00:00 2001 From: "resyntax-ci[bot]" <181813515+resyntax-ci[bot]@users.noreply.github.com> Date: Sun, 15 Dec 2024 00:11:03 +0000 Subject: [PATCH 5/5] Fix 1 occurrence of `provide/contract-to-contract-out` The `provide/contract` form is a legacy form made obsolete by `contract-out`. --- drracket-test/tests/drracket/private/repl-test.rkt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drracket-test/tests/drracket/private/repl-test.rkt b/drracket-test/tests/drracket/private/repl-test.rkt index 1f3ec2624..ccf01c10a 100644 --- a/drracket-test/tests/drracket/private/repl-test.rkt +++ b/drracket-test/tests/drracket/private/repl-test.rkt @@ -18,7 +18,7 @@ This produces an ACK message mred framework) -(provide/contract [run-test (-> (listof (or/c 'raw 'debug 'debug/profile 'misc)) any)]) +(provide (contract-out [run-test (-> (listof (or/c 'raw 'debug 'debug/profile 'misc)) any)])) (define-struct loc (line col offset)) ;; loc = (make-loc number number number)