Skip to content

Commit d8b8a86

Browse files
authored
Support addTypeAnnotation() and removeTypeAnnotation()
1 parent 437636b commit d8b8a86

File tree

24 files changed

+613
-517
lines changed

24 files changed

+613
-517
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

CHANGES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
1111

1212
## [Unreleased]
1313
### Added
14-
* `typeAnnotations()` step to correct formatting of type annotations. It puts type annotations on the same line as the type that they qualify. Run it after a Java formatting step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
14+
* `formatAnnotations()` step to correct formatting of type annotations. It puts type annotations on the same line as the type that they qualify. Run it after a Java formatting step, such as `googleJavaFormat()`. ([#1275](https://github.com/diffplug/spotless/pull/1275))
1515

1616
## [2.29.0] - 2022-08-23
1717
### Added

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ lib('java.ImportOrderStep') +'{{yes}} | {{yes}}
6161
lib('java.PalantirJavaFormatStep') +'{{yes}} | {{yes}} | {{no}} | {{no}} |',
6262
lib('java.RemoveUnusedImportsStep') +'{{yes}} | {{yes}} | {{yes}} | {{no}} |',
6363
extra('java.EclipseJdtFormatterStep') +'{{yes}} | {{yes}} | {{yes}} | {{no}} |',
64-
lib('java.TypeAnnotationsStep') +'{{yes}} | {{yes}} | {{no}} | {{no}} |',
64+
lib('java.FormatAnnotationsStep') +'{{yes}} | {{yes}} | {{no}} | {{no}} |',
6565
lib('json.gson.GsonStep') +'{{yes}} | {{no}} | {{no}} | {{no}} |',
6666
lib('json.JsonSimpleStep') +'{{yes}} | {{no}} | {{no}} | {{no}} |',
6767
lib('kotlin.KtLintStep') +'{{yes}} | {{yes}} | {{yes}} | {{no}} |',
@@ -105,7 +105,7 @@ extra('wtp.EclipseWtpFormatterStep') +'{{yes}} | {{yes}}
105105
| [`java.PalantirJavaFormatStep`](lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java) | :+1: | :+1: | :white_large_square: | :white_large_square: |
106106
| [`java.RemoveUnusedImportsStep`](lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java) | :+1: | :+1: | :+1: | :white_large_square: |
107107
| [`java.EclipseJdtFormatterStep`](lib-extra/src/main/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStep.java) | :+1: | :+1: | :+1: | :white_large_square: |
108-
| [`java.TypeAnnotationsStep`](lib/src/main/java/com/diffplug/spotless/java/TypeAnnotationsStep.java) | :+1: | :+1: | :white_large_square: | :white_large_square: |
108+
| [`java.FormatAnnotationsStep`](lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java) | :+1: | :+1: | :white_large_square: | :white_large_square: |
109109
| [`json.gson.GsonStep`](lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java) | :+1: | :white_large_square: | :white_large_square: | :white_large_square: |
110110
| [`json.JsonSimpleStep`](lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java) | :+1: | :white_large_square: | :white_large_square: | :white_large_square: |
111111
| [`kotlin.KtLintStep`](lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java) | :+1: | :+1: | :+1: | :white_large_square: |

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ VER_MOCKITO=3.3.3
3333
# Used for Maven Plugin
3434
VER_MAVEN_API=3.0
3535
VER_ECLIPSE_AETHER=0.9.0.M2
36-
VER_MUSTACHE=0.9.6
36+
VER_MUSTACHE=0.9.10
3737
VER_PLEXUS_RESOURCES=1.2.0

gradle/spotless.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spotless {
2222
eclipse().configFile rootProject.file('gradle/spotless.eclipseformat.xml')
2323
trimTrailingWhitespace()
2424
removeUnusedImports()
25-
// TODO: typeAnnotations()
25+
// TODO: formatAnnotations()
2626
custom 'noInternalDeps', noInternalDepsClosure
2727
}
2828
}

0 commit comments

Comments
 (0)