maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

getPathLabel(): Cannot read property '1' of null (fixes #11962)

Browse source
This commit is contained in:
Benjamin Pasero 2016-09-14 10:56:38 +02:00
parent b17fe30fb6
commit 4e59a0c754
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/vs/base/common/labels.ts
View file

@ -36,9 +36,13 @@ export class PathLabelProvider implements ILabelProvider {
}
}
export function getPathLabel(arg1: URI | string, arg2?: URI | string | IWorkspaceProvider): string {
let basepath = arg2 && getPath(arg2);
let absolutePath = getPath(arg1);
export function getPathLabel(resource: URI | string, basePathProvider?: URI | string | IWorkspaceProvider): string {
const absolutePath = getPath(resource);
if (!absolutePath) {
return null;
}
const basepath = basePathProvider && getPath(basePathProvider);
if (basepath && paths.isEqualOrParent(absolutePath, basepath)) {
if (basepath === absolutePath) {
@ -48,7 +52,7 @@ export function getPathLabel(arg1: URI | string, arg2?: URI | string | IWorkspac
return paths.normalize(strings.ltrim(absolutePath.substr(basepath.length), paths.nativeSep), true);
}
if (platform.isWindows && absolutePath[1] === ':') {
if (platform.isWindows && absolutePath && absolutePath[1] === ':') {
return paths.normalize(absolutePath.charAt(0).toUpperCase() + absolutePath.slice(1), true);
}
@ -65,7 +69,7 @@ function getPath(arg1: URI | string | IWorkspaceProvider): string {
}
if (types.isFunction((<IWorkspaceProvider>arg1).getWorkspace)) {
let ws = (<IWorkspaceProvider>arg1).getWorkspace();
const ws = (<IWorkspaceProvider>arg1).getWorkspace();
return ws ? ws.resource.fsPath : void 0;
}