From f0a1a55c66c9ad0e5af504907d9558e9d91f30eb Mon Sep 17 00:00:00 2001 From: zimoun Date: Tue, 19 Jan 2021 22:28:10 +0100 Subject: ui: Add hint for command typo. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/ui.scm (command-hint): New variable (run-guix-command): Use it. Signed-off-by: Ludovic Courtès --- guix/ui.scm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'guix/ui.scm') diff --git a/guix/ui.scm b/guix/ui.scm index 45ae14f83c..9cea405456 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -2123,6 +2123,14 @@ Run COMMAND with ARGS.\n")) (define (run-guix-command command . args) "Run COMMAND with the given ARGS. Report an error when COMMAND is not found." + (define (command-hint guess commands) + (define command-names + (map (lambda (command) + (match (command-name command) + ((head tail ...) head))) + commands)) + (string-closest (symbol->string guess) command-names #:threshold 3)) + (define module ;; Check if there is a matching extension. (match (search-path (extension-directories) @@ -2132,9 +2140,13 @@ found." (lambda () (resolve-interface `(guix scripts ,command))) (lambda _ - (format (current-error-port) - (G_ "guix: ~a: command not found~%") command) - (show-guix-usage)))) + (let ((hint (command-hint command (commands)))) + (format (current-error-port) + (G_ "guix: ~a: command not found~%") command) + (when hint + (display-hint (format #f (G_ "Did you mean @code{~a}?") + hint))) + (show-guix-usage))))) (file (load file) (resolve-interface `(guix extensions ,command))))) -- cgit v1.2.3