Internal/os_clang_format_style_file

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

Internal/os_nvim_init.vim

@@ -26,7 +26,6 @@ call plug#begin(stdpath('config') . '/plugged')
 
     " Lua cache to speed up load times
     Plug 'https://github.com/lewis6991/impatient.nvim'
-    Plug 'https://github.com/ggandor/leap.nvim'
 
     " lsp-zero begin
         " LSP Support
@@ -55,14 +54,12 @@ call plug#end()
 " ==============================================================================
 lua <<EOF
   require('impatient')
-  local leap = require('leap')
-  vim.keymap.set({'n', 'x', 'o'}, 'f', '<Plug>(leap-forward-to)')
-  vim.keymap.set({'n', 'x', 'o'}, 'F', '<Plug>(leap-backward-to)')
 
   -- LSP Setup
   -- ===========================================================================
   local lsp           = require('lsp-zero')
   local devenver_root = vim.fn.getenv('devenver_root')
+  local clang_format_fallback_file = devenver_root .. '/_clang-format'
   lsp.preset('recommended')
   lsp.configure('clangd', {
     cmd = {
@@ -75,6 +72,7 @@ lua <<EOF
       "--clang-tidy",
       "--header-insertion=iwyu",
       "--header-insertion-decorators",
+      "--fallback-style=" .. clang_format_fallback_file,
     }
   })
 

install.py

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