Skip to content

Extract each formatting test into a separate file #644

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.

Sign up for GitHub

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

Closed
AbdullinAM wants to merge 1 commit into from
Closed

Extract each formatting test into a separate file #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 10 additions & 3 deletions core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import org.jetbrains.kotlin.gradle.dsl.abi.ExperimentalAbiValidation

plugins {
kotlin("jvm")
id("java-test-fixtures")
alias(libs.plugins.dokka)
alias(libs.plugins.dokka.javadoc)
alias(libs.plugins.shadowJar)
Expand All @@ -41,9 +42,11 @@ dependencies {
api(libs.kotlin.stdlib)
api(libs.kotlin.compilerEmbeddable)
implementation(libs.ec4j)

testFixturesApi(libs.googleTruth)
testFixturesApi(libs.junit)
testFixturesImplementation(libs.kotlin.test.junit4)
testImplementation(libs.kotlin.test.junit4)
testImplementation(libs.googleTruth)
testImplementation(libs.junit)
}

val generateSources by tasks.registering {
Expand All @@ -53,7 +56,11 @@ val generateSources by tasks.registering {

tasks {
// Run tests with UTF-16 encoding
test { jvmArgs("-Dfile.encoding=UTF-16") }
test {
jvmArgs("-Dfile.encoding=UTF-16")
// Forward the test-migration dump directory (see KtfmtDump) to the forked test JVM.
System.getProperty("ktfmt.dump.dir")?.let { systemProperty("ktfmt.dump.dir", it) }
}

// Handle multiple versions of Kotlin here
withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
Expand Down
19 changes: 10 additions & 9 deletions core/src/main/java/com/facebook/ktfmt/cli/ParsedArgs.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,15 +252,16 @@ data class ParsedArgs(
return ParseResult.Error("partial formatting is only supported for a single file")
}

val parsedArgs = ParsedArgs(
fileNames,
formattingOptions.copy(removeUnusedImports = removeUnusedImports),
dryRun,
setExitIfChanged,
stdinName,
editorConfig,
quiet,
)
val parsedArgs =
ParsedArgs(
fileNames,
formattingOptions.copy(removeUnusedImports = removeUnusedImports),
dryRun,
setExitIfChanged,
stdinName,
editorConfig,
quiet,
)
parsedArgs.lineRanges.addAll(lineRanges)
parsedArgs.characterRanges.addAll(characterRanges)
return ParseResult.Ok(parsedArgs)
Expand Down
Loading
Loading