Merge remote-tracking branch 'origin/master'

alexdima · alexdima · commit 2a41c566245f · 2016-07-06T16:28:45.000+03:00
diff --git a/src/vs/base/common/paths.ts b/src/vs/base/common/paths.ts
@@ -228,11 +228,10 @@ export function getRoot(path: string, sep: string = '/'): string {
 	return '';
 }
 
-export const join: (...parts: string[]) => string = function () {
-
+export function join(...parts: string[]): string {
 	let value = '';
-	for (let i = 0; i < arguments.length; i++) {
-		let part = arguments[i];
+	for (let i = 0; i < parts.length; i++) {
+		let part = parts[i];
 		if (i > 0) {
 			// add the separater between two parts unless
 			// there already is one
@@ -249,7 +248,7 @@ export const join: (...parts: string[]) => string = function () {
 	}
 
 	return normalize(value);
-};
+}
 
 
 /**
diff --git a/src/vs/base/parts/tree/browser/treeViewModel.ts b/src/vs/base/parts/tree/browser/treeViewModel.ts
@@ -45,6 +45,7 @@ export class HeightMap extends EventEmitter {
 			viewItem = this.heightMap[i - 1];
 
 			if (!viewItem) {
+				console.error('view item doesnt exist');
 				return;
 			}
 
@@ -101,6 +102,7 @@ export class HeightMap extends EventEmitter {
 			viewItem = this.heightMap[i];
 
 			if (!viewItem) {
+				console.error('view item doesnt exist');
 				return;
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ export class HeightMap extends EventEmitter {`
`45`	`45`	`viewItem = this.heightMap[i - 1];`
`46`	`46`
`47`	`47`	`if (!viewItem) {`
	`48`	`+ console.error('view item doesnt exist');`
`48`	`49`	`return;`
`49`	`50`	`}`
`50`	`51`
`@@ -101,6 +102,7 @@ export class HeightMap extends EventEmitter {`
`101`	`102`	`viewItem = this.heightMap[i];`
`102`	`103`
`103`	`104`	`if (!viewItem) {`
	`105`	`+ console.error('view item doesnt exist');`
`104`	`106`	`return;`
`105`	`107`	`}`
`106`	`108`