OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

include-fixer: Don't overwrite buffer changes 

Raise a signal if the buffer has been modified before replacing it, to
avoid overwriting users' changes.

Patch by Philipp Stephani.

llvm-svn: 285060
This commit is contained in:
Manuel Klimek 2016-10-25 11:31:22 +00:00
parent 8e5f5ff4c1
commit 63c6989d70
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang-tools-extra/include-fixer/tool/clang-include-fixer.el
View File

@ -244,7 +244,13 @@ clang-include-fixer to insert the selected header."
(clang-include-fixer--select-header context) (clang-include-fixer--select-header context)
;; Call clang-include-fixer again to insert the selected header. ;; Call clang-include-fixer again to insert the selected header.
(clang-include-fixer--start (clang-include-fixer--start
#'clang-include-fixer--replace-buffer (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)))
(format "-insert-header=%s" (format "-insert-header=%s"
(clang-include-fixer--encode-json context))))))) (clang-include-fixer--encode-json context)))))))
nil) nil)