C++ Mode: Fix some indentation bugs. FIxes bug#19867

1. Fix closing paren aligning with trailing comment on line
with matching open paren.
2. Fix indentation of first identifier inside a comma separated
list aligning with the type rather than the subsequent
identifiers.
3. Fix lambda expressions inside a brace list aligning like a
single statement.

* lisp/progmodes/cc-align.el (c-lineup-arglist): Take into
account any preceding comments when lining up the arguments in
the arglist.
(c-lineup-arglist-intro-after-paren): Handle comments properly,
and don't line up the closing parenthesis with a trailing
comment on the first line.
(c-lineup-item-after-paren-at-boi): Also allow a paren to count
as being at BOI when it is preceded only by open parens on that
line.
(c-lineup-runin-statements, c-lineup-ObjC-method-call): Hanle
comments better.

* lisp/progmodes/cc-engine.el (c-forward-comments) Introduce an
optional limit parameter.  Use this limit in calls from
cc-align.el and cc-mode.el.
(c-just-after-func-arglist-p): Handle the presence of a
protection keyword such as "public".
(c-at-bracelist-p): Renamed from c-inside-bracelist-p, after
dropping the accept-in-paren parameter, having removed its
functionality.
(c-looking-at-statement-block-1): New function, based on the
old c-looking-at-statement-block.  Enhanced to handle C++
lambda expressions, and to return the symbol `maybe' when the
contents of a brace delimited block fail to determine whether
it is a statement block.
(c-looking-at-statement-block): Enhanced to examine the context
of a brace delimited block when the contents are ambiguous.
(c-looking-at-c++-lambda-expression): Check the character after
point is a < before calling c-forward-<>-arglist.
(c-add-stmt-syntax): Make the context more accurate by calling
c-looking-at-statement-block.
(c-guess-basic-syntax, CASE 5D.5): Replace the syntactic symbol
topmost-intro-cont with the new symbol class-field-cont,
additionally determining the position of the enclosing brace as
an extra anchor point.
(c-guess-basic-syntax, CASE 5V): New case for an identifier
following a type inside class braces.
(c-guess-basic-syntax, CASE 9): Use
c-looking-at-statement-block to detect a brace list more
accurately.

* lisp/progmodes/cc-fonts.el (c-get-fontification-context):
Rename the call to c-inside-bracelist-p to c-at-bracelist-p.

* lisp/progmodes/cc-langs.el (c-protection-kwds): Add an entry
for java-mode.
(c-stmt-block-only-keywords-regexp): Prevent this regexp also
matching a character preceding the keyword.

* /lisp/progmodes/cc-mode.el (c-before-change-include-<>)
(c-after-change-include-<>): Use the new limit argument to
c-forward-comments.

* lisp/progmodes/cc-styles.el (c-style-alist, "gnu" and "java"
styles): Change the offset for arglist-close to
c-lineup-arglist-close-under-paren.

* lisp/progmodes/cc-vars.el (c-offsets-alist): Introduce the
new syntactic symbol class-field-cont, giving it default
offset +.

* doc/misc/cc-mode.texi (Syntactic Symbols, Class Symbols):
Document the new syntactic symbol class-field-cont.

1 files changed, 22 insertions, 0 deletions

diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index 566da9dad3d..4528ea42151 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -4316,6 +4316,9 @@ annotations.  @ref{Java Symbols}.
 First line in a member initialization list.  @ref{Class Symbols}.
 @item member-init-cont
 Subsequent member initialization list lines.  @ref{Class Symbols}.
+@item class-field-cont
+Lines continuing the first line inside a class/struct etc. definition.
+@ref{Class Symbols}.
 @item inher-intro
 First line of a multiple inheritance list.  @ref{Class Symbols}.
 @item inher-cont
@@ -4669,6 +4672,25 @@ elements:
 The @code{friend} and @code{inline-open} syntactic symbols are
 modifiers that do not have anchor positions.
 
+@ssindex class-field-cont
+In the following example, line 1 gets the syntax @code{topmost-intro},
+and line 2 @code{((inclass 1) (topmost-intro 1))} as expected.  Lines
+3, 4, and 5 are given the syntax @code{(class-field-cont 18 12)}
+rather than @code{topmost-intro-cont}.  This makes it easier to indent
+several comma separated fields with respect to their defining type,
+when @code{topmost-intro-cont} would tend to leave elements directly
+underneath their type.  @xref{Function Symbols}.  The anchor points are
+the positions of the type and the enclosing class's brace.
+
+@example
+ 1. struct foo @{
+ 2.     long
+ 3.         a,
+ 4.         b,
+ 5.         c;
+ 6. @};
+@end example
+ 
 @ssindex template-args-cont
 Template definitions introduce yet another syntactic symbol: