[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#45893] [PATCH v3 2/3] guix: scripts: Add hint for option typo.
From: |
zimoun |
Subject: |
[bug#45893] [PATCH v3 2/3] guix: scripts: Add hint for option typo. |
Date: |
Tue, 19 Jan 2021 22:28:09 +0100 |
* guix/scripts.scm (option-hint): New procedure.
(parse-command-line): Add 'option-hint'.
---
guix/scripts.scm | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/guix/scripts.scm b/guix/scripts.scm
index 34cba35401..e997edbb6d 100644
--- a/guix/scripts.scm
+++ b/guix/scripts.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -112,6 +113,13 @@ procedure, but both the category and synopsis are meant to
be read (parsed) by
doc
body ...)))))
+(define (option-hint guess options)
+ "Return the closest long-name OPTIONS from GUESS,
+according to'string-distance'."
+ (define (options->long-names options)
+ (filter string? (append-map option-names options)))
+ (string-closest guess (options->long-names options) #:threshold 3))
+
(define (args-fold* args options unrecognized-option-proc operand-proc . seeds)
"A wrapper on top of `args-fold' that does proper user-facing error
reporting."
@@ -149,7 +157,11 @@ parameter of 'args-fold'."
;; Actual parsing takes place here.
(apply args-fold* args options
(lambda (opt name arg . rest)
- (leave (G_ "~A: unrecognized option~%") name))
+ (let ((hint (option-hint name options)))
+ (when hint
+ (display-hint
+ (format #f (G_ "Do you mean @code{~a}?~%") hint)))
+ (leave (G_ "~A: unrecognized option~%") name)))
argument-handler
seeds))
--
2.29.2
- [bug#45893] [PATCH 0/2] DRAFT: Hint for options., (continued)
- [bug#45893] Hint for package name: too slow!, zimoun, 2021/01/19
- [bug#45893] Hint for package name: full matrix iteration, zimoun, 2021/01/20
- [bug#45893] [PATCH 0/2] DRAFT: Hint for options., Ludovic Courtès, 2021/01/26
- [bug#45893] [PATCH 0/2] DRAFT: Hint for options., zimoun, 2021/01/26
- [bug#45893] [PATCH 0/2] DRAFT: Hint for options., Ludovic Courtès, 2021/01/27
- [bug#45893] [PATCH v2 2/3] guix: scripts: Add hint for option typo., zimoun, 2021/01/15
- [bug#45893] [PATCH 0/2] DRAFT: Hint for options., Ludovic Courtès, 2021/01/19
[bug#45893] [PATCH v3 1/3] utils: Add string distance., zimoun, 2021/01/19