diff options
author | Daniel Jasper <djasper@google.com> | 2015-05-10 07:47:19 +0000 |
---|---|---|
committer | Daniel Jasper <djasper@google.com> | 2015-05-10 07:47:19 +0000 |
commit | 622c72ded5df46eb6a705cb6fbfc0e680294a590 (patch) | |
tree | 4cc0d55f016fbd76f9d05eceacd5cd3bfeb337d4 /clang/tools | |
parent | ee33c49ade47ea24f0d26d86456632a664efe069 (diff) | |
download | bcm5719-llvm-622c72ded5df46eb6a705cb6fbfc0e680294a590.tar.gz bcm5719-llvm-622c72ded5df46eb6a705cb6fbfc0e680294a590.zip |
Reapply r236854 and fixed r236867.
Makes emacs show a different message when clang-format encountered a
syntax error.
llvm-svn: 236943
Diffstat (limited to 'clang/tools')
-rw-r--r-- | clang/tools/clang-format/ClangFormat.cpp | 14 | ||||
-rw-r--r-- | clang/tools/clang-format/clang-format.el | 17 |
2 files changed, 21 insertions, 10 deletions
diff --git a/clang/tools/clang-format/ClangFormat.cpp b/clang/tools/clang-format/ClangFormat.cpp index fe7d678852d..5037e901f3b 100644 --- a/clang/tools/clang-format/ClangFormat.cpp +++ b/clang/tools/clang-format/ClangFormat.cpp @@ -225,14 +225,18 @@ static bool format(StringRef FileName) { FormatStyle FormatStyle = getStyle( Style, (FileName == "-") ? AssumeFilename : FileName, FallbackStyle); - tooling::Replacements Replaces = reformat(FormatStyle, Sources, ID, Ranges); + bool IncompleteFormat = false; + tooling::Replacements Replaces = + reformat(FormatStyle, Sources, ID, Ranges, &IncompleteFormat); if (OutputXML) { - llvm::outs() - << "<?xml version='1.0'?>\n<replacements xml:space='preserve'>\n"; + llvm::outs() << "<?xml version='1.0'?>\n<replacements " + "xml:space='preserve' incomplete_format='" + << (IncompleteFormat ? "true" : "false") << "'>\n"; if (Cursor.getNumOccurrences() != 0) llvm::outs() << "<cursor>" << tooling::shiftedCodePosition(Replaces, Cursor) << "</cursor>\n"; + for (tooling::Replacements::const_iterator I = Replaces.begin(), E = Replaces.end(); I != E; ++I) { @@ -254,7 +258,9 @@ static bool format(StringRef FileName) { } else { if (Cursor.getNumOccurrences() != 0) outs() << "{ \"Cursor\": " - << tooling::shiftedCodePosition(Replaces, Cursor) << " }\n"; + << tooling::shiftedCodePosition(Replaces, Cursor) + << ", \"IncompleteFormat\": " + << (IncompleteFormat ? "true" : "false") << " }\n"; Rewrite.getEditBuffer(ID).write(outs()); } } diff --git a/clang/tools/clang-format/clang-format.el b/clang/tools/clang-format/clang-format.el index add2436bbe7..ca461444e22 100644 --- a/clang/tools/clang-format/clang-format.el +++ b/clang/tools/clang-format/clang-format.el @@ -61,6 +61,7 @@ of the buffer." (unless (and (listp xml-node) (eq (xml-node-name xml-node) 'replacements)) (error "Expected <replacements> node")) (let ((nodes (xml-node-children xml-node)) + (incomplete-format (xml-get-attribute xml-node 'incomplete_format)) replacements cursor) (dolist (node nodes) @@ -89,7 +90,7 @@ of the buffer." (and (= (car a) (car b)) (> (cadr a) (cadr b))))))) - (cons replacements cursor))) + (list replacements cursor (string= incomplete-format "true")))) (defun clang-format--replace (offset length &optional text) (let ((start (byte-to-position (1+ offset))) @@ -142,20 +143,24 @@ is no active region. If no style is given uses `clang-format-style'." ((stringp status) (error "(clang-format killed by signal %s%s)" status stderr)) ((not (equal 0 status)) - (error "(clang-format failed with code %d%s)" status stderr)) - (t (message "(clang-format succeeded%s)" stderr))) + (error "(clang-format failed with code %d%s)" status stderr))) (with-current-buffer temp-buffer (setq operations (clang-format--extract (car (xml-parse-region))))) - (let ((replacements (car operations)) - (cursor (cdr operations))) + (let ((replacements (nth 0 operations)) + (cursor (nth 1 operations)) + (incomplete-format (nth 2 operations))) (save-excursion (mapc (lambda (rpl) (apply #'clang-format--replace rpl)) replacements)) (when cursor - (goto-char (byte-to-position (1+ cursor)))))) + (goto-char (byte-to-position (1+ cursor)))) + (message "%s" incomplete-format) + (if incomplete-format + (message "(clang-format: incomplete (syntax errors)%s)" stderr) + (message "(clang-format: success%s)" stderr)))) (delete-file temp-file) (when (buffer-name temp-buffer) (kill-buffer temp-buffer))))) |