[emacs] Indent statement continuation to match clang-format

[asavonic]

Summary

Was:

int LongVariableName =
  veryLongFunctionNameThatExceeds80ColumnsRule(SomeParameter);

int ShortVar = veryLongFunctionNameThatStillFitsIntoOneLine(SomeParameter)
  .nowThisDoesntFit()
  .andThis()

Now:

int LongVariableName =
    veryLongFunctionNameThatExceeds80ColumnsRule(SomeParameter);

int ShortVar = veryLongFunctionNameThatStillFitsIntoOneLine(SomeParameter)
                   .nowThisDoesntFit()
                   .andThis()

[greened]

+1 for this functionality. I'm not enough of a C-mode guru to know if the implementation is correct.

[MaskRay]

utils/emacs/emacs.el

14 ↗

(On Diff #157010)

How about

(statement-cont . c-lineup-assignments)

[asavonic]

Use c-lineup-assignment.

[asavonic]

utils/emacs/emacs.el

14 ↗

(On Diff #157010)

Thanks, your reference `c-lineup-assignments' helped me find another
pattern for which our current style does not work:

// no statement-cont
int ShortVar = veryLongFunctionNameThatStillFitsIntoOneLine(SomeParameter)
  .nowThisDoesntFit()
  .andThis()
/* clang-format:
int ShortVar = veryLongFunctionNameThatStillFitsIntoOneLine(SomeParameter)
                   .nowThisDoesntFit()
                   .andThis()
*/

`c-lineup-assignments' helps here, but we need more indentation for
subsequent lines:

// (statement-cont . c-lineup-assignments)
int ShortVar = veryLongFunctionNameThatStillFitsIntoOneLine(SomeParameter)
               .nowThisDoesntFit()
               .andThis()
/* clang-format:
int ShortVar = veryLongFunctionNameThatStillFitsIntoOneLine(SomeParameter)
                   .nowThisDoesntFit()
                   .andThis()
*/

So I used a custom function to handle this:

// (statement-cont . llvm-lineup-statement)
int ShortVar = veryLongFunctionNameThatStillFitsIntoOneLine(SomeParameter)
                   .nowThisDoesntFit()
                   .andThis()
/* clang-format:
int ShortVar = veryLongFunctionNameThatStillFitsIntoOneLine(SomeParameter)
                   .nowThisDoesntFit()
                   .andThis()
*/

[MaskRay]

Can you commit?

[asavonic]

I've requested a commit access from Chris, and hopefully I will commit this patch soon. Otherwise I'll ask someone to commit it.
Thanks for the review!

llvm/trunk/utils/emacs/emacs.el

 ;; LLVM coding style guidelines in emacs
 ;; Maintainer: LLVM Team, http://llvm.org/
 
+(defun llvm-lineup-statement (langelem)
+  (let ((in-assign (c-lineup-assignments langelem)))
+    (if (not in-assign)
+        '++
+      (aset in-assign 0
+            (+ (aref in-assign 0)
+               (* 2 c-basic-offset)))
+      in-assign)))
+
 ;; Add a cc-mode style for editing LLVM C and C++ code
 (c-add-style "llvm.org"
              '("gnu"
          (fill-column . 80)
          (c++-indent-level . 2)
          (c-basic-offset . 2)
          (indent-tabs-mode . nil)
          (c-offsets-alist . ((arglist-intro . ++)
            (innamespace . 0)
-           (member-init-intro . ++)))))
+           (member-init-intro . ++)
+           (statement-cont . llvm-lineup-statement)))))
 
 ;; Files with "llvm" in their names will automatically be set to the
 ;; llvm.org coding style.
 (add-hook 'c-mode-common-hook
     (function
      (lambda nil 
        (if (string-match "llvm" buffer-file-name)
      (progn
        (c-set-style "llvm.org"))))))