shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity
200,112 Commits 1,713 Branches 298 Tags
Commit Graph

1304 Commits

Author SHA1 Message Date
Daniel Jasper
1fe0d5ca59 clang-format: Merge labels and subsequent semicolons. 
E.g.:

  default:;

This can be used to get around restrictions as to what can follow a
label. It fixes llvm.org/PR19648.

llvm-svn: 236604
 2015-05-06 15:19:47 +00:00
Daniel Jasper
112b50e6b6 clang-format: Allow ternary expressions inside template parameters if 
the template parameters aren't inside an expression context.

This fixes llvm.org/PR23270.

llvm-svn: 236603
 2015-05-06 14:53:50 +00:00
Daniel Jasper
e92bf6f141 clang-format: Consider operator precedence as penalty when breaking 
before operators.

This fixes llvm.org/23382.

llvm-svn: 236602
 2015-05-06 14:23:38 +00:00
Daniel Jasper
04785d0488 clang-format: Accept slightly more record declarations. 
This fixes llvm.org/PR23397.

llvm-svn: 236599
 2015-05-06 14:03:02 +00:00
Daniel Jasper
2746a308c2 clang-format: Fix bad wrapping of ObjC method exprs. 
Before:
  [aaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaa:
      aaaaaaaa aaa:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa];

After:
  [aaaaaaaaaaaaaaaaaaaaaaaaa
      aaaaaaaaaaaaaaaaa:aaaaaaaa
                    aaa:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa];

Note that this might now violate the column limit and we probably need an
alternative way of indenting these then. However, that is still strictly better
than the messy formatting that clang-format did before.

llvm-svn: 236598
 2015-05-06 13:13:03 +00:00
Daniel Jasper
eb53668c35 clang-format: Properly indent method calls without inputs. 
Before:
  [aaaaaaaaaaa
          aaaaaaa];

After:
  [aaaaaaaaaaa
      aaaaaaa];

llvm-svn: 236597
 2015-05-06 12:48:06 +00:00
Manuel Klimek
24a8f55857 Remove deprecated version of reformat. 
llvm-svn: 236594
 2015-05-06 12:12:22 +00:00
Manuel Klimek
20e0af6b62 Remove all computation of structural errors in clang-format's line parser. 
We were already ignoring those already.

llvm-svn: 236591
 2015-05-06 11:56:29 +00:00
Daniel Jasper
e2408e37db clang-format: Fix another assertion discovered by the fuzzer. 
In the process, fix an old todo that I don't really know how to write
tests for. The problem is that Clang's lexer creates very strange token
sequences for these. However, the new approach seems generally better
and easier to read so I am submitting it nonetheless.

llvm-svn: 236589
 2015-05-06 11:16:43 +00:00
Daniel Jasper
62c78f5474 clang-format: Prevent assertion discovered by fuzzer. 
llvm-svn: 236578
 2015-05-06 08:58:57 +00:00
Daniel Jasper
4d9ec17f1e clang-format: Prevent exponential runtime in token annotator. 
llvm-svn: 236577
 2015-05-06 08:38:24 +00:00
Daniel Jasper
6d9b88dd99 clang-format: Fix bug in multiline comment wrapping. 
Splitting:
  /**
   * multiline block comment
   *
   */

Before:
  /**
   * multiline block
   *comment
   *
   */

After:
  /**
   * multiline block
   * comment
   *
   */

The reason was that the empty line inside the comment (with just the "*") was
confusing the comment breaking logic.

llvm-svn: 236573
 2015-05-06 07:17:22 +00:00
Daniel Jasper
9326f91922 clang-format: [JS] support optional methods. 
Optional methods use ? tokens like this:

  interface X { y?(): z; }

It seems easiest to detect and disambiguate these from ternary
expressions by checking if the code is in a declaration context. Turns
out that that didn't quite work properly for interfaces in Java and JS,
and for JS file root contexts.

Patch by Martin Probst, thank you.

llvm-svn: 236488
 2015-05-05 08:40:32 +00:00
Daniel Jasper
2964749cfa clang-format: [JS] Do not collapse short interfaces. 
Patch by Martin Probst.

llvm-svn: 236485
 2015-05-05 08:12:50 +00:00
Daniel Jasper
66cb8c503f clang-format: NFC: Delete FormatToken::IsForEachMacro. Use a TokenType instead. 
llvm-svn: 236415
 2015-05-04 09:22:29 +00:00
Daniel Jasper
3cea45d079 clang-format: NFC: Use default member initializers and other cleanups. 
llvm-svn: 236413
 2015-05-04 08:51:40 +00:00
Daniel Jasper
de7ca75ca0 clang-format: Force aligning different brackets relative to each other. 
Before:
  void SomeFunction(vector< // break
      int> v);

After:
  void SomeFunction(vector< // break
                        int> v);

llvm-svn: 236412
 2015-05-04 07:39:00 +00:00
Daniel Jasper
f69b922e57 clang-format: [JS] Fix calculation of template string width. 
OriginalColumn might not be set, so fall back to Location and SourceMgr
in case it is missing. Also initialize end column in case the token is
multi line, but it's the ` token itself that starts the multi line.

Patch by Martin Probst, thank you!

llvm-svn: 236383
 2015-05-02 08:05:38 +00:00
Daniel Jasper
d22190632c clang-format: [JS] Fix templated parameter default values. 
Parameters can have templated types and default values (= ...), which is
another location in which a template closer should be followed by
whitespace.

Patch by Martin Probst, thank you.

llvm-svn: 236382
 2015-05-02 07:54:58 +00:00
Daniel Jasper
e9f5357f49 clang-format: Don't merge short else blocks. 
Before (with the appropriate flags settings):
  if (a) {
    f();
  } else { g(); }

Before (with other appropriate flags settings):
  if (a) { f(); } else {
    g();
  }

After:
  if (a) {
    f();
  } else {
    g();
  }

llvm-svn: 236217
 2015-04-30 09:24:17 +00:00
Daniel Jasper
a4499133b1 clang-format: Add ability to align assignment operators. 
In Objective-C some style guides use a style where assignment operators are
aligned, in an effort to increase code readability. This patch adds an option
to the format library which allows this functionality. It is disabled by
default for all the included styles, so it must be explicitly enabled.

The option will change code such as:
  - (void)method {
      NSNumber *one = @1;
      NSNumber *twentyFive = @25;
  }

to:
  - (void)method {
      NSNumber *one        = @1;
      NSNumber *twentyFive = @25;
  }

Patch by Matt Oakes. Thank you!

Accidentally reformatted all the tests...

llvm-svn: 236100
 2015-04-29 13:06:49 +00:00
Daniel Jasper
eb45cb7cf9 clang-format: Fix selective indentaiton in nested blocks. 
Buggy case:
  someFunction(
      [] {
        // comment
        int i; // invoke formatting here.
      },       // force line break
      aaa);

llvm-svn: 236091
 2015-04-29 08:29:26 +00:00
Daniel Jasper
775954be1e clang-format: Don't wrap after short first segments of builder calls. 
Before:
  a()
      .aaaaa()
      .aaaaa()
      .aaaaa();

After:
  a().aaaaa()
      .aaaaa()
      .aaaaa();

llvm-svn: 235707
 2015-04-24 10:08:09 +00:00
Daniel Jasper
de0d1f3c26 clang-format: More selectively detect QT's "signals". 
llvm-svn: 235702
 2015-04-24 07:50:34 +00:00
Daniel Jasper
0faa9136fa clang-format: Properly detect variable declarations with ObjC. 
Before:
  LoooooooooooooooooooooooooooooooooooooooongType
  LoooooooooooooooooooooooooooooooooooooongVariable([A a]);

After:
  LoooooooooooooooooooooooooooooooooooooooongType
      LoooooooooooooooooooooooooooooooooooooongVariable([A a]);

llvm-svn: 235599
 2015-04-23 13:58:40 +00:00
Daniel Jasper
caf84fe21e clang-format: Allow splitting "= default" and "= delete". 
Otherwise, this can violate the column limit.

llvm-svn: 235592
 2015-04-23 12:59:09 +00:00
Daniel Jasper
532a031422 clang-format: Don't add unwanted space when creating new arrays. 
Before:
  char** newargv = new char* [argc];

After:
  char** newargv = new char*[argc];

llvm-svn: 235583
 2015-04-23 10:23:53 +00:00
Daniel Jasper
1b998815a0 clang-format: [Proto] Don't linewrap top-level options. 
They are very similar to import statements.

llvm-svn: 235582
 2015-04-23 09:54:10 +00:00
Daniel Jasper
289afc071e clang-format: Support nested block formatting with ColumnLimit=0. 
llvm-svn: 235580
 2015-04-23 09:23:17 +00:00
Daniel Jasper
ee4a8a140a clang-format: Fix for #pragma option formatting. 
Adapted patch from Sergey Razmetov. Thank you.

llvm-svn: 235492
 2015-04-22 09:45:42 +00:00
Daniel Jasper
e4ab49e8d3 clang-format: Fix incorrect multi-var declstmt detection. 
This is now obvious as the pointer alignment behavior was changed.

Before (even with pointer alignment "Left"):
  MACRO Constructor(const int &i) : a(a), b(b) {}

After:
  MACRO Constructor(const int& i) : a(a), b(b) {}

llvm-svn: 235301
 2015-04-20 12:54:29 +00:00
Daniel Jasper
0d6ac27b86 clang-format: [JS] handle comments in template strings. 
Patch by Martin Probst. Thank you.

llvm-svn: 235078
 2015-04-16 08:20:51 +00:00
Daniel Jasper
20e15563ff clang-format: Undo r214508. It was essentially always removing the 
space where we already had the flag ObjCSpaceBeforeProtocolList to
control it. I don't know what I was thinking.

llvm-svn: 235076
 2015-04-16 07:02:19 +00:00
Daniel Jasper
2b1865c251 clang-format: Determine "in" as a keyword in ObjC for loops more precisely 
Before:
  for (int i = 0; i < in [a]; ++i) ..

After:
  for (int i = 0; i < in[a]; ++i) ..

Also do some related cleanups.

llvm-svn: 234980
 2015-04-15 07:26:18 +00:00
Daniel Jasper
d9309774a6 clang-format: [JS] Support index signature types. 
Patch by Martin Probst.

llvm-svn: 234754
 2015-04-13 15:03:30 +00:00
Daniel Jasper
a74f5072e1 clang-format: [JS] support optionality markers in JS types. 
Patch by Martin Probst. Thank you.

llvm-svn: 234753
 2015-04-13 15:01:40 +00:00
Daniel Jasper
6a5d38d2ee clang-format: [JS] Allow periods and commata in class declarations. 
Patch by Martin Probst. Thank you.

llvm-svn: 234752
 2015-04-13 14:56:54 +00:00
Alexander Kornienko
34eb20725d Use 'override/final' instead of 'virtual' for overridden methods 
Summary:
The patch is generated using clang-tidy misc-use-override check.

This command was used:

  tools/clang/tools/extra/clang-tidy/tool/run-clang-tidy.py \
    -checks='-*,misc-use-override' -header-filter='llvm|clang' -j=32 -fix

Reviewers: dblaikie

Reviewed By: dblaikie

Subscribers: klimek, cfe-commits

Differential Revision: http://reviews.llvm.org/D8926

llvm-svn: 234678
 2015-04-11 02:00:23 +00:00
Daniel Jasper
53395406da clang-format: Fix regression formatting QT's "signals:" from r234318. 
llvm-svn: 234320
 2015-04-07 15:04:40 +00:00
Daniel Jasper
676e516354 clang-format: Don't allow labels when expecting declarations. 
This fixes formatting unnamed bitfields (llvm.org/PR21999).

Before:
  struct MyStruct {
    uchar data;
  uchar:
    8;
  uchar:
    8;
    uchar other;
  };

After:
  struct MyStruct {
    uchar data;
    uchar : 8;
    uchar : 8;
    uchar other;
  };

llvm-svn: 234318
 2015-04-07 14:36:33 +00:00
Daniel Jasper
acf67e3ecd clang-format: Improve nested block formatting. 
Before:
  functionA(functionB({
    int i;
    int j;
  }),
            aaaa, bbbb, cccc);

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

llvm-svn: 234304
 2015-04-07 08:20:35 +00:00
Daniel Jasper
9dedc775d7 clang-format: Indent relative to the ./-> and not the function name. 
Before:
  aaaaaaaaaaa     //
      .aaaa(      //
           bbbb)  // This is different ..
      .aaaa(      //
          cccc);  // .. from this.

After:
  aaaaaaaaaaa     //
      .aaaa(      //
          bbbb)   // This is identical ..
      .aaaa(      //
          cccc);  // .. to this.

llvm-svn: 234300
 2015-04-07 06:41:24 +00:00
Daniel Jasper
739ec534d2 clang-format: [JS] Understand object literals with only methods. 
Before:
  let theObject = {someMethodName() {
    doTheThing();
    doTheOtherThing();
  },
                   someOtherMethodName() {
                     doSomething();
                     doSomethingElse();
                   }};

After:
  let theObject = {
    someMethodName() {
      doTheThing();
      doTheOtherThing();
    },
    someOtherMethodName() {
      doSomething();
      doSomethingElse();
    }
  };

llvm-svn: 234091
 2015-04-04 07:56:55 +00:00
Daniel Jasper
1662bfe077 clang-format: [Proto] No alternate operator names. 
llvm-svn: 234055
 2015-04-03 21:15:46 +00:00
Daniel Jasper
f46dec86b6 clang-format: [JS] Support getters, setters and methods in object literals. 
llvm-svn: 233698
 2015-03-31 14:34:15 +00:00
Daniel Jasper
02c7bca5d1 clang-format: [JS] Fix comment formatting in goog.scopes. 
Before:
  goog.scope(function() {
  // test
  var x = 0;
  // test
  });

After:
  goog.scope(function() {
  // test
  var x = 0;
    // test
  });

llvm-svn: 233530
 2015-03-30 09:56:50 +00:00
Daniel Jasper
05cd92922d clang-format: Force line break in trailing calls after multline exprs. 
Before:
  aaaaaaaa(aaaaaaaaaa,
           bbbbbbbbbb).a();

After:
  aaaaaaaa(aaaaaaaaaa,
           bbbbbbbbbb)
      .a();

llvm-svn: 233304
 2015-03-26 18:46:28 +00:00
Daniel Jasper
e99c72fc2e clang-format: Fix merging of _T macros. 
NewlinesBefore and HasUnescapedNewline were not properly propagated
leading to llvm.org/PR23032.

llvm-svn: 233276
 2015-03-26 14:47:35 +00:00
Benjamin Kramer
53f5e893c2 Explicitly include raw_ostream.h instead of relying on transitive inclusion. 
NFC.

llvm-svn: 232975
 2015-03-23 18:05:43 +00:00
Daniel Jasper
414c9c6fb0 clang-format: Fix another bug in wrapping around "*". 
Before:
  void aaaaa(
      aaaaaaaaaaaa* aaaaaaaaaaaaaa) {} // even violation the column limit

After:
  void aaaaa(aaaaaaaaaaaa*
                 aaaaaaaaaaaaaa) {}

llvm-svn: 232717
 2015-03-19 09:40:16 +00:00