Update clang format style

This commit is contained in:
doyle 2023-10-14 11:00:06 +11:00
parent ec672bbbf4
commit e234c42507
2 changed files with 22 additions and 15 deletions

View File

@ -1,8 +1,7 @@
--- Language: Cpp
IndentWidth: 4 IndentWidth: 4
TabWidth: 4 TabWidth: 4
---
Language: Cpp
# Align parameters on the open bracket, e.g.: # Align parameters on the open bracket, e.g.:
# someLongFunction(argument1, # someLongFunction(argument1,
@ -27,10 +26,10 @@ AlignArrayOfStructures: Left
# int d = 3; # int d = 3;
# /* A comment. */ # /* A comment. */
# double e = 4; # double e = 4;
AlignConsecutiveAssignments: Consecutive AlignConsecutiveAssignments: Consecutive
AlignConsecutiveBitFields: Consecutive AlignConsecutiveBitFields: Consecutive
AlignConsecutiveDeclarations: Consecutive AlignConsecutiveDeclarations: Consecutive
AlignConsecutiveMacros: Consecutive AlignConsecutiveMacros: Consecutive
# Align escaped newlines as far left as possible. # Align escaped newlines as far left as possible.
# #define A \ # #define A \
@ -135,7 +134,7 @@ AlwaysBreakTemplateDeclarations: MultiLine
# aaaaaaaaaaaaaaaaaaaa, # aaaaaaaaaaaaaaaaaaaa,
# aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa); # aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);
# } # }
BinPackArguments: false BinPackArguments: false
BinPackParameters: false # As BinPackArguments but for function definition parameters BinPackParameters: false # As BinPackArguments but for function definition parameters
# Add space after the : only (space may be added before if needed for # Add space after the : only (space may be added before if needed for
@ -197,7 +196,7 @@ BreakInheritanceList: AfterComma
# "ryVeryVeryVeryVeryVery" # "ryVeryVeryVeryVeryVery"
# "VeryLongString"; # "VeryLongString";
BreakStringLiterals: true BreakStringLiterals: true
ColumnLimit: 100 ColumnLimit: 0
# false: # false:
# namespace Foo { # namespace Foo {
@ -328,6 +327,10 @@ NamespaceIndentation: None
PackConstructorInitializers: CurrentLine PackConstructorInitializers: CurrentLine
PointerAlignment: Right PointerAlignment: Right
# Different ways to arrange specifiers and qualifiers (e.g. const/volatile).
QualifierAlignment: Custom
QualifierOrder: ['inline', 'static', 'type', 'const', 'volatile']
# false: # false:
# // veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongComment with plenty of information # // veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongComment with plenty of information
# /* second veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongComment with plenty of information */ # /* second veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongComment with plenty of information */

View File

@ -381,22 +381,26 @@ pause
internal_dir = pathlib.Path(os.path.dirname(os.path.abspath(__file__))) / "Internal" internal_dir = pathlib.Path(os.path.dirname(os.path.abspath(__file__))) / "Internal"
if is_windows: if is_windows:
devenver.print_header("Use LLVM utils script to slim installation size") devenver.print_header("Use LLVM utils script to slim installation size")
install_dir_set = set() llvm_install_dir_set = set()
for entry in installed_dev_apps["LLVM"]: for entry in installed_dev_apps["LLVM"]:
install_dir = entry['install_dir'] llvm_install_dir_set.add(entry['install_dir'])
install_dir_set.add(install_dir)
llvm_script_src_path = internal_dir / "win_llvm-link-ad01970-2022-08-29.bat" llvm_script_src_path = internal_dir / "win_llvm-link-ad01970-2022-08-29.bat"
for install_dir in install_dir_set: for llvm_install_dir in llvm_install_dir_set:
llvm_script_dest_path = install_dir / "llvm-link.bat" llvm_script_dest_path = llvm_install_dir / "llvm-link.bat"
shutil.copy(llvm_script_src_path, llvm_script_dest_path) shutil.copy(llvm_script_src_path, llvm_script_dest_path)
subprocess.run(llvm_script_dest_path, cwd=install_dir) subprocess.run(llvm_script_dest_path, cwd=llvm_install_dir)
os.remove(llvm_script_dest_path) os.remove(llvm_script_dest_path)
# Install left-overs # Install left-overs
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
devenver.print_header("Install configuration files") devenver.print_header("Install configuration files")
shutil.copy(internal_dir / "os_clang_format_style_file", install_dir / "_clang-format")
# ClangFormat
clang_format_src_path = internal_dir / "os_clang_format_style_file"
clang_format_dest_path = install_dir / "_clang-format"
devenver.lprint(f"Copying clang-format file from {clang_format_src_path} to {clang_format_dest_path}")
shutil.copy(clang_format_src_path, clang_format_dest_path)
# Copy init.vim to NVIM directory # Copy init.vim to NVIM directory
nvim_init_dir = "" nvim_init_dir = ""