Skip to content

Commit 57a8a92

Browse files
Nivaldo Bondançafacebook-github-bot
authored andcommitted
Codemod format for trailing commas incoming change [110/n]
Summary: Adding trailing commas to folders: - fbandroid/java/com/facebook/ixbrowser - fbandroid/java/com/facebook/ixt - fbandroid/java/com/facebook/katana - fbandroid/java/com/facebook/keyframes - fbandroid/java/com/facebook/kotlin Reviewed By: dtolnay Differential Revision: D80365130 fbshipit-source-id: 6d05a546daae71f8dce58932e24c0d2515b9c79f
1 parent 8ef65ef commit 57a8a92

File tree

13 files changed

+63
-41
lines changed

13 files changed

+63
-41
lines changed

annotation/src/commonMain/kotlin/com/facebook/kotlin/compilerplugins/dataclassgenerate/annotation/DataClassGenerate.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ enum class Mode {
1111
/** Express an intent to keep/generate a method(s) DataClassGenerate. */
1212
KEEP,
1313
/** Express an intent to omit method(s) generation. */
14-
OMIT
14+
OMIT,
1515
}
1616

1717
@Target(AnnotationTarget.CLASS)
@@ -49,5 +49,5 @@ enum class Mode {
4949
*/
5050
annotation class DataClassGenerate(
5151
@get:JvmName("toString_uniqueJvmName") val toString: Mode = Mode.OMIT,
52-
val equalsHashCode: Mode = Mode.KEEP
52+
val equalsHashCode: Mode = Mode.KEEP,
5353
)

compiler/cli/src/main/kotlin/com/facebook/kotlin/compilerplugins/dataclassgenerate/DataClassGenerateCommandLineProcessor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class DataClassGenerateCommandLineProcessor : CommandLineProcessor {
2626
override fun processOption(
2727
option: AbstractCliOption,
2828
value: String,
29-
configuration: CompilerConfiguration
29+
configuration: CompilerConfiguration,
3030
) {
3131
when (option) {
3232
ENABLED.cliOption -> configuration.put(ENABLED.configurationKey, value.toBoolean())

compiler/cli/src/test/kotlin/com/facebook/kotlin/compilerplugins/dataclassgenerate/DcgCompilerIdentityTest.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ class DcgCompilerIdentityTest : DcgTestCase() {
5252
| open class Base
5353
| data class SampleWithSuper(val a: Int) : Base()
5454
"""
55-
.trimMargin())
55+
.trimMargin(),
56+
)
5657

5758
@BeforeClass
5859
@JvmStatic
@@ -279,7 +280,8 @@ private val DCG_ANNOTATION =
279280
| val equalsHashCode: Mode = Mode.KEEP
280281
| )
281282
"""
282-
.trimMargin())
283+
.trimMargin(),
284+
)
283285

284286
private const val DCG_SUPER =
285287
"com/facebook/kotlin/compilerplugins/dataclassgenerate/superclass/DataClassSuper"

compiler/cli/src/test/kotlin/com/facebook/kotlin/compilerplugins/dataclassgenerate/DcgTestCase.kt

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ open class DcgTestCase {
3838

3939
private fun makeCompilationContext(
4040
code: Array<out SourceFile>,
41-
dcgConfig: DcgTestConfiguration
41+
dcgConfig: DcgTestConfiguration,
4242
): KotlinCompilation =
4343
KotlinCompilation().apply {
4444
sources = code.asList()
@@ -50,28 +50,36 @@ open class DcgTestCase {
5050

5151
val DEFAULT_DCG_CONFIG =
5252
DcgTestConfiguration(
53-
enabled = true, pluginMode = PluginMode.EXPLICIT, generateSuperClass = true)
53+
enabled = true,
54+
pluginMode = PluginMode.EXPLICIT,
55+
generateSuperClass = true,
56+
)
5457
}
5558
}
5659

5760
data class DcgTestConfiguration(
5861
val enabled: Boolean,
5962
val pluginMode: PluginMode,
60-
val generateSuperClass: Boolean
63+
val generateSuperClass: Boolean,
6164
) {
6265
internal fun asCliOptions(): List<PluginOption> {
6366
val pluginId = DataClassGenerateCommandLineProcessor().pluginId
6467
return listOf(
6568
PluginOption(
6669
pluginId,
6770
CompilerConfigurationProperties.ENABLED.cliOption.optionName,
68-
enabled.toString()),
71+
enabled.toString(),
72+
),
6973
PluginOption(
70-
pluginId, CompilerConfigurationProperties.MODE.cliOption.optionName, pluginMode.name),
74+
pluginId,
75+
CompilerConfigurationProperties.MODE.cliOption.optionName,
76+
pluginMode.name,
77+
),
7178
PluginOption(
7279
pluginId,
7380
CompilerConfigurationProperties.GENERATE_SUPER_CLASS.cliOption.optionName,
74-
generateSuperClass.toString()),
81+
generateSuperClass.toString(),
82+
),
7583
)
7684
}
7785
}

compiler/cli/src/test/kotlin/com/facebook/kotlin/compilerplugins/dataclassgenerate/DumpingVisitor.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class DcgDumpClassVisitor(val dcgDump: DcgDump) : ClassVisitor(ASM5) {
2121
name: String,
2222
desc: String,
2323
signature: String?,
24-
exceptions: Array<out String>?
24+
exceptions: Array<out String>?,
2525
): MethodVisitor {
2626
val original = super.visitMethod(access, name, desc, signature, exceptions)
2727
val methodContextDumper =
@@ -43,7 +43,7 @@ class DcgDumpClassVisitor(val dcgDump: DcgDump) : ClassVisitor(ASM5) {
4343
name: String,
4444
signature: String?,
4545
superName: String,
46-
interfaces: Array<out String>
46+
interfaces: Array<out String>,
4747
) {
4848
dcgDump.superClass = superName
4949
}

compiler/common/src/main/kotlin/com/facebook/kotlin/compilerplugins/dataclassgenerate/configuration/CompilerConfigurationProperties.kt

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,31 @@ object CompilerConfigurationProperties {
1515
CompilerConfigurationProperty(
1616
CliOption("enabled", "<true | false>", "whether plugin is enabled", required = false),
1717
CompilerConfigurationKey("enabled"),
18-
true)
18+
true,
19+
)
1920
val MODE =
2021
CompilerConfigurationProperty(
2122
CliOption(
2223
"mode",
2324
PluginMode.values().joinToString(prefix = "<", postfix = ">", separator = " | "),
2425
"defines plugin mode, check PluginMode.kt enum for more details}",
25-
required = false),
26+
required = false,
27+
),
2628
CompilerConfigurationKey("mode"),
27-
PluginMode.EXPLICIT)
29+
PluginMode.EXPLICIT,
30+
)
2831

2932
val GENERATE_SUPER_CLASS =
3033
CompilerConfigurationProperty(
3134
CliOption(
3235
"generateSuperClass",
3336
"<true | false>",
3437
"whether a super class should be generated for appropriate data classes",
35-
required = false),
38+
required = false,
39+
),
3640
CompilerConfigurationKey("generateSuperClass"),
37-
true)
41+
true,
42+
)
3843
val all
3944
get() = listOf(ENABLED, MODE, GENERATE_SUPER_CLASS)
4045
}

compiler/common/src/main/kotlin/com/facebook/kotlin/compilerplugins/dataclassgenerate/configuration/CompilerConfigurationProperty.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.config.CompilerConfigurationKey
1414
class CompilerConfigurationProperty<T>(
1515
val cliOption: CliOption,
1616
val configurationKey: CompilerConfigurationKey<T>,
17-
val default: T?
17+
val default: T?,
1818
) {
1919
init {
2020
if (default == null) require(cliOption.required)

compiler/common/src/main/kotlin/com/facebook/kotlin/compilerplugins/dataclassgenerate/configuration/PluginMode.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ enum class PluginMode {
3131
* `equals` and `hashCode`. @DataClassGenerate(toString = Mode.KEEP, equalsHashCode = Mode.OMIT)
3232
* data class A(val i: Int)
3333
*/
34-
IMPLICIT
34+
IMPLICIT,
3535
}

compiler/k1/src/main/kotlin/com/facebook/kotlin/compilerplugins/dataclassgenerate/DataClassGenerateBuilder.kt

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class DataClassGenerateBuilder(
5858
name: String,
5959
signature: String?,
6060
superName: String,
61-
interfaces: Array<out String>
61+
interfaces: Array<out String>,
6262
) {
6363
var effectiveSuperName = superName
6464
// K1 handling
@@ -99,7 +99,8 @@ class DataClassGenerateBuilder(
9999
name,
100100
signature,
101101
effectiveSuperName,
102-
interfaces)
102+
interfaces,
103+
)
103104
}
104105

105106
override fun newMethod(
@@ -108,7 +109,7 @@ class DataClassGenerateBuilder(
108109
name: String,
109110
desc: String,
110111
signature: String?,
111-
exceptions: Array<out String>?
112+
exceptions: Array<out String>?,
112113
): MethodVisitor {
113114
val originalVisitor = super.newMethod(origin, access, name, desc, signature, exceptions)
114115
if (origin.isDataClass() && !origin.isLikelyMethodOfSyntheticClass()) {
@@ -177,19 +178,19 @@ class DataClassGenerateBuilder(
177178

178179
fun generateStrictModeViolationMessage(fqName: FqName?): String =
179180
"""
180-
You are running DataClassGenerate compiler plugin in a STRICT mode.
181-
But $fqName is not annotated with @DataClassGenerate.
182-
183-
Replace $fqName with @DataClassGenerate(toString=Mode.OMIT, equalsHashCode=Mode.KEEP)
184-
- If $fqName does not need a `toString()` method use `toString=Mode.OMIT`
185-
- If $fqName does not need `equals()` and hashCode()` use `equalsHashCode=Mode.OMIT` or
186-
consider replacing it with a regular class.
187-
188-
Read more:
189-
1. What is DataClassGenerate? - https://fburl.com/dataclassgenerate_wiki
190-
2. How to configure @DataClassGenerate annotation? - https://fburl.com/dataclassgenerate
191-
3. What is STRICT mode? - https://fburl.com/dataclassgenerate_mode
192-
"""
181+
You are running DataClassGenerate compiler plugin in a STRICT mode.
182+
But $fqName is not annotated with @DataClassGenerate.
183+
184+
Replace $fqName with @DataClassGenerate(toString=Mode.OMIT, equalsHashCode=Mode.KEEP)
185+
- If $fqName does not need a `toString()` method use `toString=Mode.OMIT`
186+
- If $fqName does not need `equals()` and hashCode()` use `equalsHashCode=Mode.OMIT` or
187+
consider replacing it with a regular class.
188+
189+
Read more:
190+
1. What is DataClassGenerate? - https://fburl.com/dataclassgenerate_wiki
191+
2. How to configure @DataClassGenerate annotation? - https://fburl.com/dataclassgenerate
192+
3. What is STRICT mode? - https://fburl.com/dataclassgenerate_mode
193+
"""
193194
.trimIndent()
194195

195196
class DataClassGenerateStrictModeViolationException(message: String) : RuntimeException(message)

compiler/k1/src/main/kotlin/com/facebook/kotlin/compilerplugins/dataclassgenerate/DataClassGenerateInterceptorExtension.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class DataClassGenerateInterceptorExtension(
2424
override fun interceptClassBuilderFactory(
2525
interceptedFactory: ClassBuilderFactory,
2626
bindingContext: BindingContext,
27-
diagnostics: DiagnosticSink
27+
diagnostics: DiagnosticSink,
2828
): ClassBuilderFactory {
2929
return object : ClassBuilderFactory by interceptedFactory {
3030
override fun newClassBuilder(origin: JvmDeclarationOrigin): ClassBuilder =

0 commit comments

Comments
 (0)