Repository navigation
Commit 5ac3ec4
committed
Add --google-style to select Google Style
--aosp was the only style switch, with no way to select Google Style once it had
been passed. Wrapper scripts such as Chromium's google-java-format launcher
append --aosp unconditionally, leaving projects that format through them no way
to opt back into Google Style.
Add a --google-style flag, and allow overriding a previously given style. When
both --aosp and --google-style are given, the last one wins.1 parent e4cef58 commit 5ac3ec4
3 files changed
Lines changed: 18 additions & 0 deletions
File tree
- core/src
- main/java/com/google/googlejavaformat/java
- test/java/com/google/googlejavaformat/java
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
71 | 71 | | |
72 | 72 | | |
73 | 73 | | |
| 74 | + | |
74 | 75 | | |
75 | 76 | | |
76 | 77 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
37 | 40 | | |
38 | 41 | | |
39 | 42 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
77 | 77 | | |
78 | 78 | | |
79 | 79 | | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
80 | 94 | | |
81 | 95 | | |
82 | 96 | | |
| |||
0 commit comments