Skip to content
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

Jump to bottom

Fix platform issue when determining module name from file #1505

Merged
merged 2 commits into from
Jun 28, 2022
Merged

Fix platform issue when determining module name from file #1505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42a1e65
Fix platform issue when determining module name from file
kiiadi Jun 28, 2022
32fdd58
Merge branch 'main' into kiiadi/fix-platform-issue-when-determining-m…
david-perez Jun 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.next.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,9 @@ message = "Add comments for docker settings needed when using this sdk"
references = ["aws-sdk-rust#540"]
meta = { "breaking" = false, "tada" = false, "bug" = false }
author = "jmklix"

[[smithy-rs]]
message = "Fix issue with codegen on Windows where module names were incorrectly determined from filenames"
references = ["smithy-rs#1505"]
meta = { "breaking" = false, "tada" = false, "bug" = true }
author = "kiiadi"
3 changes: 2 additions & 1 deletion codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/rustlang/RustWriter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import software.amazon.smithy.rust.codegen.smithy.isOptional
import software.amazon.smithy.rust.codegen.smithy.rustType
import software.amazon.smithy.rust.codegen.util.orNull
import software.amazon.smithy.utils.AbstractCodeWriter
import java.io.File
import java.util.function.BiFunction

/**
Expand Down Expand Up @@ -393,7 +394,7 @@ class RustWriter private constructor(
}

fun module(): String? = if (filename.startsWith("src") && filename.endsWith(".rs")) {
filename.removeSuffix(".rs").split('/').last()
filename.removeSuffix(".rs").substringAfterLast(File.separatorChar)
} else null

fun safeName(prefix: String = "var"): String {
Expand Down
6 changes: 6 additions & 0 deletions codegen/src/test/kotlin/software/amazon/smithy/rust/lang/RustWriterTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,4 +143,10 @@ class RustWriterTest {
)
sut.toString().shouldContain("inner: hello, regular: http::foo")
}

@Test
fun `can handle file paths properly when determining module`() {
val sut = RustWriter.forModule("src/module_name")
sut.module().shouldBe("module_name")
}
}