Format type annotation as part of the type, not part of the modifiers list

[mernst]

This pull request cherry-picks commit https://github.com/google/google-java-format/commit/865cff01, "Format type annotation as part of the type, not part of the modifiers list" from google-java-format. It includes a few other changes that are needed by that commit, or that reduce the size of the diffs against google-java-format.

There are some changes to testdata/*.output files -- that is, to the expected output of the formatter. These relate to formatting of annotations and are due to changes in google-java-format.

[palantirtech]

Thanks for your interest in palantir/palantir-java-format, @mernst! Before we can accept your pull request, you need to sign our contributor license agreement - just visit https://cla.palantir.com/ and follow the instructions. Once you sign, I'll automatically update this pull request.

[changelog-app[bot]]

Generate changelog in changelog/@unreleased

Type

• [ ] Feature
• [ ] Improvement
• [ ] Fix
• [ ] Break
• [ ] Deprecation
• [ ] Manual task
• [ ] Migration

Description Format type annotation as part of the type, not part of the modifiers list

This pull request cherry-picks commit https://github.com/google/google-java-format/commit/865cff01, "Format type annotation as part of the type, not part of the modifiers list" from google-java-format. It includes a few other changes that are needed by that commit, or that reduce the size of the diffs against google-java-format.

There are some changes to testdata/*.output files -- that is, to the expected output of the formatter. These relate to formatting of annotations and are due to changes in google-java-format.

Check the box to generate changelog(s)

• [ ] Generate changelog entry

[mernst]

Ping.