[llvm] r338686 - [emacs] Indent statement continuation to match clang-format

Andrew Savonichev via llvm-commits llvm-commits at lists.llvm.org
Thu Aug 2 01:50:42 PDT 2018


Author: asavonic
Date: Thu Aug  2 01:50:41 2018
New Revision: 338686

URL: http://llvm.org/viewvc/llvm-project?rev=338686&view=rev
Log:
[emacs] Indent statement continuation to match clang-format

Summary:
Was:

  int LongVariableName =
    veryLongFunctionNameThatExceeds80ColumnsRule(SomeParameter);

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

Now:

  int LongVariableName =
      veryLongFunctionNameThatExceeds80ColumnsRule(SomeParameter);

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


Reviewers: espindola, MaskRay

Reviewed By: MaskRay

Subscribers: greened, llvm-commits

Differential Revision: https://reviews.llvm.org/D49726

Modified:
    llvm/trunk/utils/emacs/emacs.el

Modified: llvm/trunk/utils/emacs/emacs.el
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/emacs/emacs.el?rev=338686&r1=338685&r2=338686&view=diff
==============================================================================
--- llvm/trunk/utils/emacs/emacs.el (original)
+++ llvm/trunk/utils/emacs/emacs.el Thu Aug  2 01:50:41 2018
@@ -1,6 +1,15 @@
 ;; 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"
@@ -10,7 +19,8 @@
 	       (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.




More information about the llvm-commits mailing list