Add support for newer versions of clang-format, if installed
This commit is contained in:
		@@ -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:
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user