aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar skullY <skullydazed@gmail.com>2019-11-12 17:17:12 -0800
committerGravatar skullydazed <skullydazed@users.noreply.github.com>2019-11-12 18:39:42 -0800
commit5421ba11dedd9912967b1fa5ed1f664687221143 (patch)
tree1c6d133798e7c87aa11fb811f0cc8e3e846741a6
parentb252cce18fd474562510be5fc1e401287d747cd3 (diff)
downloadqmk_firmware-5421ba11dedd9912967b1fa5ed1f664687221143.tar.gz
Add support for newer versions of clang-format, if installed
-rw-r--r--lib/python/qmk/cli/cformat.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/python/qmk/cli/cformat.py b/lib/python/qmk/cli/cformat.py
index d2382bdbd..17ca91b3b 100644
--- a/lib/python/qmk/cli/cformat.py
+++ b/lib/python/qmk/cli/cformat.py
@@ -2,6 +2,7 @@
"""
import os
import subprocess
+from shutil import which
from milc import cli
@@ -11,10 +12,18 @@ from milc import cli
def cformat(cli):
"""Format C code according to QMK's style.
"""
+ # Determine which version of clang-format to use
clang_format = ['clang-format', '-i']
+ for clang_version in [10, 9, 8, 7]:
+ binary = 'clang-format-%d' % clang_version
+ if which(binary):
+ clang_format[0] = binary
+ break
# Find the list of files to format
- if not cli.args.files:
+ if cli.args.files:
+ cli.args.files = [os.path.join(os.environ['ORIG_CWD'], file) for file in cli.args.files]
+ else:
for dir in ['drivers', 'quantum', 'tests', 'tmk_core']:
for dirpath, dirnames, filenames in os.walk(dir):
if 'tmk_core/protocol/usb_hid' in dirpath: