Switch the default mode for clang-format to '-file'. Make 'LLVM' the
fallback syntax used when we fail to find a '.clang-format' file. Adjust
variable names appropriately.
Update the editor integration pieces that specify a '-style' option to
specify it as '-style=file'. I left the functionality in place because
even if the preferred method is to use '.clang-format' files, this way
if someone needs to clobber the style in their editor we show how to do
so in these examples.
Also check in a '.clang-format' file for Clang to ensure that separate
checkouts and builds of Clang from LLVM can still get the nice
formatting. =] This unfortunately required nuking the test for the
absence of a '.clang-format' file as now the directory happening to be
under your clang source tree will cause there to always be a file. ;]
git-svn-id: svn://svn.chromium.org/llvm-project/cfe/trunk/tools/clang-format@189741 0b72dbe1-c17f-4bc7-b9db-2b4152be0356
diff --git a/clang-format-sublime.py b/clang-format-sublime.py
index d41404e..73ff3dc 100644
--- a/clang-format-sublime.py
+++ b/clang-format-sublime.py
@@ -19,9 +19,10 @@
# 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 clang-format -help).
-style = 'LLVM'
+# 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' file to indicate the style that should be used.
+style = 'file'
class ClangFormatCommand(sublime_plugin.TextCommand):
def run(self, edit):