[ClangFormat] Editor integrations inherit default style from clang-format binary

[sammccall]

Summary

This allows downstream customizations to the default style to work without
needing to also modify the editor integrations.

[ilya-biryukov]

tools/clang-format/clang-format-sublime.py

35

Should we remove '-style ', style elements from the list here?

[sammccall]

Thanks, good catch!

[sammccall]

Remove one last -style flag.

[ilya-biryukov]

LGTM

tools/clang-format/clang-format-sublime.py

 
 # Change this to the full path if clang-format is not on the path.
 binary = 'clang-format'
 
 # Change this to format according to other formatting styles. See the output of
 # 'clang-format --help' for a list of supported styles. The default looks for
 # a '.clang-format' or '_clang-format' file to indicate the style that should be
 # used.
-style = 'file'
+style = None
 
 class ClangFormatCommand(sublime_plugin.TextCommand):
   def run(self, edit):
     encoding = self.view.encoding()
     if encoding == 'Undefined':
       encoding = 'utf-8'
     regions = []
     command = [binary, '-style', style]
+    if style:
+      command.extend(['-style', style])
     for region in self.view.sel():
       regions.append(region)
       region_offset = min(region.a, region.b)
       region_length = abs(region.b - region.a)
       command.extend(['-offset', str(region_offset),
                       '-length', str(region_length),
                       '-assume-filename', str(self.view.file_name())])
     old_viewport_position = self.view.viewport_position()

tools/clang-format/clang-format-test.el

"))
     (pcase-exhaustive call-process-args
       (`((,start ,end ,_program ,delete (,_stdout ,_stderr) ,display . ,args))
        (should-not start)
        (should-not end)
        (should-not delete)
        (should-not display)
        (should (equal args
                       '("-output-replacements-xml" "-assume-filename" "foo.cpp"
-                        "-style" "file"
                         ;; Beginning of buffer, no byte-order mark.
                         "-offset" "0"
                         ;; We have two lines with 2×2!bytes for the umlauts,
                         ;; 1!byte for the line ending, and 3!bytes for the
                         ;; other ASCII characters each.
                         "-length" "16"
                         ;; Length of a single line (without line ending).
                         "-cursor" "7")))))))

tools/clang-format/clang-format.el

(or (executable-find "clang-format")
       "clang-format")
   "Location of the clang-format executable.
 
 A string containing the name or the full path of the executable."
   :group 'clang-format
   :type '(file :must-match t)
   :risky t)
 
-(defcustom clang-format-style "file"
+(defcustom clang-format-style nil
   "Style argument to pass to clang-format.
 
 By default clang-format will load the style configuration from
 a file named .clang-format located in one of the parent directories
 of the buffer."
   :group 'clang-format
-  :type 'string
+  :type '(choice (string) (const nil))
   :safe #'stringp)
 (make-variable-buffer-local 'clang-format-style)
 
 (defun clang-format--extract (xml-node)
   "Extract replacements and cursor information from XML-NODE."
   (unless (and (listp xml-node) (eq (xml-node-name xml-node) 'replacements))
     (error "Expected <replacements> node"))
   (let ((nodes (xml-node-children xml-node))
(unwind-protect
                              `("-output-replacements-xml"
                                ;; Guard against a nil assume-file-name.
                                ;; If the clang-format option -assume-filename
                                ;; is given a blank string it will crash as per
                                ;; the following bug report
                                ;; https://bugs.llvm.org/show_bug.cgi?id=34667
                                ,@(and assume-file-name
                                       (list "-assume-filename" assume-file-name))
-                               "-style" ,style
+                               ,@(and style (list "-style" style))
                                "-offset" ,(number-to-string file-start)
                                "-length" ,(number-to-string (- file-end file-start))
                                "-cursor" ,(number-to-string cursor))))
               (stderr (with-temp-buffer
                         (unless (zerop (cadr (insert-file-contents temp-file)))
                           (insert ": "))
                         (buffer-substring-no-properties
                          (point-min) (line-end-position)))))

tools/clang-format/clang-format.py

 binary = 'clang-format'
 if vim.eval('exists("g:clang_format_path")') == "1":
   binary = vim.eval('g:clang_format_path')
 
 # Change this to format according to other formatting styles. See the output of
 # 'clang-format --help' for a list of supported styles. The default looks for
 # a '.clang-format' or '_clang-format' file to indicate the style that should be
 # used.
-style = 'file'
+style = None
 fallback_style = None
 if vim.eval('exists("g:clang_format_fallback_style")') == "1":
   fallback_style = vim.eval('g:clang_format_fallback_style')
 
 def get_buffer(encoding):
   if platform.python_version_tuple()[0] == '3':
     return vim.current.buffer
   return [ line.decode(encoding) for line in vim.current.buffer ]
def main():
   # Avoid flashing an ugly, ugly cmd prompt on Windows when invoking clang-format.
   startupinfo = None
   if sys.platform.startswith('win32'):
     startupinfo = subprocess.STARTUPINFO()
     startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
     startupinfo.wShowWindow = subprocess.SW_HIDE
 
   # Call formatter.
-  command = [binary, '-style', style, '-cursor', str(cursor)]
+  command = [binary, '-cursor', str(cursor)]
   if lines != ['-lines', 'all']:
     command += lines
+  if style:
+    command.extend(['-style', style])
   if fallback_style:
     command.extend(['-fallback-style', fallback_style])
   if vim.current.buffer.name:
     command.extend(['-assume-filename', vim.current.buffer.name])
   p = subprocess.Popen(command,
                        stdout=subprocess.PIPE, stderr=subprocess.PIPE,
                        stdin=subprocess.PIPE, startupinfo=startupinfo)
   stdout, stderr = p.communicate(input=text.encode(encoding))