Skip to content

Commit 3ada8c9

Browse files
nbondancameta-codesync[bot]
authored andcommitted
Update ktfmt component on FBS:master
Reviewed By: cortinico Differential Revision: D96922887 fbshipit-source-id: 357f51f07c3bff9e517e0e7466dc5dfe4028a98a
1 parent 834ea98 commit 3ada8c9

2 files changed

Lines changed: 13 additions & 16 deletions

File tree

core/build.gradle.kts

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,10 @@ dependencies {
4343
testImplementation(libs.junit)
4444
}
4545

46-
val generateSources by
47-
tasks.registering {
48-
outputs.dir(layout.buildDirectory.dir("generated/main/java"))
49-
dependsOn(tasks.named("generateKtfmtFile"))
50-
}
46+
val generateSources by tasks.registering {
47+
outputs.dir(layout.buildDirectory.dir("generated/main/java"))
48+
dependsOn(tasks.named("generateKtfmtFile"))
49+
}
5150

5251
tasks {
5352
// Create Ktfmt.kt file with version information
@@ -62,11 +61,10 @@ tasks {
6261
outputs.cacheIf { true }
6362

6463
// provider to run the shell script genVersionFileScript with versionPropertiesFile as argument
65-
val scriptProcess =
66-
providers.exec {
67-
workingDir = rootProject.rootDir
68-
commandLine = listOf(genVersionFileScript.toString(), versionPropertiesFile.toString())
69-
}
64+
val scriptProcess = providers.exec {
65+
workingDir = rootProject.rootDir
66+
commandLine = listOf(genVersionFileScript.toString(), versionPropertiesFile.toString())
67+
}
7068

7169
doLast {
7270
val scriptOutput = scriptProcess.standardOutput.asText.get()

core/src/main/java/com/facebook/ktfmt/format/RedundantImportDetector.kt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,11 @@ internal class RedundantImportDetector(val enabled: Boolean) {
141141

142142
val links = kdocSection.getChildrenOfType<KDocLink>() + tagLinks
143143

144-
val references =
145-
links.flatMap { link ->
146-
link.getChildrenOfType<KDocName>().mapNotNull {
147-
it.getQualifiedName().firstOrNull()?.trim('[', ']')
148-
}
149-
}
144+
val references = links.flatMap { link ->
145+
link.getChildrenOfType<KDocName>().mapNotNull {
146+
it.getQualifiedName().firstOrNull()?.trim('[', ']')
147+
}
148+
}
150149

151150
usedReferences += references
152151
}

0 commit comments

Comments
 (0)