summaryrefslogtreecommitdiff
path: root/clang/unittests/Format/FormatTestJava.cpp
AgeCommit message (Collapse)Author
2015-01-13clang-format: [Java] Detect `native` keyword.Nico Weber
Before: public native<X> Foo foo(); After: public native <X> Foo foo(); llvm-svn: 225839
2015-01-09clang-format: [Java] Support formatting qualified annotations.Nico Weber
llvm-svn: 225559
2015-01-05clang-format: [Java] Fix incorrect detection of cast.Daniel Jasper
After: return (a instanceof List<?>) ? aaaaaaaaaaaaaaaaaaaaaaa( aaaaaaaaaaaaaaaaaaaaa) : aaaaaaaaaaaaaaaaaaaaaaa; After: return (a instanceof List<?>) ? aaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaa) : aaaaaaaaaaaaaaaaaaaaaaa; llvm-svn: 225161
2015-01-04clang-format: [Java] Fix incorrect recognition of annonymous classes.Daniel Jasper
Before: someFunction(new Runnable() { public void run() { System.out.println(42); } }); After: someFunction(new Runnable() { public void run() { System.out.println(42); } }); llvm-svn: 225142
2015-01-04clang-format: Re-enable comment re-indentation for Java/JS.Daniel Jasper
This was broken by r224120. llvm-svn: 225130
2014-12-12Don't break string literals in Java and JavaScript.Alexander Kornienko
The proper way to break string literals in these languages is by inserting a "+" between parts which we don't support yet. So we disable string literal breaking until then. llvm-svn: 224120
2014-12-08clang-format: Indent correctly in conditional expressions after return.Daniel Jasper
This only applies when not aligning after the return itself (which is commonly done for C++. Before: return aaaaaaaaaa ? bbbbbbbbbb( bbbbbb) // This is indented relative to aaaaaaaaaa. : b; After: return aaaaaaaaaa ? bbbbbbbbbb( bbbbbb) : b; llvm-svn: 223694
2014-12-08clang-format: [Java] Always break after annotations of multiline decls.Daniel Jasper
Before: @Mock DataLoader loooooooooooooooooooooooader = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa; After: @Mock DataLoader loooooooooooooooooooooooader = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa; llvm-svn: 223688
2014-12-03clang-format: Fix expression parser not closing stuff at end of stmt.Daniel Jasper
Uncovered by a Java test case: Before: public some.package.Type someFunction( // comment int parameter) {} After: public some.package.Type someFunction( // comment int parameter) {} llvm-svn: 223228
2014-12-02clang-format: Add option to suppress operator alignment.Daniel Jasper
With alignment: int aaaaaa = aa + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb * cccccccccccccccccccccccccccccccc; Without alignment: int aaaaaa = aa + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb * cccccccccccccccccccccccccccccccc; This fixes llvm.org/PR21666. llvm-svn: 223117
2014-11-27clang-format: Don't use column layout with AlignAfterOpenBrackets.Daniel Jasper
This fixes llvm.org/PR21676. llvm-svn: 222886
2014-11-26clang-format: [Java] Don't line-wrap package declarations.Daniel Jasper
This fixes llvm.org/PR21677. llvm-svn: 222843
2014-11-26clang-format: Tweak -style=Chromium for Java files.Nico Weber
For Java, don't do any of the deviations from Google Style that Chromium style does for C++. Chromium's Java follows Android Java style [1], which is roughly Google Java style with an indent of 4 and a continuation indent of 8. 1: https://source.android.com/source/code-style.html llvm-svn: 222839
2014-11-26clang-format: [Java] Improve formatting of throws declarations.Daniel Jasper
Before: public void doSoooooooooo() throws LoooooooooongException, LooooooooooongException {} After: public void doSoooooooooo() throws LoooooooooongException, LooooooooooongException {} llvm-svn: 222829
2014-11-26clang-format: [Java] Improve cast detection.Daniel Jasper
Before: a[b >> 1] = (byte)(c() << 4); After: a[b >> 1] = (byte) (c() << 4); llvm-svn: 222827
2014-11-26clang-format: [Java] Fix breaking after annotations.Daniel Jasper
Before: @Annotation1 // comment @Annotation2 class C {} After: @Annotation1 // comment @Annotation2 class C {} llvm-svn: 222825
2014-11-26clang-format: Add SFS_Empty to only empty functions on a single line.Daniel Jasper
Activated for and tested by Google's Java style. This fixes llvm.org/PR21667. llvm-svn: 222819
2014-11-26clang-format: [Java] Support Foo.class;Daniel Jasper
Before: SomeClass. class.getName(); After: SomeClass.class.getName(); This fixes llvm.org/PR21665. llvm-svn: 222813
2014-11-25clang-format: Refactoring.Daniel Jasper
Re-apply r222638 and r222641 without variadic templates. llvm-svn: 222747
2014-11-24Reverting r222638; it broke the MSVC build bots because Visual Studio 2012 ↵Aaron Ballman
does not support variadic templates. Also reverting r222641 because it was relying on 222638. llvm-svn: 222656
2014-11-23clang-format: [Java] Treat 'instanceof' like other binary operators.Daniel Jasper
This fixes llvm.org/PR21436. llvm-svn: 222641
2014-11-23clang-format: [Java] Space before array initializers.Daniel Jasper
Before: new int[]{1, 2, 3, 4}; After: new int[] {1, 2, 3, 4}; llvm-svn: 222640
2014-11-21clang-format: Use nested block special case for all languages.Daniel Jasper
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-21clang-format: [Java] Support more Java keywords.Daniel Jasper
Before: public final<X> Foo foo() { } public abstract<X> Foo foo(); After: public final <X> Foo foo() { } public abstract <X> Foo foo(); Patch by Harry Terkelsen. Thank you. llvm-svn: 222527
2014-11-21clang-format: [Java] Basic lambda support.Daniel Jasper
llvm-svn: 222524
2014-11-20clang-format: [Java] Don't align after "return".Daniel Jasper
Doesn't seem to be common practice in Java. Before: return aaaaaaaaaaaaaaaaaaa && bbbbbbbbbbbbbbbbbbb && ccccccccccccccccccc; After: return aaaaaaaaaaaaaaaaaaa && bbbbbbbbbbbbbbbbbbb && ccccccccccccccccccc; Patch by Harry Terkelsen. llvm-svn: 222424
2014-11-20clang-format: [Java] Don't force break before generic type method.Daniel Jasper
Before: Foo.bar() .<X> baz(); After: Foo.bar() .<X>baz(); Patch by Harry Terkelsen. llvm-svn: 222423
2014-11-19clang-format: [Java] Accept generic types in enum declarationDaniel Jasper
Before: enum Foo implements Bar<X, Y> { ABC { ... } , CDE { ... }; } After: enum Foo implements Bar<X, Y> { ABC { ... }, CDE { ... }; } Patch by Harry Terkelsen. llvm-svn: 222394
2014-11-19clang-format: [Java] Ignore C++-specific keywordsDaniel Jasper
Before: public void union (Object o); public void struct (Object o); public void delete (Object o); After: public void union(Object o); public void struct(Object o); public void delete(Object o); Patch by Harry Terkelsen, thank you! llvm-svn: 222357
2014-11-18clang-format: Add option to disable alignment after opening bracketsDaniel Jasper
Before: SomeFunction(parameter, parameter); After: SomeFunction(parameter, parameter); Patch by Harry Terkelsen, thank you! llvm-svn: 222284
2014-11-18clang-format: Fix space between generic type parameter and squareDaniel Jasper
bracket Before: public Foo<X, Y> [] foos; After: public Foo<X, Y>[] foos; Patch by Harry Terkelsen. Thank you! llvm-svn: 222283
2014-11-14clang-format: [Java] Further improve generics formatting.Daniel Jasper
llvm-svn: 222011
2014-11-14clang-format: [Java] Fix line break behavior of class declarations.Daniel Jasper
Change breaking preferences: 1. Break before "extends" 2. Break before "implements" 3. Break within the implements list. llvm-svn: 221981
2014-11-14clang-format: [Java] Improve generic return type formatting.Daniel Jasper
Before: public<R> ArrayList<R> get() { After: public <R> ArrayList<R> get() { llvm-svn: 221979
2014-11-14clang-format: [Java] No altnerative operator names in Java.Daniel Jasper
Before: someObject.and (); After: someObject.and(); llvm-svn: 221978
2014-11-14clang-format: [Java] Improve formatting of generics.Daniel Jasper
Before: Function < F, ? extends T > function; After: Function<F, ? extends T> function; llvm-svn: 221976
2014-11-13clang-format: [Java] Support Java enums.Daniel Jasper
In Java, enums can contain a class body and enum constants can have arguments as well as class bodies. Support most of that. llvm-svn: 221895
2014-11-10clang-format: [Java] Never treat @interface as annotation.Nico Weber
'@' followed by any keyword can't be an annotation, but @interface is currently the only combination of '@' and a keyword that's allowed, so limit it to this case. `@interface Foo` without a leading `public` was misformatted prior to this patch. llvm-svn: 221607
2014-11-04clang-format: [Java] Fix class declaration line breaks.Daniel Jasper
Before: @SomeAnnotation() abstract class aaaaaaaaa<a> extends bbbbbbbbbbbb<b> implements cccccccccccc { } After: @SomeAnnotation() abstract class aaaaaaaaa<a> extends bbbbbbbbbbbb<b> implements cccccccccccc { } llvm-svn: 221256
2014-11-03Revert "clang-format: [Java] Allow trailing semicolons after enums."Daniel Jasper
This reverts commit b5bdb2ef59ab922bcb4d6e843fffaee1f7f68a8c. This doesn't really seem necessary on second though and causes problems with C++ enum formatting. llvm-svn: 221158
2014-11-03clang-format: [Java] Allow trailing semicolons after enums.Daniel Jasper
Before: enum SomeThing { ABC, CDE } ; After: enum SomeThing { ABC, CDE }; llvm-svn: 221125
2014-11-03clang-format: [Java] Fix more generics formatting.Daniel Jasper
Before: < T extends B > T getInstance(Class<T> type); After: <T extends B> T getInstance(Class<T> type); llvm-svn: 221124
2014-11-03clang-format: [Java] Fix static generic methods.Daniel Jasper
Before: public static<R> ArrayList<R> get() {} After: public static <R> ArrayList<R> get() {} llvm-svn: 221122
2014-11-03clang-format: [Java] Fix class declaration formatting.Daniel Jasper
Before: @SomeAnnotation() abstract class aaaaaaaaaaaa extends bbbbbbbbbbbbbbb implements cccccccccccc { } After: @SomeAnnotation() abstract class aaaaaaaaaaaa extends bbbbbbbbbbbbbbb implements cccccccccccc { } llvm-svn: 221121
2014-11-02clang-format: [Java] Support enums without trailing semicolon.Daniel Jasper
Before: class SomeClass { enum SomeThing { ABC, CDE } void f() { } } After: class SomeClass { enum SomeThing { ABC, CDE } void f() { } } This fixed llvm.org/PR21458. llvm-svn: 221113
2014-11-02clang-format: [Java] Don't break imports.Daniel Jasper
This fixes llvm.org/PR21453. llvm-svn: 221112
2014-11-02clang-format: [Java] Add space between "synchronized" and "(".Daniel Jasper
Before: synchronized(mData) { // ... } After: synchronized (mData) { // ... } This fixes llvm.org/PR21455. llvm-svn: 221110
2014-11-02clang-format: [Java] Support generics with "?".Daniel Jasper
Before: @Override public Map < String, ? > getAll() { // ... } After: @Override public Map<String, ?> getAll() { // ... } This fixes llvm.org/PR21454. llvm-svn: 221109
2014-11-02clang-format: [Java] Support try/catch/finally blocks.Daniel Jasper
llvm-svn: 221104
2014-11-02clang-format: [Java] Don't break after extends/implements.Daniel Jasper
Before: abstract class SomeClass extends SomeOtherClass implements SomeInterface {} After: abstract class SomeClass extends SomeOtherClass implements SomeInterface {} llvm-svn: 221103