This is an archive of the discontinued LLVM Phabricator instance.

Differential D49726

[emacs] Indent statement continuation to match clang-format
ClosedPublic

Authored by asavonic on Jul 24 2018, 5:39 AM.

Details

Reviewers
• espindola
MaskRay
Commits
rG04a8f1e6ec4e: [emacs] Indent statement continuation to match clang-format
rL338686: [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()

Diff Detail

Event Timeline

asavonic created this revision.Jul 24 2018, 5:39 AM
Herald added a subscriber: llvm-commits. · View Herald TranscriptJul 24 2018, 5:39 AM
Harbormaster completed remote builds in B20655: Diff 157010.Jul 24 2018, 5:39 AM
greened added a subscriber: greened.Jul 25 2018, 12:04 PM

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

asavonic added a reviewer: MaskRay.Jul 30 2018, 3:52 AM
MaskRay added inline comments.Jul 30 2018, 9:43 AM
utils/emacs/emacs.el
14

How about

(statement-cont . c-lineup-assignments)
asavonic updated this revision to Diff 158195.Jul 31 2018, 3:02 AM

Use c-lineup-assignment.

Harbormaster completed remote builds in B20888: Diff 158195.Jul 31 2018, 3:02 AM
asavonic added inline comments.Jul 31 2018, 3:04 AM
utils/emacs/emacs.el
14

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()
*/
asavonic edited the summary of this revision. (Show Details)Jul 31 2018, 3:05 AM
MaskRay accepted this revision.Jul 31 2018, 10:09 AM
This revision is now accepted and ready to land.Jul 31 2018, 10:09 AM
MaskRay added a comment.Aug 1 2018, 9:52 AM

Can you commit?

asavonic added a comment.Aug 1 2018, 10:38 AM

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!

Closed by commit rL338686: [emacs] Indent statement continuation to match clang-format (authored by asavonic). · Explain WhyAug 2 2018, 1:51 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
utils/
emacs/
3 lines

Diff 157010

utils/emacs/emacs.el

;; LLVM coding style guidelines in emacs ;; LLVM coding style guidelines in emacs
;; Maintainer: LLVM Team, http://llvm.org/ ;; Maintainer: LLVM Team, http://llvm.org/
;; Add a cc-mode style for editing LLVM C and C++ code ;; Add a cc-mode style for editing LLVM C and C++ code
(c-add-style "llvm.org" (c-add-style "llvm.org"
'("gnu" '("gnu"
(fill-column . 80) (fill-column . 80)
(c++-indent-level . 2) (c++-indent-level . 2)
(c-basic-offset . 2) (c-basic-offset . 2)
(indent-tabs-mode . nil) (indent-tabs-mode . nil)
(c-offsets-alist . ((arglist-intro . ++) (c-offsets-alist . ((arglist-intro . ++)
(innamespace . 0) (innamespace . 0)
(member-init-intro . ++))))) (member-init-intro . ++)
(statement-cont . ++)))))
MaskRayUnsubmitted
Not Done
ReplyInline Actions

How about

(statement-cont . c-lineup-assignments)
MaskRay: How about (statement-cont . c-lineup-assignments)
asavonicAuthorUnsubmitted
Not Done
ReplyInline Actions

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()
*/
asavonic: Thanks, your reference `c-lineup-assignments' helped me find another pattern for which our…
;; Files with "llvm" in their names will automatically be set to the ;; Files with "llvm" in their names will automatically be set to the
;; llvm.org coding style. ;; llvm.org coding style.
(add-hook 'c-mode-common-hook (add-hook 'c-mode-common-hook
(function (function
(lambda nil (lambda nil
(if (string-match "llvm" buffer-file-name) (if (string-match "llvm" buffer-file-name)
(progn (progn
(c-set-style "llvm.org")))))) (c-set-style "llvm.org"))))))