Author: klimek
Date: Wed Feb 22 03:21:22 2017
New Revision: 295818
URL: http://llvm.org/viewvc/llvm-project?rev=295818&view=rev
Log:
Completion related fixes for clang-include-fixer.el.
1. Quitting inside a process sentinel is not allowed, but the sentinel invokes
completion, where the user is free to hit C-g. By wrapping the call in
with-local-quit, the process sentinel invocation can finish without triggering
an error
2. Invoke completing-read instead of ido-completing-read, since this may
interfere with user customizations to completing-read-function. The user should
use something like ido-ubiquitous if ido completion is wanted
3. Compare the string returned from completion with string=, since it may be a
copy of the original string in the collection
Patch by Torsten Marek.
Modified:
clang-tools-extra/trunk/include-fixer/tool/clang-include-fixer.el
Modified: clang-tools-extra/trunk/include-fixer/tool/clang-include-fixer.el
URL:
http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/include-fixer/tool/clang-include-fixer.el?rev=295818&r1=295817&r2=295818&view=diff
==============================================================================
--- clang-tools-extra/trunk/include-fixer/tool/clang-include-fixer.el (original)
+++ clang-tools-extra/trunk/include-fixer/tool/clang-include-fixer.el Wed Feb
22 03:21:22 2017
@@ -251,25 +251,28 @@ clang-include-fixer to insert the select
(message "Couldn't find header for '%s'"
(let-alist (car .QuerySymbolInfos) .RawIdentifier)))
(t
- ;; Replace the HeaderInfos list by a single header selected by
- ;; the user.
- (clang-include-fixer--select-header context)
- ;; Call clang-include-fixer again to insert the selected header.
- (clang-include-fixer--start
- (let ((old-tick (buffer-chars-modified-tick)))
- (lambda (stdout)
- (when (/= old-tick (buffer-chars-modified-tick))
- ;; Replacing the buffer now would undo the userâs changes.
- (user-error (concat "The buffer has been changed "
- "before the header could be inserted")))
- (clang-include-fixer--replace-buffer stdout)
- (let-alist context
- (let-alist (car .HeaderInfos)
- (run-hook-with-args 'clang-include-fixer-add-include-hook
- (substring .Header 1 -1)
- (string= (substring .Header 0 1) "<"))))))
- (format "-insert-header=%s"
- (clang-include-fixer--encode-json context)))))))
+ ;; Users may C-g in prompts, make sure the process sentinel
+ ;; behaves correctly.
+ (with-local-quit
+ ;; Replace the HeaderInfos list by a single header selected by
+ ;; the user.
+ (clang-include-fixer--select-header context)
+ ;; Call clang-include-fixer again to insert the selected header.
+ (clang-include-fixer--start
+ (let ((old-tick (buffer-chars-modified-tick)))
+ (lambda (stdout)
+ (when (/= old-tick (buffer-chars-modified-tick))
+ ;; Replacing the buffer now would undo the userâs changes.
+ (user-error (concat "The buffer has been changed "
+ "before the header could be inserted")))
+ (clang-include-fixer--replace-buffer stdout)
+ (let-alist context
+ (let-alist (car .HeaderInfos)
+ (run-hook-with-args 'clang-include-fixer-add-include-hook
+ (substring .Header 1 -1)
+ (string= (substring .Header 0 1)
"<"))))))
+ (format "-insert-header=%s"
+ (clang-include-fixer--encode-json context))))))))
nil)
(defun clang-include-fixer--select-header (context)
@@ -305,13 +308,13 @@ They are replaced by the single element
(goto-char (clang-include-fixer--closest-overlay overlays))
(cl-flet ((header (info) (let-alist info .Header)))
;; The header-infos is already sorted by include-fixer.
- (let* ((header (ido-completing-read
+ (let* ((header (completing-read
(clang-include-fixer--format-message
"Select include for '%s': " symbol)
(mapcar #'header .HeaderInfos)
nil :require-match nil
'clang-include-fixer--history))
- (info (cl-find header .HeaderInfos :key #'header)))
+ (info (cl-find header .HeaderInfos :key #'header :test
#'string=)))
(cl-assert info)
(setcar .HeaderInfos info)
(setcdr .HeaderInfos nil))))
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
