maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity
212,019 Commits 23 Branches 0 Tags 2.2 GiB
Commit Graph

30 Commits

Author SHA1 Message Date
Benjamin Kramer 133aa20e22 [clang-format] Use in-class initializers to simplify constructor. 
Sadly C++11 doesn't let us use initializers on bitfield members (DR1341). NFC.

llvm-svn: 239606
 2015-06-12 14:39:08 +00:00
Benjamin Kramer 8ad86fc644 [clang-format] Reorder and pack ParenState members to minimize padding 
sizeof(ParenState) goes from 64 bytes to 52 bytes. NFC.

llvm-svn: 239605
 2015-06-12 13:07:03 +00:00
Daniel Jasper c83d76991c clang-format: [JS] Hotfix for runtime issue with deeply nested JS code. 
I have not succeeded in writing a proper test case for this yet and we
also need to solve the underlying fundamental problem of trying too
many combinations with nested blocks (basically this somewhat works
around our Dijkstra algorithm). Preventing this linebreak is good
anyways as usually the penalties never make us choose it (that's why I
can't create a test) and it also looks ugly.

Also cleaned up state comparison code that I discovered while hunting
this down.

llvm-svn: 239398
 2015-06-09 11:39:22 +00:00
Daniel Jasper 11a0ac66e1 clang-format: Revamp nested block formatting. 
This fixed llvm.org/PR21804 and hopefully a few other strange cases.

Before:
    if (blah_blah(whatever, whatever, [] {
      doo_dah();
      doo_dah();
    })) {
    }
    }

After:
    if (blah_blah(whatever, whatever, [] {
          doo_dah();
          doo_dah();
        })) {
    }
    }

llvm-svn: 224112
 2014-12-12 09:40:58 +00:00
Daniel Jasper 4b444495ed clang-format: Use nested block special case for all languages. 
Previously this was only used for JavaScript.

Before:
  functionCall({
                 int i;
                 int j;
               },
               aaaa, bbbb, cccc);

After:
  functionCall({
    int i;
    int j;
  }, aaaa, bbbb, cccc);

llvm-svn: 222531
 2014-11-21 13:38:53 +00:00
Daniel Jasper d0ec0d62d6 clang-format: Use identifier table for keywords in other languages. 
Slightly easier to write, more efficient and prevents bugs by
misspelling them.

No functional changes intended.

llvm-svn: 221259
 2014-11-04 12:41:02 +00:00
Benjamin Kramer 2f5db8b3db Header guard canonicalization, clang part. 
Modifications made by clang-tidy with minor tweaks.

llvm-svn: 215557
 2014-08-13 16:25:19 +00:00
Daniel Jasper 114a2bc9d2 clang-format: Refactor indentation behavior for multiple nested blocks. 
This fixes a few oddities when formatting multiple nested JavaScript
blocks, e.g.:

Before:
  promise.then(
      function success() {
        doFoo();
        doBar();
      },
      [], function error() {
        doFoo();
        doBaz();
      });
  promise.then([],
               function success() {
                 doFoo();
                 doBar();
               },
               function error() {
    doFoo();
    doBaz();
  });

After:
  promise.then(
      function success() {
        doFoo();
        doBar();
      },
      [],
      function error() {
        doFoo();
        doBaz();
      });
  promise.then([],
               function success() {
                 doFoo();
                 doBar();
               },
               function error() {
                 doFoo();
                 doBaz();
               });

llvm-svn: 210097
 2014-06-03 12:02:45 +00:00
Daniel Jasper 60553be5fd clang-format: Split up moveStateToNextToken. 
No functional changes intended.

llvm-svn: 209626
 2014-05-26 13:10:39 +00:00
Daniel Jasper b16b969d7c clang-format: [JS] Support different function literal style. 
Before:
  goog.array.forEach(array, function() {
                              doSomething();
                              doSomething();
                            },
                     this);

After:
  goog.array.forEach(array, function() {
    doSomething();
    doSomething();
  }, this);

llvm-svn: 209291
 2014-05-21 12:51:23 +00:00
Daniel Jasper 05cd586863 clang-format: Cleanup redundant calculation of ParenLevel. 
No functional changes intended.

llvm-svn: 208304
 2014-05-08 12:21:30 +00:00
Daniel Jasper c0d606a584 clang-format: Don't allow hanging indentation for operators on new lines 
Before:
  if (aaaaaaaa && bbbbbbbbbbbbbbb // need to wrap
                  == cccccccccccccc) ...

After:
  if (aaaaaaaa
      && bbbbbbbbbbbbbbb // need to wrap
         == cccccccccccccc) ...

The same rule has already be implemented for BreakBeforeBinaryOperators
set to false in r205527.

llvm-svn: 206159
 2014-04-14 11:08:45 +00:00
Daniel Jasper 3ae6f5a47b clang-format: Improve format of calls with several lambdas. 
Before:
  SomeFunction([]() {
                 int i = 42;
                 return i;
               },
               []() {
    int j = 43;
    return j;
  });

After:
  SomeFunction([]() {
                 int i = 42;
                 return i;
               },
               []() {
                 int j = 43;
                 return j;
               });

llvm-svn: 205848
 2014-04-09 12:08:39 +00:00
Daniel Jasper 9f388d0404 clang-format: Extract getNewLineColumn out of addTokenOnNewLine. 
No functional changes intended.

llvm-svn: 204930
 2014-03-27 14:33:30 +00:00
Alexander Kornienko ce9161a557 Added an option to avoid splitting certain kinds of comments into lines. 
Summary: Added CommentPragmas option for this.

Reviewers: djasper, klimek

Reviewed By: klimek

CC: cfe-commits, klimek

Differential Revision: http://llvm-reviews.chandlerc.com/D2460

llvm-svn: 198310
 2014-01-02 15:13:14 +00:00
Daniel Jasper b88b25feec clang-format: Fix various problems in formatting ObjC blocks. 
Among other things, this fixes llvm.org/PR15269.

llvm-svn: 197900
 2013-12-23 07:29:06 +00:00
Daniel Jasper c39b56fe14 clang-format: Improve handling of raw string literals. 
Especially try to keep existing line breaks before raw string literals,
as the code author might have aligned content to it.

Thereby, clang-format now keeps things like:

  parseStyle(R"(
      BasedOnStyle: Google,
      ColumnLimit: 100)");
  parseStyle(
      R"(BasedOnStyle: Google,
         ColumnLimit: 100)");

llvm-svn: 197368
 2013-12-16 07:23:08 +00:00
Daniel Jasper 48437ce508 Simplify fix proposed in r195240. 
llvm-svn: 195253
 2013-11-20 14:54:39 +00:00
Manuel Klimek 06c84f2e07 Fix bug where optimization would lead to strange line breaks. 
Before:
  void f() {
    CHECK_EQ(aaaa, (
                       *bbbbbbbbb)->cccccc)
        << "qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq";
  }

After:
  void f() {
    CHECK_EQ(aaaa, (*bbbbbbbbb)->cccccc)
        << "qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq";
  }

llvm-svn: 195240
 2013-11-20 11:20:32 +00:00
Alexander Kornienko e2e0387f3e Keep track of indentation levels in static initializers for correct indentation with tabs. 
Summary:
Store IndentationLevel in ParentState and use it instead of the
Line::Level when indening.
Also fixed incorrect indentation level calculation in formatFirstToken.

Reviewers: djasper

Reviewed By: djasper

CC: cfe-commits, klimek

Differential Revision: http://llvm-reviews.chandlerc.com/D1797

llvm-svn: 192563
 2013-10-14 00:46:35 +00:00
Manuel Klimek 71814b4465 Support formatting of preprocessor branches. 
We now correctly format:
  void SomeFunction(int param1,
  #ifdef X
                    NoTemplate param2,
  #else
                    template <
  #ifdef A
                        MyType<Some> >
  #else
                        Type1, Type2>
  #endif
                    param2,
  #endif
                    param3) {
    f();
  }

llvm-svn: 192503
 2013-10-11 21:25:45 +00:00
Alexander Kornienko 1f80396d03 Refactoring: split addTokenToState into two methods. 
Summary: Pure refactoring, should be no semantic changes.

Reviewers: djasper

Reviewed By: djasper

CC: cfe-commits, klimek

Differential Revision: http://llvm-reviews.chandlerc.com/D1796

llvm-svn: 191772
 2013-10-01 14:41:18 +00:00
Alexander Kornienko 917f9e04b5 Correctly calculate OriginalColumn after multi-line tokens. 
Summary: This also unifies the handling of escaped newlines for all tokens.

Reviewers: djasper

Reviewed By: djasper

CC: cfe-commits, klimek

Differential Revision: http://llvm-reviews.chandlerc.com/D1638

llvm-svn: 190405
 2013-09-10 12:29:48 +00:00
Daniel Jasper 1c5d9df8d1 clang-format: Fix comment formatting bugs in nested blocks. 
This fixes two issues:
1) The indent of a line comment was not adapted to the subsequent
   statement as it would be outside of a nested block.
2) A missing DryRun flag caused actualy breaks to be inserted in
   overly long comments while trying to come up with the best line
   breaking decisions.

llvm-svn: 190123
 2013-09-06 07:54:20 +00:00
Daniel Jasper 9fe0e8dacd clang-format: Enable formatting of nested blocks. 
Among other things, this enables (better) formatting lambdas and
constructs like:
  MACRO({
          long_statement();
          long_statement_2();
        },
        {
          long_statement();
          long_statement_2();
        },
        { short_statement(); }, "");

This fixes llvm.org/PR15381.

llvm-svn: 190038
 2013-09-05 09:29:45 +00:00
Alexander Kornienko d7b837e78d Better support for multiline string literals (including C++11 raw string literals). 
Summary:
Calculate characters in the first and the last line correctly so that
we only break before the literal when needed.

Reviewers: djasper

Reviewed By: djasper

CC: cfe-commits, klimek

Differential Revision: http://llvm-reviews.chandlerc.com/D1544

llvm-svn: 189595
 2013-08-29 17:32:57 +00:00
Daniel Jasper 4c6e00595b clang-format: Format segments of builder-type calls one per line. 
This fixes llvm.org/PR14818.

Before:
  return llvm::StringSwitch<Reference::Kind>(name)
             .StartsWith(".eh_frame_hdr", ORDER_EH_FRAMEHDR)
             .StartsWith(".eh_frame", ORDER_EH_FRAME)
             .StartsWith(".init", ORDER_INIT).StartsWith(".fini", ORDER_FINI)
             .StartsWith(".hash", ORDER_HASH).Default(ORDER_TEXT);

After:
  return llvm::StringSwitch<Reference::Kind>(name)
             .StartsWith(".eh_frame_hdr", ORDER_EH_FRAMEHDR)
             .StartsWith(".eh_frame", ORDER_EH_FRAME)
             .StartsWith(".init", ORDER_INIT)
             .StartsWith(".fini", ORDER_FINI)
             .StartsWith(".hash", ORDER_HASH)
             .Default(ORDER_TEXT);

llvm-svn: 189353
 2013-08-27 14:24:43 +00:00
Daniel Jasper f438cb7619 clang-format: Fix corner case for string splitting .. 
.. in conjunction with Style.AlwaysBreakBeforeMultilineStrings. Also,
simplify the implementation by handling newly split strings and already
split strings by the same code.

llvm-svn: 189102
 2013-08-23 11:57:34 +00:00
Daniel Jasper 8de9ed05b7 clang-format: Add column layout formatting for braced lists 
With this patch, braced lists (with more than 3 elements are formatted in a
column layout if possible). E.g.:

  static const uint16_t CallerSavedRegs64Bit[] = {
    X86::RAX, X86::RDX, X86::RCX, X86::RSI, X86::RDI,
    X86::R8,  X86::R9,  X86::R10, X86::R11, 0
  };

Required other changes:
- FormatTokens can now have a special role that contains extra data and can do
  special formattings. A comma separated list is currently the only
  implementation.
- Move penalty calculation entirely into ContinuationIndenter (there was a last
  piece still in UnwrappedLineFormatter).

Review: http://llvm-reviews.chandlerc.com/D1457
llvm-svn: 189018
 2013-08-22 15:00:41 +00:00
Daniel Jasper de0328aea8 Split UnwrappedLineFormatter into individual components. 
Goals: Structure code better and make components easier to use for
future features (e.g. column layout for long braced initializers).

No functional changes intended.

llvm-svn: 188543
 2013-08-16 11:20:30 +00:00