forked from google/google-java-format
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Sync upstream changes. #3
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes google#409 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=286092096
Fixes google#374 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=286467734
Fixes google#391 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=286493206
Parameterless annotations aren't necessarily marker annotations. All we can tell about a use of an annotation is that it's parameterless, and that's how 4.8.5 is specified. Related: google#360 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=286650854
This unbreaks `mvn install` on AdoptOpenJDK 11. Presumably it unbreaks on all JDKs >= 11. Fixes google#429 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=288016119
Fixes google#422, fixes google#423 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=288364171
this is tangentially related to Java 11 preparedness. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=300822964
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=301273002
instead of relying on the shaded/vendored version. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=301645476
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=301832060
Previously the shaded javac was defaulting to Java 8, which we needed to override to support Java 9. Now that we're using stock JDK 11 this is unnecessary. Also explicitly support `var`, instead of relying on it getting parsed as an actual type name. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=302105420
Treats unary minus literals (eg -4.0) as their underlying type when checking if all elements in a tabular list are of the same Tree.Kind. Fixes google#400, google#406 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=303137504
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=303367644
to support uses of `var` as an identifier, with and without a type, e.g. in `var -> { ... }` and `int var x = 42`; and uses of `var ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=307693554
I couldn't find any good way to make this backwards compatible. Oh well. FYI, It looks like in 2020.1, we can probably actually use the ExternalFormatProcessor extension point instead of doing all this hacky nonsense... they added a #format(PsiFile, TextRange) method you can override. But I'll leave that for later because 2020.1 is out now and people are mad. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=308647308
Fixes google#460 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=308658958
Fixes google#463 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=308891540
PiperOrigin-RevId: 309329483
Fix javadoc syntax by wrap `<` into an inline code block. ``` [WARNING] ...\google-java-format\core\src\main\java\com\google\googlejavaformat\java\JavaInputAstVisitor.java:2577: warning - invalid usage of tag < ``` Fixes google#454 COPYBARA_INTEGRATE_REVIEW=google#454 from sormuras:patch-1 f5583c7 PiperOrigin-RevId: 309364827
PiperOrigin-RevId: 309456095
PiperOrigin-RevId: 309467646
`throws` statements are allows to occur in non-block expression switch cases, which was causing the trailing `;` to be printed twice. Fixes google#477 PiperOrigin-RevId: 310974906
… the full string will trigger stripping under Copybara. Also, avoid reference to an internal link shortener, as we are making references to it an error. Looking to the future: When we migrate to use proper Copybara stripping directives, we could consider removing support for the old directives. Then the problem would mostly go away. However, we might end up having the same problem with Copybara directives when google-java-format's strings and method names start mentioning *them*. PiperOrigin-RevId: 311344956
- Add the possibility of formatting your code from Github directly (taking all the events of Github Actions) - Addition of the word "old" for the eclipse plugin, since it is 1.6 release Fixes google#487 COPYBARA_INTEGRATE_REVIEW=google#487 from av1m:master 351b737 PiperOrigin-RevId: 313312689
PiperOrigin-RevId: 314566781
Implement visitYield. Fixes google#489 from ntkoopman:yield b46d1f0 COPYBARA_INTEGRATE_REVIEW=google#489 PiperOrigin-RevId: 314633394
Fixes google#495 COPYBARA_INTEGRATE_REVIEW=google#495 from taesu82:patch-1 91e32d4 PiperOrigin-RevId: 315560436
PiperOrigin-RevId: 318495968
PiperOrigin-RevId: 320733285
Our account for Appveyor allows only 1 concurrent build. Our current Appveyor config builds every commit to a PR twice -- once as the PR and once as the branch. This CL updates our Appveyor config to disable builds on branches, so we get only one build per PR commit. PiperOrigin-RevId: 320734870
PiperOrigin-RevId: 320945302
Also included the Spotless maven plugin (2+ years old, but not well marketed) Fixes google#509 COPYBARA_INTEGRATE_REVIEW=google#509 from nedtwigg:patch-2 546c758 PiperOrigin-RevId: 322832707
PiperOrigin-RevId: 328160170
PiperOrigin-RevId: 328214914
Fixes google#519 COPYBARA_INTEGRATE_REVIEW=google#519 from mernst:checker-qual-361 ca54cb9 PiperOrigin-RevId: 331830590
PiperOrigin-RevId: 332323928
PiperOrigin-RevId: 336966883
even if they're own their own line (which g-j-f does if it runs with import cleanup disabled). PiperOrigin-RevId: 337192414
follow-up to google@b769e81 PiperOrigin-RevId: 337511552
I *think* they are typoes? Apologies if this is intended. PiperOrigin-RevId: 343547804
This PR introduces a CI workflow using GitHub Actions and removes the Travis CI configuration file. Find new workflow runs for this PR here: https://github.com/sormuras/google-java-format/actions #### TODO - [x] Email [Notifications](https://docs.github.com/en/free-pro-team@latest/github/managing-subscriptions-and-notifications-on-github/configuring-notifications) -- register `google-java-format-dev+ci@google.com` as a watcher or let each interested use register themself? - [ ] Test publish snapshot job on `google:master` -- after storing credential [secrets](https://github.com/google/google-java-format/settings/secrets/actions). - [ ] Remove AppVeyor [integration](https://github.com/google/google-java-format/settings/installations) and delete `appveyor.yml` configuration file. Closes google#543 Fixes google#544 COPYBARA_INTEGRATE_REVIEW=google#544 from sormuras:github-action a689f62 PiperOrigin-RevId: 344280060
Addresses google#538 (comment) Fixes google#548 COPYBARA_INTEGRATE_REVIEW=google#548 from sormuras:jdk-ea 0ee3f7c PiperOrigin-RevId: 344818484
Fixes google#547 PiperOrigin-RevId: 344903246
PiperOrigin-RevId: 345300707
Startblock: cl-status copybara contains unknown commit in live PiperOrigin-RevId: 345718768
* Work around change to tokenization in JDK-8254073 * Access refactored expression pattern getters reflectively * Relax a check on a diagnostic whose position changed PiperOrigin-RevId: 347318664
robfig
approved these changes
Dec 17, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Woot, thanks!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.