From 89d82638ab2b01d9d07cd25e36e0374f5eb83c95 Mon Sep 17 00:00:00 2001 From: "Dustin L. Howett" Date: Mon, 2 Feb 2026 13:45:11 -0600 Subject: [PATCH] Use the version of clang-format that comes with Visual Studio (#19821) This pull request also (necessarily) reformats the code to match the current version. Visual Studio 2022 17.14 comes with Clang 19's `clang-format`. --- .../ShellExtension/OpenTerminalHere.h | 2 +- src/cascadia/TerminalApp/DebugTapConnection.h | 2 +- .../TerminalApp/MarkdownPaneContent.h | 2 +- src/cascadia/TerminalApp/TaskbarState.cpp | 2 +- .../TerminalConnection/CTerminalHandoff.h | 2 +- src/cascadia/TerminalControl/HwndTerminal.cpp | 2 +- .../MediaResourceSupport.h | 4 ++-- .../UnitTests_Control/MockConnection.h | 2 +- src/host/conddkrefs.h | 10 ++++---- src/host/exe/CConsoleHandoff.h | 2 +- src/host/ntprivapi.cpp | 2 +- src/inc/til/rle.h | 6 ++--- src/interactivity/win32/windowdpiapi.hpp | 8 +++---- src/propsheet/console.h | 2 +- src/propsheet/font.h | 2 +- src/propsheet/fontdlg.h | 2 +- src/renderer/atlas/BackendD3D.cpp | 4 ++-- src/terminal/adapter/termDispatch.hpp | 4 ++-- .../parser/ft_fuzzer/fuzzing_directed.h | 2 +- src/terminal/parser/ft_fuzzer/fuzzing_logic.h | 4 ++-- tools/OpenConsole.psm1 | 23 ++++++------------- tools/packages.config | 4 ---- 22 files changed, 40 insertions(+), 53 deletions(-) delete mode 100644 tools/packages.config diff --git a/src/cascadia/ShellExtension/OpenTerminalHere.h b/src/cascadia/ShellExtension/OpenTerminalHere.h index de5d088643..af35469738 100644 --- a/src/cascadia/ShellExtension/OpenTerminalHere.h +++ b/src/cascadia/ShellExtension/OpenTerminalHere.h @@ -34,7 +34,7 @@ struct #else // DEV __declspec(uuid("52065414-e077-47ec-a3ac-1cc5455e1b54")) #endif - OpenTerminalHere : public RuntimeClass, IExplorerCommand, IObjectWithSite> + OpenTerminalHere : public RuntimeClass, IExplorerCommand, IObjectWithSite> { #pragma region IExplorerCommand STDMETHODIMP Invoke(IShellItemArray* psiItemArray, diff --git a/src/cascadia/TerminalApp/DebugTapConnection.h b/src/cascadia/TerminalApp/DebugTapConnection.h index 57dfbe4572..191b56eb6f 100644 --- a/src/cascadia/TerminalApp/DebugTapConnection.h +++ b/src/cascadia/TerminalApp/DebugTapConnection.h @@ -13,7 +13,7 @@ namespace winrt::Microsoft::TerminalApp::implementation { public: explicit DebugTapConnection(Microsoft::Terminal::TerminalConnection::ITerminalConnection wrappedConnection); - void Initialize(const Windows::Foundation::Collections::ValueSet& /*settings*/){}; + void Initialize(const Windows::Foundation::Collections::ValueSet& /*settings*/) {}; ~DebugTapConnection(); void Start(); void WriteInput(const winrt::array_view data); diff --git a/src/cascadia/TerminalApp/MarkdownPaneContent.h b/src/cascadia/TerminalApp/MarkdownPaneContent.h index e8fa4cb0ce..5f91b982f1 100644 --- a/src/cascadia/TerminalApp/MarkdownPaneContent.h +++ b/src/cascadia/TerminalApp/MarkdownPaneContent.h @@ -25,7 +25,7 @@ namespace winrt::TerminalApp::implementation #pragma region IPaneContent winrt::Windows::UI::Xaml::FrameworkElement GetRoot(); - void UpdateSettings(const winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings&){}; + void UpdateSettings(const winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings&) {}; winrt::Windows::Foundation::Size MinimumSize() { return { 1, 1 }; }; void Focus(winrt::Windows::UI::Xaml::FocusState reason = winrt::Windows::UI::Xaml::FocusState::Programmatic) { reason; }; diff --git a/src/cascadia/TerminalApp/TaskbarState.cpp b/src/cascadia/TerminalApp/TaskbarState.cpp index 183460556c..ef9c34a75d 100644 --- a/src/cascadia/TerminalApp/TaskbarState.cpp +++ b/src/cascadia/TerminalApp/TaskbarState.cpp @@ -9,7 +9,7 @@ namespace winrt::TerminalApp::implementation { // Default to unset, 0%. TaskbarState::TaskbarState() : - TaskbarState(0, 0){}; + TaskbarState(0, 0) {}; TaskbarState::TaskbarState(const uint64_t dispatchTypesState, const uint64_t progressParam) : _State{ dispatchTypesState }, diff --git a/src/cascadia/TerminalConnection/CTerminalHandoff.h b/src/cascadia/TerminalConnection/CTerminalHandoff.h index 004b3f5274..beb957b66e 100644 --- a/src/cascadia/TerminalConnection/CTerminalHandoff.h +++ b/src/cascadia/TerminalConnection/CTerminalHandoff.h @@ -31,7 +31,7 @@ Author(s): using NewHandoffFunction = HRESULT (*)(HANDLE* in, HANDLE* out, HANDLE signal, HANDLE reference, HANDLE server, HANDLE client, const TERMINAL_STARTUP_INFO* startupInfo); struct __declspec(uuid(__CLSID_CTerminalHandoff)) - CTerminalHandoff : public Microsoft::WRL::RuntimeClass, ITerminalHandoff3> +CTerminalHandoff : public Microsoft::WRL::RuntimeClass, ITerminalHandoff3> { #pragma region ITerminalHandoff STDMETHODIMP EstablishPtyHandoff(HANDLE* in, HANDLE* out, HANDLE signal, HANDLE reference, HANDLE server, HANDLE client, const TERMINAL_STARTUP_INFO* startupInfo) override; diff --git a/src/cascadia/TerminalControl/HwndTerminal.cpp b/src/cascadia/TerminalControl/HwndTerminal.cpp index f4cfb967ae..2c792e81c7 100644 --- a/src/cascadia/TerminalControl/HwndTerminal.cpp +++ b/src/cascadia/TerminalControl/HwndTerminal.cpp @@ -958,7 +958,7 @@ void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR font for (size_t tableIndex = 0; tableIndex < 16; tableIndex++) { // It's using gsl::at to check the index is in bounds, but the analyzer still calls this array-to-pointer-decay - GSL_SUPPRESS(bounds .3) + GSL_SUPPRESS(bounds.3) renderSettings.SetColorTableEntry(tableIndex, gsl::at(theme.ColorTable, tableIndex)); } diff --git a/src/cascadia/TerminalSettingsModel/MediaResourceSupport.h b/src/cascadia/TerminalSettingsModel/MediaResourceSupport.h index 4546801f7a..1f7d213162 100644 --- a/src/cascadia/TerminalSettingsModel/MediaResourceSupport.h +++ b/src/cascadia/TerminalSettingsModel/MediaResourceSupport.h @@ -10,14 +10,14 @@ Licensed under the MIT license. struct __declspec(uuid("6068ee1b-1ea0-4804-993a-42ef0c58d867")) - IMediaResourceContainer : public IUnknown + IMediaResourceContainer : public IUnknown { virtual void ResolveMediaResources(const winrt::Microsoft::Terminal::Settings::Model::MediaResourceResolver& resolver) = 0; }; struct __declspec(uuid("9f11361c-7c8f-45c9-8948-36b66d67eca8")) - IPathlessMediaResourceContainer : public IUnknown + IPathlessMediaResourceContainer : public IUnknown { virtual void ResolveMediaResourcesWithBasePath(const winrt::hstring& basePath, const winrt::Microsoft::Terminal::Settings::Model::MediaResourceResolver& resolver) = 0; }; diff --git a/src/cascadia/UnitTests_Control/MockConnection.h b/src/cascadia/UnitTests_Control/MockConnection.h index a0878ecd4c..add50e84e2 100644 --- a/src/cascadia/UnitTests_Control/MockConnection.h +++ b/src/cascadia/UnitTests_Control/MockConnection.h @@ -14,7 +14,7 @@ namespace ControlUnitTests public: MockConnection() noexcept = default; - void Initialize(const winrt::Windows::Foundation::Collections::ValueSet& /*settings*/){}; + void Initialize(const winrt::Windows::Foundation::Collections::ValueSet& /*settings*/) {}; void Start() noexcept {}; void WriteInput(const winrt::array_view data) { diff --git a/src/host/conddkrefs.h b/src/host/conddkrefs.h index 854d03e808..7271865eee 100644 --- a/src/host/conddkrefs.h +++ b/src/host/conddkrefs.h @@ -47,11 +47,11 @@ public: #define _RTL_CONSTANT_STRING_remove_const_macro(s) \ (const_cast<_RTL_CONSTANT_STRING_remove_const_template_class::T*>(s)) -#define RTL_CONSTANT_STRING(s) \ - { \ - sizeof(s) - sizeof((s)[0]), \ - sizeof(s) / sizeof(_RTL_CONSTANT_STRING_type_check(s)), \ - _RTL_CONSTANT_STRING_remove_const_macro(s) \ +#define RTL_CONSTANT_STRING(s) \ + { \ + sizeof(s) - sizeof((s)[0]), \ + sizeof(s) / sizeof(_RTL_CONSTANT_STRING_type_check(s)), \ + _RTL_CONSTANT_STRING_remove_const_macro(s) \ } } diff --git a/src/host/exe/CConsoleHandoff.h b/src/host/exe/CConsoleHandoff.h index 095fb728f0..69d4676ffb 100644 --- a/src/host/exe/CConsoleHandoff.h +++ b/src/host/exe/CConsoleHandoff.h @@ -31,7 +31,7 @@ Author(s): using namespace Microsoft::WRL; struct __declspec(uuid(__CLSID_CConsoleHandoff)) - CConsoleHandoff : public RuntimeClass, IConsoleHandoff, IDefaultTerminalMarker> +CConsoleHandoff : public RuntimeClass, IConsoleHandoff, IDefaultTerminalMarker> { #pragma region IConsoleHandoff STDMETHODIMP EstablishHandoff(HANDLE server, diff --git a/src/host/ntprivapi.cpp b/src/host/ntprivapi.cpp index 0b8793299f..f1b57cf218 100644 --- a/src/host/ntprivapi.cpp +++ b/src/host/ntprivapi.cpp @@ -58,7 +58,7 @@ namespace if (hNtDll != nullptr) { - typedef NTSTATUS (*PfnNtOpenProcess)(HANDLE ProcessHandle, ACCESS_MASK DesiredAccess, POBJECT_ATTRIBUTES ObjectAttributes, CLIENT_ID * ClientId); + typedef NTSTATUS (*PfnNtOpenProcess)(HANDLE ProcessHandle, ACCESS_MASK DesiredAccess, POBJECT_ATTRIBUTES ObjectAttributes, CLIENT_ID* ClientId); static auto pfn = (PfnNtOpenProcess)GetProcAddress(hNtDll, "NtOpenProcess"); diff --git a/src/inc/til/rle.h b/src/inc/til/rle.h index b91b11b8a3..1452684684 100644 --- a/src/inc/til/rle.h +++ b/src/inc/til/rle.h @@ -251,17 +251,17 @@ namespace til // Terminal Implementation Library. Also: "Today I Learned" rle_pair(rle_pair&&) = default; rle_pair& operator=(rle_pair&&) = default; - constexpr rle_pair(const T& value, const S& length) noexcept(std::is_nothrow_copy_constructible_v&& std::is_nothrow_copy_constructible_v) : + constexpr rle_pair(const T& value, const S& length) noexcept(std::is_nothrow_copy_constructible_v && std::is_nothrow_copy_constructible_v) : value(value), length(length) { } - constexpr rle_pair(T&& value, S&& length) noexcept(std::is_nothrow_constructible_v&& std::is_nothrow_constructible_v) : + constexpr rle_pair(T&& value, S&& length) noexcept(std::is_nothrow_constructible_v && std::is_nothrow_constructible_v) : value(std::forward(value)), length(std::forward(length)) { } - constexpr void swap(rle_pair& other) noexcept(std::is_nothrow_swappable_v&& std::is_nothrow_swappable_v) + constexpr void swap(rle_pair& other) noexcept(std::is_nothrow_swappable_v && std::is_nothrow_swappable_v) { if (this != std::addressof(other)) { diff --git a/src/interactivity/win32/windowdpiapi.hpp b/src/interactivity/win32/windowdpiapi.hpp index f64bc00b63..4944a8e783 100644 --- a/src/interactivity/win32/windowdpiapi.hpp +++ b/src/interactivity/win32/windowdpiapi.hpp @@ -31,16 +31,16 @@ typedef enum DPI_AWARENESS DPI_AWARENESS_PER_MONITOR_AWARE = 2 } DPI_AWARENESS; -#define DPI_AWARENESS_CONTEXT_UNAWARE ((DPI_AWARENESS_CONTEXT)-1) -#define DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ((DPI_AWARENESS_CONTEXT)-2) -#define DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ((DPI_AWARENESS_CONTEXT)-3) +#define DPI_AWARENESS_CONTEXT_UNAWARE ((DPI_AWARENESS_CONTEXT) - 1) +#define DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ((DPI_AWARENESS_CONTEXT) - 2) +#define DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ((DPI_AWARENESS_CONTEXT) - 3) #endif // This type is being defined in RS2 but is percolating through the // tree. Def it here if it hasn't collided with our branch yet. #ifndef DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 -#define DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 ((DPI_AWARENESS_CONTEXT)-4) +#define DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 ((DPI_AWARENESS_CONTEXT) - 4) #endif namespace Microsoft::Console::Interactivity::Win32 diff --git a/src/propsheet/console.h b/src/propsheet/console.h index ef15b4f374..986765a643 100644 --- a/src/propsheet/console.h +++ b/src/propsheet/console.h @@ -175,7 +175,7 @@ void Undo(HWND hControlWindow); // // Macros // -#define AttrToRGB(Attr) (gpStateInfo->ColorTable[(Attr)&0x0F]) +#define AttrToRGB(Attr) (gpStateInfo->ColorTable[(Attr) & 0x0F]) #define ScreenTextColor(pStateInfo) \ (AttrToRGB(LOBYTE(pStateInfo->ScreenAttributes) & 0x0F)) #define ScreenBkColor(pStateInfo) \ diff --git a/src/propsheet/font.h b/src/propsheet/font.h index d9d0b2d21e..d15c4e8817 100644 --- a/src/propsheet/font.h +++ b/src/propsheet/font.h @@ -72,7 +72,7 @@ typedef struct tagFACENODE #pragma warning(pop) -#define TM_IS_TT_FONT(x) (((x)&TMPF_TRUETYPE) == TMPF_TRUETYPE) +#define TM_IS_TT_FONT(x) (((x) & TMPF_TRUETYPE) == TMPF_TRUETYPE) #define IS_BOLD(w) ((w) >= FW_SEMIBOLD) #define SIZE_EQUAL(s1, s2) (((s1).X == (s2).X) && ((s1).Y == (s2).Y)) #define POINTS_PER_INCH 72 diff --git a/src/propsheet/fontdlg.h b/src/propsheet/fontdlg.h index 4ff7fe3519..1d4a5b0aaf 100644 --- a/src/propsheet/fontdlg.h +++ b/src/propsheet/fontdlg.h @@ -52,7 +52,7 @@ Revision History: SendMessage(hWnd, bLB ? LB_GETTEXT : CB_GETLBTEXT, w, 0L) #define lcbFINDSTRINGEXACT(hWnd, bLB, pwsz) \ - (LONG) SendMessage(hWnd, bLB ? LB_FINDSTRINGEXACT : CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)pwsz) + (LONG) SendMessage(hWnd, bLB ? LB_FINDSTRINGEXACT : CB_FINDSTRINGEXACT, (WPARAM) - 1, (LPARAM)pwsz) #define lcbADDSTRING(hWnd, bLB, pwsz) \ (LONG) SendMessage(hWnd, bLB ? LB_ADDSTRING : CB_ADDSTRING, 0, (LPARAM)pwsz) diff --git a/src/renderer/atlas/BackendD3D.cpp b/src/renderer/atlas/BackendD3D.cpp index 60ee6aaf1d..1199b28ada 100644 --- a/src/renderer/atlas/BackendD3D.cpp +++ b/src/renderer/atlas/BackendD3D.cpp @@ -678,12 +678,12 @@ void BackendD3D::_debugUpdateShaders(const RenderingPayload& p) noexcept struct FileVS { std::wstring_view filename; - wil::com_ptr BackendD3D::*target; + wil::com_ptr BackendD3D::* target; }; struct FilePS { std::wstring_view filename; - wil::com_ptr BackendD3D::*target; + wil::com_ptr BackendD3D::* target; }; static constexpr std::array filesVS{ diff --git a/src/terminal/adapter/termDispatch.hpp b/src/terminal/adapter/termDispatch.hpp index 99c9033fee..95d0b62369 100644 --- a/src/terminal/adapter/termDispatch.hpp +++ b/src/terminal/adapter/termDispatch.hpp @@ -176,9 +176,9 @@ public: void RequestPresentationStateReport(const DispatchTypes::PresentationReportFormat /*format*/) override {} // DECRQPSR StringHandler RestorePresentationState(const DispatchTypes::PresentationReportFormat /*format*/) override { return nullptr; } // DECRSPS - void PlaySounds(const VTParameters /*parameters*/) override{}; // DECPS + void PlaySounds(const VTParameters /*parameters*/) override {}; // DECPS - void SetOptionalFeatures(const til::enumset /*features*/) override{}; + void SetOptionalFeatures(const til::enumset /*features*/) override {}; }; #pragma warning(default : 26440) // Restore "can be declared noexcept" warning diff --git a/src/terminal/parser/ft_fuzzer/fuzzing_directed.h b/src/terminal/parser/ft_fuzzer/fuzzing_directed.h index 2ab6e1e23a..5deb0b2ece 100644 --- a/src/terminal/parser/ft_fuzzer/fuzzing_directed.h +++ b/src/terminal/parser/ft_fuzzer/fuzzing_directed.h @@ -316,7 +316,7 @@ namespace fuzz protected: CFuzzBase() : m_fFuzzed(FALSE), - m_iPercentageTotal(100){}; + m_iPercentageTotal(100) {}; virtual ~CFuzzBase() = default; // Converts a percentage into a valid range. Note that riTotal diff --git a/src/terminal/parser/ft_fuzzer/fuzzing_logic.h b/src/terminal/parser/ft_fuzzer/fuzzing_logic.h index a13ef3b6ef..726ed89083 100644 --- a/src/terminal/parser/ft_fuzzer/fuzzing_logic.h +++ b/src/terminal/parser/ft_fuzzer/fuzzing_logic.h @@ -404,8 +404,8 @@ namespace fuzz } private: - CFuzzLogic(){}; - virtual ~CFuzzLogic(){}; + CFuzzLogic() {}; + virtual ~CFuzzLogic() {}; static LPWSTR FuzzStringW_NoRealloc(__inout LPWSTR pwsz, __inout size_t& rcch) { diff --git a/tools/OpenConsole.psm1 b/tools/OpenConsole.psm1 index edeb9b7754..b9c80ce457 100644 --- a/tools/OpenConsole.psm1 +++ b/tools/OpenConsole.psm1 @@ -416,28 +416,19 @@ function Invoke-CodeFormat() { [switch]$IgnoreXaml ) + $clangFormatPath = & 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -latest -find "**\x64\bin\clang-format.exe" + If ([String]::IsNullOrEmpty($clangFormatPath)) { + Write-Error "No Visual Studio-supplied version of clang-format could be found." + } + $root = Find-OpenConsoleRoot - & "$root\dep\nuget\nuget.exe" restore "$root\tools\packages.config" - $clangPackage = ([xml](Get-Content "$root\tools\packages.config")).packages.package | Where-Object id -like "clang-format*" - $clangFormatPath = "$root\packages\$($clangPackage.id).$($clangPackage.version)\tools\clang-format.exe" Get-ChildItem -Recurse "$root\src" -Include *.cpp, *.hpp, *.h | Where FullName -NotLike "*Generated Files*" | Invoke-ClangFormat -ClangFormatPath $clangFormatPath - if ($IgnoreXaml) { - # do nothing - } - else { + if (-Not $IgnoreXaml) { Invoke-XamlFormat } } -#.SYNOPSIS -# Download clang-format.exe required for code formatting -function Get-Format() -{ - $root = Find-OpenConsoleRoot - & "$root\dep\nuget\nuget.exe" restore "$root\tools\packages.config" -} - -Export-ModuleMember -Function Set-MsbuildDevEnvironment,Invoke-OpenConsoleTests,Invoke-OpenConsoleBuild,Start-OpenConsole,Debug-OpenConsole,Invoke-CodeFormat,Invoke-XamlFormat,Test-XamlFormat,Get-Format +Export-ModuleMember -Function Set-MsbuildDevEnvironment,Invoke-OpenConsoleTests,Invoke-OpenConsoleBuild,Start-OpenConsole,Debug-OpenConsole,Invoke-CodeFormat,Invoke-XamlFormat,Test-XamlFormat diff --git a/tools/packages.config b/tools/packages.config deleted file mode 100644 index 035bd89d02..0000000000 --- a/tools/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - -