jprdonnelly/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2025-12-19 09:58:08 -05:00
Code Issues Projects Releases Wiki Activity

Upgrade clang-format to 15.0.7 (#15110)

Browse Source 
Upgrading clang-format lead to a few changes in the formatting
of code inside macros. Apart from the upgrade, I've also spent
some time removing all options from .clang-format that are
redundant with `BasedOnStyle: Microsoft`.
This commit is contained in:
Leonard Hecker
2023-04-05 17:03:20 +02:00
committed by GitHub
parent ecb5e37a7d
commit 62448969b3
13 changed files with 188 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
.clang-format
View File

@@ -1,57 +1,25 @@
---
Language: Cpp
BasedOnStyle: Microsoft
AccessModifierOffset: -4
AlignAfterOpenBracket: Align
AllowAllArgumentsOnNextLine: true
AlignConsecutiveMacros: false
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
AllowAllConstructorInitializersOnNextLine: true
AlignEscapedNewlines: Left
AlignOperands: true
AlignTrailingComments: false
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: Never
AllowShortFunctionsOnASingleLine: All
AllowShortCaseLabelsOnASingleLine: false
AllowShortIfStatementsOnASingleLine: Never
#AllowShortLambdasOnASingleLine: Inline
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: Yes
BinPackArguments: false
BinPackParameters: false
BraceWrapping:
AfterCaseLabel: true
AfterClass: true
AfterControlStatement: true
AfterEnum: true
AfterFunction: true
AfterNamespace: true
AfterObjCDeclaration: true
AfterStruct: true
AfterUnion: true
AfterExternBlock: false
BeforeCatch: true
BeforeElse: true
IndentBraces: false
SplitEmptyFunction: true
SplitEmptyRecord: true
SplitEmptyNamespace: true
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Custom
BreakBeforeTernaryOperators: false
BreakConstructorInitializers: AfterColon
BreakInheritanceList: AfterColon
ColumnLimit: 0
CommentPragmas: "suppress"
CompactNamespaces: false
ConstructorInitializerAllOnOneLineOrOnePerLine: true
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: false
DeriveLineEnding: true
DerivePointerAlignment: false
FixNamespaceComments: false
IncludeBlocks: Regroup
IncludeCategories:
@@ -63,35 +31,13 @@ IncludeCategories:
Priority: 2
- Regex: '.*'
Priority: 3
IndentCaseLabels: false
IndentPPDirectives: None
IndentWidth: 4
IndentWrappedFunctionNames: false
KeepEmptyLinesAtTheStartOfBlocks: false
MacroBlockBegin: "BEGIN_TEST_METHOD_PROPERTIES|BEGIN_MODULE|BEGIN_TEST_CLASS|BEGIN_TEST_METHOD"
MacroBlockEnd: "END_TEST_METHOD_PROPERTIES|END_MODULE|END_TEST_CLASS|END_TEST_METHOD"
MaxEmptyLinesToKeep: 1
NamespaceIndentation: All
PointerAlignment: Left
ReflowComments: false
SortIncludes: false
SortUsingDeclarations: true
SpaceAfterCStyleCast: false
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: false
SpaceBeforeAssignmentOperators: true
SpaceBeforeCpp11BracedList: false
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: true
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesInAngles: false
SpacesInCStyleCastParentheses: false
SpacesInContainerLiterals: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Latest
TabWidth: 4
UseTab: Never

3
.github/actions/spelling/expect/expect.txt vendored
View File

@@ -177,7 +177,6 @@ CConsole
CConversion
CCRT
cdd
CDeclaration
CEdit
CELLSIZE
cfae
@@ -333,7 +332,7 @@ Cspace
csrmsg
CSRSS
csrutil
cstyle
CSTYLE
CSwitch
CTerminal
CText

10
src/cascadia/TerminalControl/ControlCore.h
View File

@@ -35,10 +35,16 @@ namespace ControlUnitTests
#define RUNTIME_SETTING(type, name, setting) \
private: \
std::optional<type> _runtime##name{ std::nullopt }; \
void name(const type newValue) { _runtime##name = newValue; } \
void name(const type newValue) \
{ \
_runtime##name = newValue; \
} \
\
public: \
type name() const { return til::coalesce_value(_runtime##name, setting); }
type name() const \
{ \
return til::coalesce_value(_runtime##name, setting); \
}
namespace winrt::Microsoft::Terminal::Control::implementation
{

10
src/cascadia/TerminalControl/ControlSettings.h
View File

@@ -66,8 +66,14 @@ namespace winrt::Microsoft::Terminal::Control::implementation
// situation is generally only used when a control is first created, or
// when calling UpdateSettings.
#define APPEARANCE_GEN(type, name, ...) \
type name() const noexcept { return _focusedAppearance->name(); } \
void name(const type& value) noexcept { _focusedAppearance->name(value); }
type name() const noexcept \
{ \
return _focusedAppearance->name(); \
} \
void name(const type& value) noexcept \
{ \
_focusedAppearance->name(value); \
}
CORE_APPEARANCE_SETTINGS(APPEARANCE_GEN)
CONTROL_APPEARANCE_SETTINGS(APPEARANCE_GEN)

20
src/cascadia/TerminalSettingsEditor/ViewModelHelpers.h
View File

@@ -39,7 +39,10 @@ protected:
#define _BASE_OBSERVABLE_PROJECTED_SETTING(target, name) \
public: \
auto name() const noexcept { return target.name(); }; \
auto name() const noexcept \
{ \
return target.name(); \
}; \
template<typename T> \
void name(const T& value) \
{ \
@@ -49,7 +52,10 @@ public: \
_NotifyChanges(L"Has" #name, L## #name); \
} \
} \
bool Has##name() { return target.Has##name(); }
bool Has##name() \
{ \
return target.Has##name(); \
}
// Defines a setting that reflects another object's same-named
// setting.
@@ -64,7 +70,10 @@ public: \
_NotifyChanges(L"Has" #name, L## #name); \
} \
} \
auto name##OverrideSource() { return target.name##OverrideSource(); }
auto name##OverrideSource() \
{ \
return target.name##OverrideSource(); \
}
// Defines a setting that reflects another object's same-named
// setting, but which cannot be erased.
@@ -76,7 +85,10 @@ public: \
// except it leverages _NotifyChanges.
#define VIEW_MODEL_OBSERVABLE_PROPERTY(type, name, ...) \
public: \
type name() const noexcept { return _##name; }; \
type name() const noexcept \
{ \
return _##name; \
}; \
void name(const type& value) \
{ \
if (_##name != value) \

5
src/cascadia/TerminalSettingsEditor/ViewModelHelpers.idl.h
View File

@@ -9,7 +9,10 @@
get; \
set; \
}; \
Boolean Has##Name { get; }
Boolean Has##Name \
{ \
get; \
}
#define OBSERVABLE_PROJECTED_SETTING(Type, Name) \
_BASE_OBSERVABLE_PROJECTED_SETTING(Type, Name); \

10
src/cascadia/TerminalSettingsModel/ActionArgs.h
View File

@@ -58,8 +58,14 @@
#define ACTION_ARG(type, name, ...) \
public: \
type name() const noexcept { return _##name.has_value() ? _##name.value() : type{ __VA_ARGS__ }; } \
void name(const type& value) noexcept { _##name = value; } \
type name() const noexcept \
{ \
return _##name.has_value() ? _##name.value() : type{ __VA_ARGS__ }; \
} \
void name(const type& value) noexcept \
{ \
_##name = value; \
} \
\
private: \
std::optional<type> _##name{ std::nullopt };

5
src/cascadia/TerminalSettingsModel/IInheritable.idl.h
View File

@@ -9,7 +9,10 @@
get; \
set; \
}; \
Boolean Has##Name { get; }; \
Boolean Has##Name \
{ \
get; \
}; \
void Clear##Name()
#define INHERITABLE_SETTING(Type, Name) \

80
src/cascadia/inc/cppwinrt_utils.h
View File

@@ -33,8 +33,14 @@ protected: \
// the callback. This macro will define them both for you, because they
// don't really vary from event to event.
#define DEFINE_EVENT(className, name, eventHandler, args) \
winrt::event_token className::name(const args& handler) { return eventHandler.add(handler); } \
void className::name(const winrt::event_token& token) noexcept { eventHandler.remove(token); }
winrt::event_token className::name(const args& handler) \
{ \
return eventHandler.add(handler); \
} \
void className::name(const winrt::event_token& token) noexcept \
{ \
eventHandler.remove(token); \
}
// This is a helper macro to make declaring events easier.
// This will declare the event handler and the methods for adding and removing a
@@ -54,8 +60,14 @@ private:
// don't really vary from event to event.
// Use this if you have a Windows.Foundation.TypedEventHandler
#define DEFINE_EVENT_WITH_TYPED_EVENT_HANDLER(className, name, eventHandler, sender, args) \
winrt::event_token className::name(const Windows::Foundation::TypedEventHandler<sender, args>& handler) { return eventHandler.add(handler); } \
void className::name(const winrt::event_token& token) noexcept { eventHandler.remove(token); }
winrt::event_token className::name(const Windows::Foundation::TypedEventHandler<sender, args>& handler) \
{ \
return eventHandler.add(handler); \
} \
void className::name(const winrt::event_token& token) noexcept \
{ \
eventHandler.remove(token); \
}
// This is a helper macro for both declaring the signature of an event, and
// defining the body. Winrt events need a method for adding a callback to the
@@ -65,8 +77,14 @@ private:
// Use this in a classes header if you have a Windows.Foundation.TypedEventHandler
#define TYPED_EVENT(name, sender, args) \
public: \
winrt::event_token name(const winrt::Windows::Foundation::TypedEventHandler<sender, args>& handler) { return _##name##Handlers.add(handler); } \
void name(const winrt::event_token& token) { _##name##Handlers.remove(token); } \
winrt::event_token name(const winrt::Windows::Foundation::TypedEventHandler<sender, args>& handler) \
{ \
return _##name##Handlers.add(handler); \
} \
void name(const winrt::event_token& token) \
{ \
_##name##Handlers.remove(token); \
} \
\
private: \
winrt::event<winrt::Windows::Foundation::TypedEventHandler<sender, args>> _##name##Handlers;
@@ -79,8 +97,14 @@ private:
// Use this in a class's header if you have a "delegate" type in your IDL.
#define WINRT_CALLBACK(name, args) \
public: \
winrt::event_token name(const args& handler) { return _##name##Handlers.add(handler); } \
void name(const winrt::event_token& token) { _##name##Handlers.remove(token); } \
winrt::event_token name(const args& handler) \
{ \
return _##name##Handlers.add(handler); \
} \
void name(const winrt::event_token& token) \
{ \
_##name##Handlers.remove(token); \
} \
\
protected: \
winrt::event<args> _##name##Handlers;
@@ -93,14 +117,26 @@ protected:
// method signatures and define them both for you.
#define FORWARDED_TYPED_EVENT(name, sender, args, handler, handlerName) \
public: \
winrt::event_token name(const Windows::Foundation::TypedEventHandler<sender, args>& h) { return handler->handlerName(h); } \
void name(const winrt::event_token& token) noexcept { handler->handlerName(token); }
winrt::event_token name(const Windows::Foundation::TypedEventHandler<sender, args>& h) \
{ \
return handler->handlerName(h); \
} \
void name(const winrt::event_token& token) noexcept \
{ \
handler->handlerName(token); \
}
// Same thing, but handler is a projected type, not an implementation
#define PROJECTED_FORWARDED_TYPED_EVENT(name, sender, args, handler, handlerName) \
public: \
winrt::event_token name(const Windows::Foundation::TypedEventHandler<sender, args>& h) { return handler.handlerName(h); } \
void name(const winrt::event_token& token) noexcept { handler.handlerName(token); }
winrt::event_token name(const Windows::Foundation::TypedEventHandler<sender, args>& h) \
{ \
return handler.handlerName(h); \
} \
void name(const winrt::event_token& token) noexcept \
{ \
handler.handlerName(token); \
}
// This is a bit like *FORWARDED_TYPED_EVENT. When you use a forwarded event,
// the handler gets added to the object that's raising the event. For example,
@@ -121,15 +157,24 @@ public:
// _core.TitleChanged({ get_weak(), &TermControl::_bubbleTitleChanged });
#define BUBBLED_FORWARDED_TYPED_EVENT(name, sender, args) \
TYPED_EVENT(name, sender, args) \
void _bubble##name(const sender& s, const args& a) { _##name##Handlers(s, a); }
void _bubble##name(const sender& s, const args& a) \
{ \
_##name##Handlers(s, a); \
}
// Use this macro to quick implement both the getter and setter for a property.
// This should only be used for simple types where there's no logic in the
// getter/setter beyond just accessing/updating the value.
#define WINRT_PROPERTY(type, name, ...) \
public: \
type name() const noexcept { return _##name; } \
void name(const type& value) noexcept { _##name = value; } \
type name() const noexcept \
{ \
return _##name; \
} \
void name(const type& value) noexcept \
{ \
_##name = value; \
} \
\
private: \
type _##name{ __VA_ARGS__ };
@@ -143,7 +188,10 @@ private: \
// (like when the class is being initialized).
#define WINRT_OBSERVABLE_PROPERTY(type, name, event, ...) \
public: \
type name() const noexcept { return _##name; }; \
type name() const noexcept \
{ \
return _##name; \
}; \
void name(const type& value) \
{ \
if (_##name != value) \

4
src/inc/til/pmr.h
View File

@@ -39,7 +39,7 @@ namespace til::pmr
{
if (align > __STDCPP_DEFAULT_NEW_ALIGNMENT__)
{
return ::operator new (bytes, std::align_val_t{ align });
return ::operator new(bytes, std::align_val_t{ align });
}
return ::operator new(bytes);
@@ -49,7 +49,7 @@ namespace til::pmr
{
if (align > __STDCPP_DEFAULT_NEW_ALIGNMENT__)
{
return ::operator delete (ptr, bytes, std::align_val_t{ align });
return ::operator delete(ptr, bytes, std::align_val_t{ align });
}
::operator delete(ptr, bytes);

35
src/renderer/atlas/AtlasEngine.h
View File

@@ -95,13 +95,34 @@ namespace Microsoft::Console::Render
}
#define ATLAS_FLAG_OPS(type, underlying) \
friend constexpr type operator~(type v) noexcept { return static_cast<type>(~static_cast<underlying>(v)); } \
friend constexpr type operator|(type lhs, type rhs) noexcept { return static_cast<type>(static_cast<underlying>(lhs) | static_cast<underlying>(rhs)); } \
friend constexpr type operator&(type lhs, type rhs) noexcept { return static_cast<type>(static_cast<underlying>(lhs) & static_cast<underlying>(rhs)); } \
friend constexpr type operator^(type lhs, type rhs) noexcept { return static_cast<type>(static_cast<underlying>(lhs) ^ static_cast<underlying>(rhs)); } \
friend constexpr void operator|=(type& lhs, type rhs) noexcept { lhs = lhs | rhs; } \
friend constexpr void operator&=(type& lhs, type rhs) noexcept { lhs = lhs & rhs; } \
friend constexpr void operator^=(type& lhs, type rhs) noexcept { lhs = lhs ^ rhs; }
friend constexpr type operator~(type v) noexcept \
{ \
return static_cast<type>(~static_cast<underlying>(v)); \
} \
friend constexpr type operator|(type lhs, type rhs) noexcept \
{ \
return static_cast<type>(static_cast<underlying>(lhs) | static_cast<underlying>(rhs)); \
} \
friend constexpr type operator&(type lhs, type rhs) noexcept \
{ \
return static_cast<type>(static_cast<underlying>(lhs) & static_cast<underlying>(rhs)); \
} \
friend constexpr type operator^(type lhs, type rhs) noexcept \
{ \
return static_cast<type>(static_cast<underlying>(lhs) ^ static_cast<underlying>(rhs)); \
} \
friend constexpr void operator|=(type& lhs, type rhs) noexcept \
{ \
lhs = lhs | rhs; \
} \
friend constexpr void operator&=(type& lhs, type rhs) noexcept \
{ \
lhs = lhs & rhs; \
} \
friend constexpr void operator^=(type& lhs, type rhs) noexcept \
{ \
lhs = lhs ^ rhs; \
}
template<typename T>
struct vec2

2
tools/packages.config
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="clang-format.win-x86" version="13.0.1" targetFramework="native" />
<package id="clang-format.win-x86" version="15.0.7" targetFramework="native" />
</packages>