diff --git a/build/.cachesalt b/build/.cachesalt index 8051d84124e..8148922f086 100644 --- a/build/.cachesalt +++ b/build/.cachesalt @@ -1 +1 @@ -2024-03-18T08:47:22.277Z +2024-05-16T08:47:22.277Z diff --git a/src/vs/base/common/extpath.ts b/src/vs/base/common/extpath.ts index d7f6723092c..e0ee6968dce 100644 --- a/src/vs/base/common/extpath.ts +++ b/src/vs/base/common/extpath.ts @@ -164,7 +164,7 @@ export function isUNC(path: string): boolean { // Reference: https://en.wikipedia.org/wiki/Filename const WINDOWS_INVALID_FILE_CHARS = /[\\/:\*\?"<>\|]/g; -const UNIX_INVALID_FILE_CHARS = /[\\/]/g; +const UNIX_INVALID_FILE_CHARS = /[/]/g; const WINDOWS_FORBIDDEN_NAMES = /^(con|prn|aux|clock\$|nul|lpt[0-9]|com[0-9])(\.(.*?))?$/i; export function isValidBasename(name: string | null | undefined, isWindowsOS: boolean = isWindows): boolean { const invalidFileChars = isWindowsOS ? WINDOWS_INVALID_FILE_CHARS : UNIX_INVALID_FILE_CHARS; diff --git a/src/vs/base/test/common/extpath.test.ts b/src/vs/base/test/common/extpath.test.ts index 3c6a4e4979b..c13210daa13 100644 --- a/src/vs/base/test/common/extpath.test.ts +++ b/src/vs/base/test/common/extpath.test.ts @@ -50,9 +50,9 @@ suite('Paths', () => { assert.ok(!extpath.isValidBasename('')); assert.ok(extpath.isValidBasename('test.txt')); assert.ok(!extpath.isValidBasename('/test.txt')); - assert.ok(!extpath.isValidBasename('\\test.txt')); if (isWindows) { + assert.ok(!extpath.isValidBasename('\\test.txt')); assert.ok(!extpath.isValidBasename('aux')); assert.ok(!extpath.isValidBasename('Aux')); assert.ok(!extpath.isValidBasename('LPT0')); @@ -69,6 +69,8 @@ suite('Paths', () => { assert.ok(!extpath.isValidBasename('test.txt\t')); assert.ok(!extpath.isValidBasename('tes:t.txt')); assert.ok(!extpath.isValidBasename('tes"t.txt')); + } else { + assert.ok(extpath.isValidBasename('\\test.txt')); } });