Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-14 12:11:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

RegExp ftw, #7086

Browse Source
This commit is contained in:
Johannes Rieken
2016-06-03 11:58:06 +02:00
parent d72d0833a0
commit cea00aef9b
1 changed files with 7 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/base/common/paths.ts
+7 -42
View File
@@ -110,49 +110,15 @@ export function normalize2(path: string, toOSPath: boolean): string {
}
}
function _isNormal(path: string, badSep: number): boolean {
let lastCode = -1;
for (let pos = 0; pos < path.length; pos++) {
let code = path.charCodeAt(pos);
// bad separator
if (code === badSep) {
return false;
}
// double separator
if ((code === _slash || code === _backslash)
&& (lastCode === _slash || lastCode === _backslash)) {
const _posixBadPath = /(\/\.\.?\/)|(\/\.\.?)$|^(\.\.?\/)|(\/\/+)|(\\)/;
const _winBadPath = /(\\\.\.?\\)|(\\\.\.?)$|^(\.\.?\\)|(\\\\+)|(\/)/;
return false;
}
// ./ ../ segments
if (code === _dot && (lastCode === -1 || lastCode === _slash || lastCode === _backslash)) {
if (pos + 1 >= path.length) {
// /.<end>
return false;
}
code = path.charCodeAt(++pos);
if (code === _slash || code === _backslash) {
// /./
return false;
} else if (code === _dot) {
if (pos + 1 >= path.length) {
// /..<end>
return false;
}
code = path.charCodeAt(++pos);
if (code === _slash || code === _backslash) {
// /../
return false;
}
}
}
lastCode = code;
}
return true;
function _isNormal(path: string, win: boolean): boolean {
return win
? !_winBadPath.test(path)
: !_posixBadPath.test(path);
}
export function normalize(path: string, toOSPath?: boolean): string {
if (path === null || path === void 0) {
@@ -164,7 +130,7 @@ export function normalize(path: string, toOSPath?: boolean): string {
return '.';
}
if (_isNormal(path, isWindows && toOSPath ? _slash : _backslash)) {
if (_isNormal(path, isWindows && toOSPath)) {
return path;
}
@@ -374,7 +340,6 @@ export function isRelative(path: string): boolean {
const _slash = '/'.charCodeAt(0);
const _backslash = '\\'.charCodeAt(0);
const _colon = ':'.charCodeAt(0);
const _dot = '.'.charCodeAt(0);
const _a = 'a'.charCodeAt(0);
const _A = 'A'.charCodeAt(0);
const _z = 'z'.charCodeAt(0);