[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#18048: 24.3.92; [patch] eldoc improvements
From: |
Thierry Volpiatto |
Subject: |
bug#18048: 24.3.92; [patch] eldoc improvements |
Date: |
Tue, 19 Aug 2014 07:39:39 +0200 |
Stefan Monnier <monnier@IRO.UMontreal.CA> writes:
> I also installed your &key handling patch, thanks.
Thanks, however this patch doesn't handle things like:
--8<---------------cut here---------------start------------->8---
(define-ibuffer-op 1 2 "" :interactive t :mark 'foo :dangerous t :modifier-p t
(foo))
^^^^^
or
(cl-multiple-value-bind (a b c) '(1 2 3) (+ a b c))
--8<---------------cut here---------------end--------------->8---
This patch is fixing it:
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 0b8304a..c2d3c98 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -371,7 +371,11 @@ or elsewhere, return a 1-line docstring."
In the absence of INDEX, just call `eldoc-docstring-format-sym-doc'."
(let ((start nil)
(end 0)
- (argument-face 'eldoc-highlight-function-argument))
+ (argument-face 'eldoc-highlight-function-argument)
+ (args-lst (mapcar (lambda (x)
+ (replace-regexp-in-string
+ "\\`[(]\\|[)]\\'" "" x))
+ (split-string args))))
;; Find the current argument in the argument string. We need to
;; handle `&rest' and informal `...' properly.
;;
@@ -385,23 +389,53 @@ In the absence of INDEX, just call
`eldoc-docstring-format-sym-doc'."
;; position in ARGS based on this current arg.
(when (string-match "&key" args)
(let* (case-fold-search
+ key-have-value
+ (sym-name (symbol-name sym))
(cur-w (current-word))
+ (args-lst-ak (cdr (member "&key" args-lst)))
(limit (save-excursion
- (when (re-search-backward (symbol-name sym) nil t)
+ (when (re-search-backward sym-name nil t)
(match-end 0))))
- (cur-a (if (string-match ":\\([^ ()]*\\)" cur-w)
+ (cur-a (if (and cur-w (string-match ":\\([^ ()]*\\)" cur-w))
(substring cur-w 1)
(save-excursion
- (when (re-search-backward ":\\([^ ()\n]*\\)" limit t)
- (match-string 1))))))
- ;; If `cur-a' is nil probably cursor is on a positional arg
- ;; before `&key', in this case, exit this block and determine
- ;; position with `index'.
- (when (and cur-a
- (string-match (concat "\\_<" (upcase cur-a) "\\_>") args))
- (setq index nil ; Skip next block based on positional args.
- start (match-beginning 0)
- end (match-end 0)))))
+ (let (split)
+ (when (re-search-backward ":\\([^()\n]*\\)" limit t)
+ (setq split (split-string (match-string 1) " " t))
+ (prog1 (car split)
+ (when (cdr split)
+ (setq key-have-value t))))))))
+ ;; If `cur-a' is not one of `args-lst-ak'
+ ;; assume user is entering an unknow key
+ ;; referenced in last position in signature.
+ (other-key-arg (and (stringp cur-a)
+ args-lst-ak
+ (not (member (upcase cur-a) args-lst-ak))
+ (upcase (car (last args-lst-ak))))))
+ (unless (string= cur-w sym-name)
+ ;; The last keyword have already a value
+ ;; i.e :foo a b and cursor is at b.
+ ;; If signature have also `&rest'
+ ;; (assume it is after the `&key' section)
+ ;; go to the arg after `&rest'.
+ (if (and key-have-value
+ (save-excursion
+ (not (re-search-forward ":.*" (point-at-eol) t)))
+ (string-match "&rest \\([^ ()]*\\)" args))
+ (setq index nil ; Skip next block based on positional args.
+ start (match-beginning 1)
+ end (match-end 1))
+ ;; If `cur-a' is nil probably cursor is on a positional arg
+ ;; before `&key', in this case, exit this block and determine
+ ;; position with `index'.
+ (when (and cur-a ; A keyword arg (dot removed) or nil.
+ (or (string-match
+ (concat "\\_<" (upcase cur-a) "\\_>") args)
+ (string-match
+ (concat "\\_<" other-key-arg "\\_>") args)))
+ (setq index nil ; Skip next block based on positional args.
+ start (match-beginning 0)
+ end (match-end 0)))))))
;; Handle now positional arguments.
(while (and index (>= index 1))
(if (string-match "[^ ()]+" args end)
@@ -412,13 +446,16 @@ In the absence of INDEX, just call
`eldoc-docstring-format-sym-doc'."
(cond ((string= argument "&rest")
;; All the rest arguments are the same.
(setq index 1))
- ((string= argument "&optional")) ; Skip.
+ ((string= argument "&optional")) ; Skip.
((string= argument "&allow-other-keys")) ; Skip.
;; Back to index 0 in ARG1 ARG2 ARG2 ARG3 etc...
;; like in `setq'.
- ((or (string-match-p "\\.\\.\\.$" argument)
- (and (string-match-p "\\.\\.\\.)?$" args)
- (> index 1) (cl-oddp index)))
+ ((or (and (string-match-p "\\.\\.\\.$" argument)
+ (string= argument (car (last args-lst))))
+ (and (string-match-p "\\.\\.\\.$"
+ (substring args 1 (1- (length
args))))
+ (= (length (remove "..." args-lst)) 2)
+ (> index 1) (oddp index)))
(setq index 0))
(t
(setq index (1- index))))))
--
Thierry
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997