zcy
/
solvespace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make Path::SetExtension("") not include a dot

pull/846/head
наб 2020-03-22 23:20:54 +01:00 committed by phkahler
parent f5086b62cc
commit a8b8a347c1
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/platform/platform.cpp
View File

@ -185,8 +185,10 @@ Path Path::WithExtension(std::string ext) const {
if(dot != std::string::npos) { if(dot != std::string::npos) {
withExt.raw.erase(dot); withExt.raw.erase(dot);
} }
withExt.raw += "."; if(!ext.empty()) {
withExt.raw += ext; withExt.raw += ".";
withExt.raw += ext;
}
return withExt; return withExt;
} }

1
test/core/path/test.cpp
View File

@ -83,6 +83,7 @@ TEST_CASE(extension) {
} }
TEST_CASE(with_extension) { TEST_CASE(with_extension) {
CHECK_EQ_STR(Path::From("foo.bar").WithExtension("").raw, "foo");
CHECK_EQ_STR(Path::From("foo.bar").WithExtension("baz").raw, "foo.baz"); CHECK_EQ_STR(Path::From("foo.bar").WithExtension("baz").raw, "foo.baz");
CHECK_EQ_STR(Path::From("foo").WithExtension("baz").raw, "foo.baz"); CHECK_EQ_STR(Path::From("foo").WithExtension("baz").raw, "foo.baz");
} }