Intermediate changes

2 files changed, 9 insertions, 3 deletions

diff --git a/contrib/libs/clang16/lib/Format/ContinuationIndenter.cpp b/contrib/libs/clang16/lib/Format/ContinuationIndenter.cpp
index 62e008f29c..98b511f00b 100644
--- a/contrib/libs/clang16/lib/Format/ContinuationIndenter.cpp
+++ b/contrib/libs/clang16/lib/Format/ContinuationIndenter.cpp
@@ -280,6 +280,12 @@ LineState ContinuationIndenter::getInitialState(unsigned FirstIndent,
 bool ContinuationIndenter::canBreak(const LineState &State) {
   const FormatToken &Current = *State.NextToken;
   const FormatToken &Previous = *Current.Previous;
+
+  // Breaking after a comma should always be allowed.
+  if (Previous.is(tok::comma)) {
+    return true;
+  }
+
   const auto &CurrentState = State.Stack.back();
   assert(&Previous == Current.Previous);
   if (!Current.CanBreakBefore && !(CurrentState.BreakBeforeClosingBrace &&
diff --git a/contrib/libs/clang16/lib/Format/TokenAnnotator.cpp b/contrib/libs/clang16/lib/Format/TokenAnnotator.cpp
index f60a68d0a2..93c9a32739 100644
--- a/contrib/libs/clang16/lib/Format/TokenAnnotator.cpp
+++ b/contrib/libs/clang16/lib/Format/TokenAnnotator.cpp
@@ -3847,14 +3847,14 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line,
   if (Right.is(tok::colon)) {
     auto n = Right.Next;
 
-    if (n && n->isOneOf(tok::kw_public, tok::kw_private, tok::kw_protected)) {
-      return false;
+    if (n && n->isOneOf(tok::kw_public, tok::kw_private, tok::kw_protected, tok::kw_virtual)) {
+      return Style.SpaceBeforeInheritanceColon;
     }
 
     auto p = Left.Previous;
 
     if (p && p->isOneOf(tok::kw_class, tok::kw_struct, tok::kw_enum)) {
-      return false;
+      return Style.SpaceBeforeInheritanceColon;
     }
   }