Skip to content

Fix Path.ChangeExtension behavior with empty extension (#100687) #100691

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
wants to merge 6 commits into from
Closed

Fix Path.ChangeExtension behavior with empty extension (#100687) #100691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d20c820
Fix Path.ChangeExtension behavior with empty extension (#100687)
jasonleenaylor Apr 5, 2024
e6e051b
Remove accidental trailing whitespace
jasonleenaylor Apr 5, 2024
c038dd5
Add Path.ChangeExtension test cases for files with no extension
jasonleenaylor Apr 5, 2024
19bd4dd
Adjust ChangeExtension test to match updated behavior
jasonleenaylor Apr 5, 2024
ac15e35
Adjust comment and refactor to use the existing null test
jasonleenaylor Apr 5, 2024
d19196a
Merge branch 'main' into fix-changeextension
jasonleenaylor Apr 8, 2024
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
4 changes: 2 additions & 2 deletions src/libraries/System.Private.CoreLib/src/System/IO/Path.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public static partial class Path
// the specified extension. If path is null, the function
// returns null. If path does not contain a file extension,
// the new file extension is appended to the path. If extension
// is null, any existing extension is removed from path.
// is null or empty, any existing extension is removed from path.
[return: NotNullIfNotNull(nameof(path))]
public static string? ChangeExtension(string? path, string? extension)
{
Expand All @@ -64,7 +64,7 @@ public static partial class Path
}
}

if (extension == null)
if (string.IsNullOrEmpty(extension))
{
return path.Substring(0, subLength);
}
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Runtime/tests/System.IO.FileSystem.Tests/File/ChangeExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class File_ChangeExtension : FileSystemTest
[InlineData("", ".tmp", "")]
[InlineData(null, ".tmp", null)]
[InlineData("filename", ".tmp", "filename.tmp")]
[InlineData("filename.tmp", "", "filename.")]
[InlineData("filename.tmp", "", "filename")]
[InlineData("filename.tmp", "...", "filename...")]
[InlineData("filename.tmp", null, "filename")]
[InlineData("filename.tmp.doc", ".tmp", "filename.tmp.tmp")]
Expand Down
4 changes: 3 additions & 1 deletion src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/IO/PathTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ public class PathTests : PathTestsBase
InlineData(null, "exe", null),
InlineData("", "", ""),
InlineData("file.exe", null, "file"),
InlineData("file.exe", "", "file."),
InlineData("file.exe", "", "file"),
InlineData("file", null, "file"),
InlineData("file", "", "file"),
InlineData("file", "exe", "file.exe"),
InlineData("file", ".exe", "file.exe"),
InlineData("file.txt", "exe", "file.exe"),
Expand Down