authorgravatar for xq@random-projects.netFelix "xq" Queißner <xq@random-projects.net> 2020-11-13 12:48:01+01:00
committergravatar for xq@random-projects.netFelix "xq" Queißner <xq@random-projects.net> 2020-11-13 12:48:01+01:00
logf51064f79ec4c240251686e73eb33d1a9984a88c
tree45eb6879202f6fd1a549ee327dbcfb69ea9760b2
parent25542738058de6361f71e5a39a7c64463956eaa0

Respects leading `.` and ignores it.

1 files changed, 20 insertions(+), 11 deletions(-)

lib/std/fs/path.zig+20-11
......@@ -1185,11 +1185,17 @@ fn testRelativeWindows(from: []const u8, to: []const u8, expected_output: []cons
11851185
11861186/// Returns the extension of the file name (if any).
11871187/// This function will search for the file extension (separated by a `.`) and will return the text after the `.`.
1188/// Files that end with `.` are considered to have no extension.
1188/// Files that end with `.` are considered to have no extension, files that start with `.`
1189/// Examples:
1190/// - `"main.zig"` ⇒ `"zig"`
1191/// - `"src/main.zig"` ⇒ `"zig"`
1192/// - `".gitignore"` ⇒ `null`
1193/// - `"keep."` ⇒ `null`
1194/// - `"src.keep.me"` ⇒ `"me"`
11891195pub fn extension(path: []const u8) ?[]const u8 {
11901196 const filename = basename(path);
11911197 return if (std.mem.lastIndexOf(u8, filename, ".")) |index|
1192 if (index == filename.len - 1)
1198 if (index == 0 or index == filename.len - 1)
11931199 null
11941200 else
11951201 filename[index + 1 ..]
......@@ -1213,29 +1219,32 @@ test "extension" {
12131219 testExtension(".", null);
12141220 testExtension("a.", null);
12151221 testExtension("abc.", null);
1216 testExtension(".a", "a");
1217 testExtension(".file", "file");
1218 testExtension(".gitignore", "gitignore");
1222 testExtension(".a", null);
1223 testExtension(".file", null);
1224 testExtension(".gitignore", null);
12191225 testExtension("file.gitignore", "gitignore");
12201226 testExtension("a.gitignore", "gitignore");
1227 testExtension("a.b.c", "c");
12211228
12221229 testExtension("/", null);
12231230 testExtension("/.", null);
12241231 testExtension("/a.", null);
12251232 testExtension("/abc.", null);
1226 testExtension("/.a", "a");
1227 testExtension("/.file", "file");
1228 testExtension("/.gitignore", "gitignore");
1233 testExtension("/.a", null);
1234 testExtension("/.file", null);
1235 testExtension("/.gitignore", null);
12291236 testExtension("/file.gitignore", "gitignore");
12301237 testExtension("/a.gitignore", "gitignore");
1238 testExtension("/a.b.c", "c");
12311239
12321240 testExtension("/foo/bar/bam/", null);
12331241 testExtension("/foo/bar/bam/.", null);
12341242 testExtension("/foo/bar/bam/a.", null);
12351243 testExtension("/foo/bar/bam/abc.", null);
1236 testExtension("/foo/bar/bam/.a", "a");
1237 testExtension("/foo/bar/bam/.file", "file");
1238 testExtension("/foo/bar/bam/.gitignore", "gitignore");
1244 testExtension("/foo/bar/bam/.a", null);
1245 testExtension("/foo/bar/bam/.file", null);
1246 testExtension("/foo/bar/bam/.gitignore", null);
12391247 testExtension("/foo/bar/bam/file.gitignore", "gitignore");
12401248 testExtension("/foo/bar/bam/a.gitignore", "gitignore");
1249 testExtension("/foo/bar/bam/a.b.c", "c");
12411250}