summaryrefslogtreecommitdiff
path: root/lisp/help.el
diff options
context:
space:
mode:
authorNoam Postavsky <npostavs@gmail.com>2018-03-10 18:12:55 -0500
committerNoam Postavsky <npostavs@gmail.com>2019-11-28 18:10:07 -0500
commitb2790db049da98b541d07bac21ca7d7c220d3be0 (patch)
tree61aba17be4946bf84dc0dd57b1d7157b88725c83 /lisp/help.el
parent85f586f3ce5c6d9598d345440fd57e0fc9b8d98b (diff)
downloademacs-b2790db049da98b541d07bac21ca7d7c220d3be0.tar.gz
Improve errors & warnings due to fancy quoted vars (Bug#32939)
Add some hints to the message for byte compiler free & unused variable warnings, and 'void-variable' errors where the variable has confusable quote characters in it. * lisp/help.el (uni-confusables), uni-confusables-regexp): New constants. (help-command-error-confusable-suggestions): New function, added to `command-error-function'. (help-uni-confusable-suggestions): New function. * lisp/emacs-lisp/bytecomp.el (byte-compile-variable-ref): * lisp/emacs-lisp/cconv.el (cconv--analyze-use): Use it. * lisp/emacs-lisp/lisp-mode.el (lisp--match-confusable-symbol-character): New function. (lisp-fdefs): Use it to fontify confusable characters with font-lock-warning-face when they occur in symbol names. * doc/lispref/modes.texi (Faces for Font Lock): * doc/lispref/objects.texi (Basic Char Syntax): Recommend backslash escaping of confusable characters, and mention new fontification. * etc/NEWS: Announce the new fontification behavior. * test/lisp/emacs-lisp/lisp-mode-tests.el (lisp-fontify-confusables): New test.
Diffstat (limited to 'lisp/help.el')
-rw-r--r--lisp/help.el49
1 files changed, 49 insertions, 0 deletions
diff --git a/lisp/help.el b/lisp/help.el
index 604a365957c..8bb942abf4f 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1508,6 +1508,55 @@ the same names as used in the original source code, when possible."
(help--docstring-quote (format "%S" (help--make-usage fn arglist)))))
+
+;; Just some quote-like characters for now. TODO: generate this stuff
+;; from official Unicode data.
+(defconst uni-confusables
+ '((#x2018 . "'") ;; LEFT SINGLE QUOTATION MARK
+ (#x2019 . "'") ;; RIGHT SINGLE QUOTATION MARK
+ (#x201B . "'") ;; SINGLE HIGH-REVERSED-9 QUOTATION MARK
+ (#x201C . "\"") ;; LEFT DOUBLE QUOTATION MARK
+ (#x201D . "\"") ;; RIGHT DOUBLE QUOTATION MARK
+ (#x201F . "\"") ;; DOUBLE HIGH-REVERSED-9 QUOTATION MARK
+ (#x301E . "\"") ;; DOUBLE PRIME QUOTATION MARK
+ (#xFF02 . "'") ;; FULLWIDTH QUOTATION MARK
+ (#xFF07 . "'") ;; FULLWIDTH APOSTROPHE
+ ))
+
+(defconst uni-confusables-regexp
+ (concat "[" (mapcar #'car uni-confusables) "]"))
+
+(defun help-uni-confusable-suggestions (string)
+ "Return a message describing confusables in STRING."
+ (let ((i 0)
+ (confusables nil))
+ (while (setq i (string-match uni-confusables-regexp string i))
+ (let ((replacement (alist-get (aref string i) uni-confusables)))
+ (push (aref string i) confusables)
+ (setq string (replace-match replacement t t string))
+ (setq i (+ i (length replacement)))))
+ (when confusables
+ (format-message
+ (if (> (length confusables) 1)
+ "Found confusable characters: %s; perhaps you meant: `%s'?"
+ "Found confusable character: %s, perhaps you meant: `%s'?")
+ (mapconcat (lambda (c) (format-message "`%c'" c))
+ confusables ", ")
+ string))))
+
+(defun help-command-error-confusable-suggestions (data _context _signal)
+ (pcase data
+ (`(void-variable ,var)
+ (let ((suggestions (help-uni-confusable-suggestions
+ (symbol-name var))))
+ (when suggestions
+ (princ (concat "\n " suggestions) t))))
+ (_ nil)))
+
+(add-function :after command-error-function
+ #'help-command-error-confusable-suggestions)
+
+
(provide 'help)
;;; help.el ends here